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

List:       kde-commits
Subject:    playground/office/kraft
From:       Klaas Freitag <klaas () freisturz ! de>
Date:       2012-08-13 19:53:57
Message-ID: 20120813195357.B0DA7AC7AB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1310588 by freitag:

Fixed mysql database setup.


 M  +5 -5      database/mysql/create_schema.sql  
 M  +3 -3      database/mysql/migration/2_dbmigrate.sql  
 M  +1 -1      database/mysql/migration/4_dbmigrate.sql  
 M  +8 -6      src/setupassistant.cpp  


--- trunk/playground/office/kraft/database/mysql/create_schema.sql #1310587:1310588
@@ -46,7 +46,7 @@
 	Gewinn	     DECIMAL(6,2)        default 0,
 	zeitbeitrag  TINYINT             default 1,
 	enterDatum   DATETIME,
-	modifyDatum  TIMESTAMP(14),
+	modifyDatum  TIMESTAMP,
 	Preisart     INT NOT NULL  default 1,
 	EPreis       DECIMAL(10,2)       default 0,
 	PRIMARY KEY( TemplID ),
@@ -65,7 +65,7 @@
 	stdHourSet    INT default 0,
 	allowGlobal   INT default 1,
 
-	modDate	      TIMESTAMP(14),
+	modDate	      TIMESTAMP,
 
 	PRIMARY KEY( TCalcID),
 	INDEX( TemplID )
@@ -79,7 +79,7 @@
 	amount        DECIMAL(10,2) default 1.0,
 	price	      DECIMAL(10,2),
 	percent       INT default 0,
-	modDate	      TIMESTAMP(14),
+	modDate	      TIMESTAMP,
 
 	PRIMARY KEY(FCalcID),
 	INDEX(TemplID)
@@ -90,7 +90,7 @@
 	TemplID       INT NOT NULL,
 	name          VARCHAR(255),
 	percent       INT default 0,
-	modDate	      TIMESTAMP(14),
+	modDate	      TIMESTAMP,
 
 	PRIMARY KEY(MCalcID),
 	INDEX(TemplID)
@@ -129,7 +129,7 @@
 	priceIn	     DECIMAL(10,2),
 	priceOut     DECIMAL(10,2),
 	enterDate    DATETIME,
-	modifyDate   TIMESTAMP(14),
+	modifyDate   TIMESTAMP,
 
 	PRIMARY KEY(matID),
 	INDEX(chapterID)
--- trunk/playground/office/kraft/database/mysql/migration/2_dbmigrate.sql \
#1310587:1310588 @@ -10,7 +10,7 @@
 	stdHourSet    INT default 0,
 	allowGlobal   INT default 1,
 
-	modDate	      TIMESTAMP(14),
+	modDate	      TIMESTAMP,
 
 	PRIMARY KEY( TCalcID),
 	INDEX(TemplID)
@@ -24,7 +24,7 @@
 	amount        DECIMAL(10,2) default 1.0,
 	price	      DECIMAL(10,2),
 	percent       INT default 0,
-	modDate	      TIMESTAMP(14),
+	modDate	      TIMESTAMP,
 
 	PRIMARY KEY(FCalcID),
 	INDEX(TemplID)
@@ -35,7 +35,7 @@
 	TemplID       INT NOT NULL,
 	name          VARCHAR(255),
 	percent       INT default 0,
-	modDate	      TIMESTAMP(14),
+	modDate	      TIMESTAMP,
 
 	PRIMARY KEY(MCalcID),
 	INDEX(TemplID)
--- trunk/playground/office/kraft/database/mysql/migration/4_dbmigrate.sql \
#1310587:1310588 @@ -6,7 +6,7 @@
   text           TEXT,
   docType        VARCHAR( 64 ),
   textType       VARCHAR( 64 ),
-  modDate        TIMESTAMP(14),
+  modDate        TIMESTAMP,
 
   PRIMARY KEY( docTextID ),
   INDEX( docType, textType )
--- trunk/playground/office/kraft/src/setupassistant.cpp #1310587:1310588
@@ -407,8 +407,8 @@
 void SetupAssistant::slotCurrentPageChanged( KPageWidgetItem *current, \
KPageWidgetItem* /* previous */)  {
   if( current == mCreateDbPageItem ) {
-    if(DatabaseSettings::self()->dbDriver() == "QMYSQL") {
-      if(!KraftDB::self()->dbConnect( "QMYSQL",
+      if( mSqlBackendDriver == QLatin1String("QMYSQL") ) {
+      if(!KraftDB::self()->dbConnect( QLatin1String("QMYSQL"),
                                       mMysqlDetailsPage->dbName(),
                                       mMysqlDetailsPage->dbUser(),
                                       mMysqlDetailsPage->dbServer(),
@@ -417,7 +417,7 @@
         return;
       }
     } else {
-      if( !KraftDB::self()->dbConnect( "QSQLITE", \
mSqLiteDetailsPage->url().pathOrUrl() ) ) { +      if( !KraftDB::self()->dbConnect( \
                QLatin1String("QSQLITE"), mSqLiteDetailsPage->url().pathOrUrl() ) ) {
         mCreateDbPage->setStatusText( i18n("<p>Can't open your database file, check \
the permissions and such."));  }
     }
@@ -643,9 +643,9 @@
   QString file = mSqLiteDetailsPage->url().pathOrUrl();
   kDebug() << "The SqlLite database file is " << file;
 
-  QString driver = mDbSelectPage->selectedDriver();
-  kDebug() << "The database driver is " << driver;
-  KraftDB::self()->dbConnect( driver, file );
+  mSqlBackendDriver = mDbSelectPage->selectedDriver();
+  kDebug() << "The database driver is " << mSqlBackendDriver;
+  KraftDB::self()->dbConnect( mSqlBackendDriver, file );
 
   kDebug() << "############ database opened: "<< KraftDB::self()->isOk();
   bool dbExists = KraftDB::self()->databaseExists();
@@ -680,6 +680,8 @@
   } else {
     setAppropriate( mCreateDbPageItem, true );
   }
+  mSqlBackendDriver = QLatin1String("QMYSQL");
+
   kDebug() << "required Schema version: " << \
KraftDB::self()->requiredSchemaVersion();  }
 


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