[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/extragear/graphics/digikam/1.0-databaseext/libs/database
From: Holger Foerster <hamsi2k () freenet ! de>
Date: 2009-11-21 11:38:24
Message-ID: 1258803504.611506.13983.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1052368 by foerster:
Using the correct result type instead of checking only for a boolean value.
M +1 -1 databasecorebackend.cpp
M +1 -205 schemaupdater.cpp
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/database/databasecorebackend.cpp \
#1052367:1052368 @@ -848,7 +848,7 @@
forever
{
#ifdef DATABASCOREBACKEND_DEBUG
- kDebug(50003) << "Trying to query ["<<query.lastQuery()<<"]";
+ kDebug(50003) << "Trying to query ["<<query.lastQuery()<<"] values ["<< \
query.boundValues() <<"]"; #endif
if (query.exec())
break;
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/database/schemaupdater.cpp \
#1052367:1052368 @@ -390,214 +390,10 @@
bool SchemaUpdater::createTablesV5()
{
- if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB"))))
- /*
- QString("CREATE TABLE AlbumRoots\n"
- " (id INTEGER PRIMARY KEY,\n"
- " label TEXT,\n"
- " status INTEGER NOT NULL,\n"
- " type INTEGER NOT NULL,\n"
- " identifier TEXT,\n"
- " specificPath TEXT,\n"
- " UNIQUE(identifier, specificPath));") ))
- */
+ if (DatabaseCoreBackend::NoErrors!=m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB"))))
{
return false;
}
-
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB2"))))
-// /*QString("CREATE TABLE Albums\n"
-// " (id INTEGER PRIMARY KEY,\n"
-// " albumRoot INTEGER NOT NULL,\n"
-// " relativePath TEXT NOT NULL,\n"
-// " date DATE,\n"
-// " caption TEXT,\n"
-// " collection TEXT,\n"
-// " icon INTEGER,\n"
-// " UNIQUE(albumRoot, relativePath));") ))
-// */
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB3"))))
-// /*QString("CREATE TABLE Images\n"
-// " (id INTEGER PRIMARY KEY,\n"
-// " album INTEGER,\n" // no constraints, for temporary \
orphans
-// " name TEXT NOT NULL,\n"
-// " status INTEGER NOT NULL,\n"
-// " category INTEGER NOT NULL,\n"
-// " modificationDate DATETIME,\n"
-// " fileSize INTEGER,\n"
-// " uniqueHash TEXT,\n"
-// " UNIQUE (album, name));") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB4"))))
-// /* QString("CREATE TABLE ImageHaarMatrix\n"
-// " (imageid INTEGER PRIMARY KEY,\n"
-// " modificationDate DATETIME,\n"
-// " uniqueHash TEXT,\n"
-// " matrix BLOB);") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB5"))))
-// /* QString("CREATE TABLE ImageInformation\n"
-// " (imageid INTEGER PRIMARY KEY,\n"
-// " rating INTEGER,\n"
-// " creationDate DATETIME,\n"
-// " digitizationDate DATETIME,\n"
-// " orientation INTEGER,\n"
-// " width INTEGER,\n"
-// " height INTEGER,\n"
-// " format TEXT,\n"
-// " colorDepth INTEGER,\n"
-// " colorModel INTEGER);") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB6"))))
-// /* QString("CREATE TABLE ImageMetadata\n"
-// " (imageid INTEGER PRIMARY KEY,\n"
-// " make TEXT,\n"
-// " model TEXT,\n"
-// " lens TEXT,\n"
-// " aperture REAL,\n"
-// " focalLength REAL,\n"
-// " focalLength35 REAL,\n"
-// " exposureTime REAL,\n"
-// " exposureProgram INTEGER,\n"
-// " exposureMode INTEGER,\n"
-// " sensitivity INTEGER,\n"
-// " flash INTEGER,\n"
-// " whiteBalance INTEGER,\n"
-// " whiteBalanceColorTemperature INTEGER,\n"
-// " meteringMode INTEGER,\n"
-// " subjectDistance REAL,\n"
-// " subjectDistanceCategory INTEGER);") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB7"))))
-// /* QString("CREATE TABLE ImagePositions\n"
-// " (imageid INTEGER PRIMARY KEY,\n"
-// " latitude TEXT,\n"
-// " latitudeNumber REAL,\n"
-// " longitude TEXT,\n"
-// " longitudeNumber REAL,\n"
-// " altitude REAL,\n"
-// " orientation REAL,\n"
-// " tilt REAL,\n"
-// " roll REAL,\n"
-// " accuracy REAL,\n"
-// " description TEXT);") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB8"))))
-// /* QString("CREATE TABLE ImageComments\n"
-// " (id INTEGER PRIMARY KEY,\n"
-// " imageid INTEGER,\n"
-// " type INTEGER,\n"
-// " language TEXT,\n"
-// " author TEXT,\n"
-// " date DATETIME,\n"
-// " comment TEXT,\n"
-// " UNIQUE(imageid, type, language, author));") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB9"))))
-// /* QString("CREATE TABLE ImageCopyright\n"
-// " (id INTEGER PRIMARY KEY,\n"
-// " imageid INTEGER,\n"
-// " property TEXT,\n"
-// " value TEXT,\n"
-// " extraValue TEXT,\n"
-// " UNIQUE(imageid, property, value, extraValue));") \
))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB10"))))
-// /* QString("CREATE TABLE IF NOT EXISTS Tags\n"
-// " (id INTEGER PRIMARY KEY,\n"
-// " pid INTEGER,\n"
-// " name TEXT NOT NULL,\n"
-// " icon INTEGER,\n"
-// " iconkde TEXT,\n"
-// " UNIQUE (name, pid));") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB11"))))
-// /* QString("CREATE TABLE IF NOT EXISTS TagsTree\n"
-// " (id INTEGER NOT NULL,\n"
-// " pid INTEGER NOT NULL,\n"
-// " UNIQUE (id, pid));") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB12"))))
-// /* QString("CREATE TABLE IF NOT EXISTS ImageTags\n"
-// " (imageid INTEGER NOT NULL,\n"
-// " tagid INTEGER NOT NULL,\n"
-// " UNIQUE (imageid, tagid));") ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB13"))))
-// /* QString("CREATE TABLE IF NOT EXISTS ImageProperties\n"
-// " (imageid INTEGER NOT NULL,\n"
-// " property TEXT NOT NULL,\n"
-// " value TEXT NOT NULL,\n"
-// " UNIQUE (imageid, property));") ))*/
-// {
-// return false;
-// }
-//
-// if ( !m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB14"))))
-// /* QString( "CREATE TABLE IF NOT EXISTS Searches \n"
-// " (id INTEGER PRIMARY KEY, \n"
-// " type INTEGER, \n"
-// " name TEXT NOT NULL, \n"
-// " query TEXT NOT NULL);" ) ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB15"))))
-// /* QString("CREATE TABLE DownloadHistory\n"
-// " (id INTEGER PRIMARY KEY,\n"
-// " identifier TEXT,\n"
-// " filename TEXT,\n"
-// " filesize INTEGER,\n"
-// " filedate DATETIME,\n"
-// " UNIQUE(identifier, filename, filesize, \
filedate));"
-// ) ))*/
-// {
-// return false;
-// }
-//
-// if (!m_access->backend()->execDBAction(m_access->backend()->getDBAction(QString("CreateDB16"))))
-// /* QString("CREATE TABLE IF NOT EXISTS Settings \n"
-// "(keyword TEXT NOT NULL UNIQUE,\n"
-// " value TEXT);") ))*/
-// {
-// return false;
-// }
-
return true;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic