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

List:       kde-commits
Subject:    extragear/graphics/digikam/libs
From:       Holger Foerster <hamsi2k () freenet ! de>
Date:       2010-07-19 17:55:48
Message-ID: 20100719175548.8F634AC76B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1151849 by foerster:

Don't forget the thumbnails database name to be written on config.


 M  +0 -5      database/databaseconfigelement.cpp  
 M  +3 -1      database/databaseparameters.cpp  
 M  +10 -5     database/schemaupdater.h  
 M  +3 -0      widgets/common/databasewidget.cpp  


--- trunk/extragear/graphics/digikam/libs/database/databaseconfigelement.cpp \
#1151848:1151849 @@ -160,11 +160,6 @@
         {
             action.mode = dbActionElement.attribute("mode");
         }
-        else
-        {
-            kDebug() << "Missing statement attribute <mode>. Setting to default \
                \"transaction\".";
-            action.mode = QString("transaction");
-        }
 
 
         QDomElement databaseElement = \
                dbActionElement.firstChildElement("statement");
--- trunk/extragear/graphics/digikam/libs/database/databaseparameters.cpp \
#1151848:1151849 @@ -87,6 +87,7 @@
 {
     databaseType   = url.queryItem("databaseType");
     databaseName   = url.queryItem("databaseName");
+    databaseNameThumbnails   = url.queryItem("databaseNameThumbnails");
     connectOptions = url.queryItem("connectOptions");
     hostName       = url.queryItem("hostName");
     QString queryPort = url.queryItem("port");
@@ -103,6 +104,7 @@
 {
     return databaseType   == other.databaseType &&
            databaseName   == other.databaseName &&
+           databaseNameThumbnails == other.databaseNameThumbnails &&
            connectOptions == other.connectOptions &&
            hostName       == other.hostName &&
            port           == other.port &&
@@ -188,7 +190,7 @@
     connectOptions           = group.readEntry(configDatabaseConnectOptions, \
                QString());
     internalServer           = group.readEntry(configInternalDatabaseServer, false);
 
-    if (!databaseName.isNull())
+    if (isSQLite() && !databaseName.isNull())
     {
         QString orgName = databaseName;
         setDatabasePath(orgName);
--- trunk/extragear/graphics/digikam/libs/database/schemaupdater.h #1151848:1151849
@@ -57,22 +57,26 @@
 
     bool startUpdates();
     bool makeUpdates();
+    bool beginWrapSchemaUpdateStep();
+    bool endWrapSchemaUpdateStep(bool stepOperationSuccess, const QString& \
errorMsg);  void defaultFilterSettings(QStringList& defaultImageFilter,
                                QStringList& defaultVideoFilter,
                                QStringList& defaultAudioFilter);
     bool createFilterSettings();
     bool updateFilterSettings();
     bool createDatabase();
-    bool createTablesV5();
-    bool createIndicesV5();
-    bool createTriggersV5();
+    bool createTables();
+    bool createIndices();
+    bool createTriggers();
     bool copyV3toV4(const QString& digikam3DBPath, const QString& currentDBPath);
-    bool updateV4toV5();
+    bool updateV5toV6();
+    bool updateV4toV6();
     bool updateV2toV4(const QString& sqlite2DBPath);
-    bool createTablesV3();
+    void setLegacySettingEntries();
 
 private:
 
+    bool createTablesV3();
     void preAlpha010Update1();
     void preAlpha010Update2();
     void preAlpha010Update3();
@@ -84,6 +88,7 @@
     bool                    m_setError;
 
     int                     m_currentVersion;
+    int                     m_currentRequiredVersion;
 
     DatabaseBackend         *m_Backend;
     AlbumDB                 *m_AlbumDB;
--- trunk/extragear/graphics/digikam/libs/widgets/common/databasewidget.cpp \
#1151848:1151849 @@ -317,6 +317,7 @@
 
     internalServer->setChecked(settings->getInternalDatabaseServer());
     databaseName->setText(settings->getDatabaseName());
+    databaseNameThumbnails->setText(settings->getDatabaseNameThumbnails());
     hostName->setText(settings->getDatabaseHostName());
     hostPort->setValue(settings->getDatabasePort());
     connectionOptions->setText(settings->getDatabaseConnectoptions());
@@ -354,10 +355,12 @@
         if (parameters.databaseType == \
QString(DatabaseParameters::SQLiteDatabaseType()))  {
             parameters.databaseName = \
QDir::cleanPath(databasePathEdit->url().toLocalFile() + '/' + "digikam4.db"); +       \
parameters.databaseNameThumbnails = parameters.databaseName;  }
         else
         {
             parameters.databaseName = databaseName->text();
+            parameters.databaseNameThumbnails = databaseNameThumbnails->text();
         }
     }
     else


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