<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187998] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187998">187998</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 16:17:18 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move more functions from DatabaseBackendBase to Database
https://bugs.webkit.org/show_bug.cgi?id=147703
Reviewed by Tim Horton.
* Modules/webdatabase/Database.cpp:
(WebCore::fullyQualifiedInfoTableName):
(WebCore::setTextValueInDatabase):
(WebCore::retrieveTextResultFromDatabase):
(WebCore::Database::getVersionFromDatabase):
(WebCore::Database::setVersionInDatabase):
(WebCore::Database::performGetTableNames):
* Modules/webdatabase/Database.h:
* Modules/webdatabase/DatabaseBackendBase.cpp:
(WebCore::DatabaseBackendBase::performOpenAndVerify):
(WebCore::DatabaseBackendBase::getActualVersionForTransaction):
(WebCore::DatabaseBackendBase::databaseInfoTableName): Deleted.
(WebCore::fullyQualifiedInfoTableName): Deleted.
(WebCore::retrieveTextResultFromDatabase): Deleted.
(WebCore::setTextValueInDatabase): Deleted.
(WebCore::DatabaseBackendBase::getVersionFromDatabase): Deleted.
(WebCore::DatabaseBackendBase::setVersionInDatabase): Deleted.
* Modules/webdatabase/DatabaseBackendBase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseh">trunk/Source/WebCore/Modules/webdatabase/Database.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187997 => 187998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 23:17:18 UTC (rev 187998)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-08-05 Anders Carlsson <andersca@apple.com>
+
+ Move more functions from DatabaseBackendBase to Database
+ https://bugs.webkit.org/show_bug.cgi?id=147703
+
+ Reviewed by Tim Horton.
+
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::fullyQualifiedInfoTableName):
+ (WebCore::setTextValueInDatabase):
+ (WebCore::retrieveTextResultFromDatabase):
+ (WebCore::Database::getVersionFromDatabase):
+ (WebCore::Database::setVersionInDatabase):
+ (WebCore::Database::performGetTableNames):
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ (WebCore::DatabaseBackendBase::performOpenAndVerify):
+ (WebCore::DatabaseBackendBase::getActualVersionForTransaction):
+ (WebCore::DatabaseBackendBase::databaseInfoTableName): Deleted.
+ (WebCore::fullyQualifiedInfoTableName): Deleted.
+ (WebCore::retrieveTextResultFromDatabase): Deleted.
+ (WebCore::setTextValueInDatabase): Deleted.
+ (WebCore::DatabaseBackendBase::getVersionFromDatabase): Deleted.
+ (WebCore::DatabaseBackendBase::setVersionInDatabase): Deleted.
+ * Modules/webdatabase/DatabaseBackendBase.h:
+
</ins><span class="cx"> 2015-08-05 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Build DumpRenderTree with CMake.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (187997 => 187998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-05 23:02:25 UTC (rev 187997)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-05 23:17:18 UTC (rev 187998)
</span><span class="lines">@@ -58,11 +58,73 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static const char versionKey[] = "WebKitDatabaseVersionKey";
+static const char unqualifiedInfoTableName[] = "__WebKitDatabaseInfoTable__";
+
+static const char* fullyQualifiedInfoTableName()
+{
+ static const char qualifier[] = "main.";
+ static char qualifiedName[sizeof(qualifier) + sizeof(unqualifiedInfoTableName) - 1];
+
+ static std::once_flag onceFlag;
+ std::call_once(onceFlag, [] {
+ strcpy(qualifiedName, qualifier);
+ strcpy(qualifiedName + sizeof(qualifier) - 1, unqualifiedInfoTableName);
+ });
+
+ return qualifiedName;
+}
+
</ins><span class="cx"> static String formatErrorMessage(const char* message, int sqliteErrorCode, const char* sqliteErrorMessage)
</span><span class="cx"> {
</span><span class="cx"> return String::format("%s (%d %s)", message, sqliteErrorCode, sqliteErrorMessage);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool setTextValueInDatabase(SQLiteDatabase& db, const String& query, const String& value)
+{
+ SQLiteStatement statement(db, query);
+ int result = statement.prepare();
+
+ if (result != SQLITE_OK) {
+ LOG_ERROR("Failed to prepare statement to set value in database (%s)", query.ascii().data());
+ return false;
+ }
+
+ statement.bindText(1, value);
+
+ result = statement.step();
+ if (result != SQLITE_DONE) {
+ LOG_ERROR("Failed to step statement to set value in database (%s)", query.ascii().data());
+ return false;
+ }
+
+ return true;
+}
+
+static bool retrieveTextResultFromDatabase(SQLiteDatabase& db, const String& query, String& resultString)
+{
+ SQLiteStatement statement(db, query);
+ int result = statement.prepare();
+
+ if (result != SQLITE_OK) {
+ LOG_ERROR("Error (%i) preparing statement to read text result from database (%s)", result, query.ascii().data());
+ return false;
+ }
+
+ result = statement.step();
+ if (result == SQLITE_ROW) {
+ resultString = statement.getColumnText(0);
+ return true;
+ }
+ if (result == SQLITE_DONE) {
+ resultString = String();
+ return true;
+ }
+
+ LOG_ERROR("Error (%i) reading text result from database (%s)", result, query.ascii().data());
+ return false;
+}
+
</ins><span class="cx"> Database::Database(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
</span><span class="cx"> : DatabaseBackendBase(databaseContext.get(), name, expectedVersion, displayName, estimatedSize)
</span><span class="cx"> , m_transactionInProgress(false)
</span><span class="lines">@@ -151,6 +213,44 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Database::getVersionFromDatabase(String& version, bool shouldCacheVersion)
+{
+ String query(String("SELECT value FROM ") + fullyQualifiedInfoTableName() + " WHERE key = '" + versionKey + "';");
+
+ m_databaseAuthorizer->disable();
+
+ bool result = retrieveTextResultFromDatabase(m_sqliteDatabase, query, version);
+ if (result) {
+ if (shouldCacheVersion)
+ setCachedVersion(version);
+ } else
+ LOG_ERROR("Failed to retrieve version from database %s", databaseDebugName().ascii().data());
+
+ m_databaseAuthorizer->enable();
+
+ return result;
+}
+
+bool Database::setVersionInDatabase(const String& version, bool shouldCacheVersion)
+{
+ // The INSERT will replace an existing entry for the database with the new version number, due to the UNIQUE ON CONFLICT REPLACE
+ // clause in the CREATE statement (see Database::performOpenAndVerify()).
+ String query(String("INSERT INTO ") + fullyQualifiedInfoTableName() + " (key, value) VALUES ('" + versionKey + "', ?);");
+
+ m_databaseAuthorizer->disable();
+
+ bool result = setTextValueInDatabase(m_sqliteDatabase, query, version);
+ if (result) {
+ if (shouldCacheVersion)
+ setCachedVersion(version);
+ } else
+ LOG_ERROR("Failed to set version %s in database (%s)", version.ascii().data(), query.ascii().data());
+
+ m_databaseAuthorizer->enable();
+
+ return result;
+}
+
</ins><span class="cx"> void Database::scheduleTransaction()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_transactionInProgressMutex.tryLock()); // Locked by caller.
</span><span class="lines">@@ -347,7 +447,7 @@
</span><span class="cx"> int result;
</span><span class="cx"> while ((result = statement.step()) == SQLITE_ROW) {
</span><span class="cx"> String name = statement.getColumnText(0);
</span><del>- if (name != databaseInfoTableName())
</del><ins>+ if (name != unqualifiedInfoTableName)
</ins><span class="cx"> tableNames.append(name);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (187997 => 187998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-05 23:02:25 UTC (rev 187997)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-05 23:17:18 UTC (rev 187998)
</span><span class="lines">@@ -108,6 +108,9 @@
</span><span class="cx"> private:
</span><span class="cx"> Database(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
</span><span class="cx">
</span><ins>+ bool getVersionFromDatabase(String& version, bool shouldCacheVersion = true);
+ bool setVersionInDatabase(const String& version, bool shouldCacheVersion = true);
+
</ins><span class="cx"> void scheduleTransaction();
</span><span class="cx">
</span><span class="cx"> void runTransaction(RefPtr<SQLTransactionCallback>&&, RefPtr<SQLTransactionErrorCallback>&&, RefPtr<VoidCallback>&& successCallback, bool readOnly, const ChangeVersionData* = nullptr);
</span><span class="lines">@@ -124,6 +127,8 @@
</span><span class="cx"> bool m_deleted;
</span><span class="cx"> bool m_hasPendingCreationEvent { false };
</span><span class="cx">
</span><ins>+ friend class ChangeVersionWrapper;
+ friend class DatabaseBackendBase;
</ins><span class="cx"> friend class DatabaseManager;
</span><span class="cx"> friend class DatabaseServer; // FIXME: remove this when the backend has been split out.
</span><span class="cx"> friend class SQLStatement;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (187997 => 187998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-08-05 23:02:25 UTC (rev 187997)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-08-05 23:17:18 UTC (rev 187998)
</span><span class="lines">@@ -81,78 +81,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const char versionKey[] = "WebKitDatabaseVersionKey";
</del><span class="cx"> static const char unqualifiedInfoTableName[] = "__WebKitDatabaseInfoTable__";
</span><span class="cx">
</span><del>-const char* DatabaseBackendBase::databaseInfoTableName()
-{
- return unqualifiedInfoTableName;
-}
-
-static const char* fullyQualifiedInfoTableName()
-{
- static const char qualifier[] = "main.";
- static char qualifiedName[sizeof(qualifier) + sizeof(unqualifiedInfoTableName) - 1];
-
- static std::once_flag onceFlag;
- std::call_once(onceFlag, []{
- strcpy(qualifiedName, qualifier);
- strcpy(qualifiedName + sizeof(qualifier) - 1, unqualifiedInfoTableName);
- });
-
- return qualifiedName;
-}
-
</del><span class="cx"> static String formatErrorMessage(const char* message, int sqliteErrorCode, const char* sqliteErrorMessage)
</span><span class="cx"> {
</span><span class="cx"> return String::format("%s (%d %s)", message, sqliteErrorCode, sqliteErrorMessage);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool retrieveTextResultFromDatabase(SQLiteDatabase& db, const String& query, String& resultString)
-{
- SQLiteStatement statement(db, query);
- int result = statement.prepare();
-
- if (result != SQLITE_OK) {
- LOG_ERROR("Error (%i) preparing statement to read text result from database (%s)", result, query.ascii().data());
- return false;
- }
-
- result = statement.step();
- if (result == SQLITE_ROW) {
- resultString = statement.getColumnText(0);
- return true;
- }
- if (result == SQLITE_DONE) {
- resultString = String();
- return true;
- }
-
- LOG_ERROR("Error (%i) reading text result from database (%s)", result, query.ascii().data());
- return false;
-}
-
-static bool setTextValueInDatabase(SQLiteDatabase& db, const String& query, const String& value)
-{
- SQLiteStatement statement(db, query);
- int result = statement.prepare();
-
- if (result != SQLITE_OK) {
- LOG_ERROR("Failed to prepare statement to set value in database (%s)", query.ascii().data());
- return false;
- }
-
- statement.bindText(1, value);
-
- result = statement.step();
- if (result != SQLITE_DONE) {
- LOG_ERROR("Failed to step statement to set value in database (%s)", query.ascii().data());
- return false;
- }
-
- return true;
-}
-
</del><span class="cx"> // FIXME: move all guid-related functions to a DatabaseVersionTracker class.
</span><span class="cx"> static std::mutex& guidMutex()
</span><span class="cx"> {
</span><span class="lines">@@ -367,7 +302,7 @@
</span><span class="cx"> m_sqliteDatabase.close();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- } else if (!getVersionFromDatabase(currentVersion, false)) {
</del><ins>+ } else if (!m_frontend->getVersionFromDatabase(currentVersion, false)) {
</ins><span class="cx"> errorMessage = formatErrorMessage("unable to open database, failed to read current version", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
</span><span class="cx"> transaction.rollback();
</span><span class="cx"> m_sqliteDatabase.close();
</span><span class="lines">@@ -378,7 +313,7 @@
</span><span class="cx"> LOG(StorageAPI, "Retrieved current version %s from database %s", currentVersion.ascii().data(), databaseDebugName().ascii().data());
</span><span class="cx"> } else if (!m_new || shouldSetVersionInNewDatabase) {
</span><span class="cx"> LOG(StorageAPI, "Setting version %s in database %s that was just created", m_expectedVersion.ascii().data(), databaseDebugName().ascii().data());
</span><del>- if (!setVersionInDatabase(m_expectedVersion, false)) {
</del><ins>+ if (!m_frontend->setVersionInDatabase(m_expectedVersion, false)) {
</ins><span class="cx"> errorMessage = formatErrorMessage("unable to open database, failed to write current version", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
</span><span class="cx"> transaction.rollback();
</span><span class="cx"> m_sqliteDatabase.close();
</span><span class="lines">@@ -454,44 +389,6 @@
</span><span class="cx"> return DatabaseDetails(stringIdentifier(), displayName(), estimatedSize(), 0, 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DatabaseBackendBase::getVersionFromDatabase(String& version, bool shouldCacheVersion)
-{
- String query(String("SELECT value FROM ") + fullyQualifiedInfoTableName() + " WHERE key = '" + versionKey + "';");
-
- m_databaseAuthorizer->disable();
-
- bool result = retrieveTextResultFromDatabase(m_sqliteDatabase, query, version);
- if (result) {
- if (shouldCacheVersion)
- setCachedVersion(version);
- } else
- LOG_ERROR("Failed to retrieve version from database %s", databaseDebugName().ascii().data());
-
- m_databaseAuthorizer->enable();
-
- return result;
-}
-
-bool DatabaseBackendBase::setVersionInDatabase(const String& version, bool shouldCacheVersion)
-{
- // The INSERT will replace an existing entry for the database with the new version number, due to the UNIQUE ON CONFLICT REPLACE
- // clause in the CREATE statement (see Database::performOpenAndVerify()).
- String query(String("INSERT INTO ") + fullyQualifiedInfoTableName() + " (key, value) VALUES ('" + versionKey + "', ?);");
-
- m_databaseAuthorizer->disable();
-
- bool result = setTextValueInDatabase(m_sqliteDatabase, query, version);
- if (result) {
- if (shouldCacheVersion)
- setCachedVersion(version);
- } else
- LOG_ERROR("Failed to set version %s in database (%s)", version.ascii().data(), query.ascii().data());
-
- m_databaseAuthorizer->enable();
-
- return result;
-}
-
</del><span class="cx"> void DatabaseBackendBase::setExpectedVersion(const String& version)
</span><span class="cx"> {
</span><span class="cx"> m_expectedVersion = version.isolatedCopy();
</span><span class="lines">@@ -517,7 +414,7 @@
</span><span class="cx"> ASSERT(m_sqliteDatabase.transactionInProgress());
</span><span class="cx"> // Note: In multi-process browsers the cached value may be inaccurate.
</span><span class="cx"> // So we retrieve the value from the database and update the cached value here.
</span><del>- return getVersionFromDatabase(actualVersion, true);
</del><ins>+ return m_frontend->getVersionFromDatabase(actualVersion, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long DatabaseBackendBase::maximumSize() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h (187997 => 187998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-08-05 23:02:25 UTC (rev 187997)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-08-05 23:17:18 UTC (rev 187998)
</span><span class="lines">@@ -81,16 +81,12 @@
</span><span class="cx">
</span><span class="cx"> virtual bool performOpenAndVerify(bool shouldSetVersionInNewDatabase, DatabaseError&, String& errorMessage);
</span><span class="cx">
</span><del>- bool getVersionFromDatabase(String& version, bool shouldCacheVersion = true);
- bool setVersionInDatabase(const String& version, bool shouldCacheVersion = true);
</del><span class="cx"> void setExpectedVersion(const String&);
</span><span class="cx"> const String& expectedVersion() const { return m_expectedVersion; }
</span><span class="cx"> String getCachedVersion()const;
</span><span class="cx"> void setCachedVersion(const String&);
</span><span class="cx"> bool getActualVersionForTransaction(String& version);
</span><span class="cx">
</span><del>- static const char* databaseInfoTableName();
-
</del><span class="cx"> #if !LOG_DISABLED || !ERROR_DISABLED
</span><span class="cx"> String databaseDebugName() const;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>