[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    beta_0_7_branch: kdeextragear-3/krecipes/src
From:       Jason Kivlighn <fungmeista () linuxosuser ! com>
Date:       2005-03-03 19:00:55
Message-ID: 20050303190055.0911D148A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by jkivlighn: 

Data loaded from data.sql did not update PostgreSQL's sequences, so creating new \
units and categories didn't work.


  M +1 -0      krecipesview.cpp   1.172.2.1
  M +0 -2      DBBackend/qsqlrecipedb.cpp   1.14.2.2
  M +8 -0      DBBackend/PostgreSQL/psqlrecipedb.cpp   1.4.2.2
  M +1 -0      DBBackend/PostgreSQL/psqlrecipedb.h   1.3.2.1
  M +0 -3      DBBackend/SQLite/literecipedb.cpp   1.121.2.1


--- kdeextragear-3/krecipes/src/krecipesview.cpp  #1.172:1.172.2.1
@@ -630,4 +630,5 @@ void KrecipesView::initializeData( const
                 db->emptyData();
                 db->initializeData();
+                db->importSamples();
         }
 

--- kdeextragear-3/krecipes/src/DBBackend/qsqlrecipedb.cpp  #1.14.2.1:1.14.2.2
@@ -137,6 +137,4 @@ void QSqlRecipeDB::initializeData( void 
                 database->exec( ( *it ) + QString( ";" ) ); //Split removes the \
semicolons  }
-
-        importSamples();
 }
 

--- kdeextragear-3/krecipes/src/DBBackend/PostgreSQL/psqlrecipedb.cpp  \
#1.4.2.1:1.4.2.2 @@ -113,4 +113,12 @@ void PSqlRecipeDB::createTable( QString 
 }
 
+void PSqlRecipeDB::initializeData()
+{
+        QSqlRecipeDB::initializeData();
+
+        QSqlQuery updateSeq( "SELECT setval('units_id_seq',(SELECT COUNT(1) FROM \
units))", database ); +        updateSeq.exec( "SELECT \
setval('categories_id_seq',(SELECT COUNT(1) FROM categories))" ); +}
+
 void PSqlRecipeDB::portOldDatabases( float version )
 {

--- kdeextragear-3/krecipes/src/DBBackend/PostgreSQL/psqlrecipedb.h  #1.3:1.3.2.1
@@ -35,4 +35,5 @@ public:
 
         int lastInsertID();
+        void initializeData();
 
         void createTable( QString tableName );

--- kdeextragear-3/krecipes/src/DBBackend/SQLite/literecipedb.cpp  #1.121:1.121.2.1
@@ -924,7 +924,4 @@ void LiteRecipeDB::initializeData( void 
                 database->executeQuery( ( *it ) + QString( ";" ) ); //Split removes \
the semicolons  }
-
-        //now import samples
-        importSamples();
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]