Make SqlDatabase testable and add a basic test.

4 files changed, 72 insertions, 40 deletions

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 1aa2cb9..a00b175 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -108,6 +108,45 @@ QScriptValue desktopOpenUrl(QScriptContext *ctxt, QScriptEngine *e)
     return e->newVariant(QVariant(ret));
 }
 
+// XXX Something like this should be exported by Qt.
+static QString userLocalDataPath(const QString& app)
+{
+    QString result;
+
+#ifdef Q_OS_WIN
+#ifndef Q_OS_WINCE
+    QLibrary library(QLatin1String("shell32"));
+#else
+    QLibrary library(QLatin1String("coredll"));
+#endif // Q_OS_WINCE
+    typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
+    GetSpecialFolderPath SHGetSpecialFolderPath = (GetSpecialFolderPath)library.resolve("SHGetSpecialFolderPathW");
+    if (SHGetSpecialFolderPath) {
+        wchar_t path[MAX_PATH];
+        SHGetSpecialFolderPath(0, path, CSIDL_APPDATA, FALSE);
+        result = QString::fromWCharArray(path);
+    }
+#endif // Q_OS_WIN
+
+#ifdef Q_OS_MAC
+    result = QLatin1String(qgetenv("HOME"));
+    result += "/Library/Application Support";
+#else
+    if (result.isEmpty()) {
+        // Fallback: UNIX style
+        result = QLatin1String(qgetenv("XDG_DATA_HOME"));
+        if (result.isEmpty()) {
+            result = QLatin1String(qgetenv("HOME"));
+            result += QLatin1String("/.local/share");
+        }
+    }
+#endif
+
+    result += QLatin1Char('/');
+    result += app;
+    return result;
+}
+
 QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
 : rootContext(0), currentExpression(0),
   isDebugging(false), contextClass(0), objectClass(0), valueTypeClass(0),
@@ -121,6 +160,7 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
     qtObject.setProperty(QLatin1String("DesktopServices"), desktopObject);
     scriptEngine.globalObject().setProperty(QLatin1String("Qt"), qtObject);
 
+    offlineStoragePath = userLocalDataPath(QLatin1String("Nokia/Qt/QML/OfflineStorage"));
     qt_add_qmlxmlhttprequest(&scriptEngine);
     qt_add_qmlsqldatabase(&scriptEngine);
 
@@ -1601,6 +1641,32 @@ void QmlEngine::addImportPath(const QString& path)
 }
 
 /*!
+  \property QmlEngine::offlineStoragePath
+  \brief the directory for storing offline user data
+
+  Returns the directory where SQL and other offline
+  storage is placed.
+
+  QFxWebView and the SQL databases created with openDatabase()
+  are stored here.
+
+  The default is Nokia/Qt/QML/Databases/ in the platform-standard
+  user application data directory.
+*/
+void QmlEngine::setOfflineStoragePath(const QString& dir)
+{
+    Q_D(QmlEngine);
+    d->offlineStoragePath = dir;
+}
+
+QString QmlEngine::offlineStoragePath() const
+{
+    Q_D(const QmlEngine);
+    return d->offlineStoragePath;
+}
+
+
+/*!
   \internal
 
   Adds information to \a imports such that subsequent calls to resolveType()
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index 8caa505..b4233e4 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -65,6 +65,7 @@ class QScriptContext;
 class QNetworkAccessManager;
 class Q_DECLARATIVE_EXPORT QmlEngine : public QObject
 {
+    Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath)
     Q_OBJECT
 public:
     QmlEngine(QObject *p = 0);
@@ -79,6 +80,9 @@ public:
     void setNetworkAccessManager(QNetworkAccessManager *);
     QNetworkAccessManager *networkAccessManager() const;
 
+    void setOfflineStoragePath(const QString& dir);
+    QString offlineStoragePath() const;
+
     QUrl baseUrl() const;
     void setBaseUrl(const QUrl &);
 
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 0eeae0c..cca8355 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -201,6 +201,7 @@ public:
 
     QmlCompositeTypeManager typeManager;
     QStringList fileImportPath;
+    QString offlineStoragePath;
 
     mutable quint32 uniqueId;
     quint32 getUniqueId() const {
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index 144a170..fda0342 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -217,45 +217,6 @@ static QScriptValue qmlsqldatabase_transaction(QScriptContext *context, QScriptE
     return engine->undefinedValue();
 }
 
-// XXX Something like this should be exported by Qt.
-static QString userLocalDataPath(const QString& app)
-{
-    QString result;
-
-#ifdef Q_OS_WIN
-#ifndef Q_OS_WINCE
-    QLibrary library(QLatin1String("shell32"));
-#else
-    QLibrary library(QLatin1String("coredll"));
-#endif // Q_OS_WINCE
-    typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
-    GetSpecialFolderPath SHGetSpecialFolderPath = (GetSpecialFolderPath)library.resolve("SHGetSpecialFolderPathW");
-    if (SHGetSpecialFolderPath) {
-        wchar_t path[MAX_PATH];
-        SHGetSpecialFolderPath(0, path, CSIDL_APPDATA, FALSE);
-        result = QString::fromWCharArray(path);
-    }
-#endif // Q_OS_WIN
-
-#ifdef Q_OS_MAC
-    result = QLatin1String(qgetenv("HOME"));
-    result += "/Library/Application Support";
-#else
-    if (result.isEmpty()) {
-        // Fallback: UNIX style
-        result = QLatin1String(qgetenv("XDG_DATA_HOME"));
-        if (result.isEmpty()) {
-            result = QLatin1String(qgetenv("HOME"));
-            result += QLatin1String("/.local/share");
-        }
-    }
-#endif
-
-    result += QLatin1Char('/');
-    result += app;
-    return result;
-}
-
 
 static QScriptValue qmlsqldatabase_open(QScriptContext *context, QScriptEngine *engine)
 {
@@ -279,7 +240,7 @@ static QScriptValue qmlsqldatabase_open(QScriptContext *context, QScriptEngine *
         database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), dbid);
     }
     if (!database.isOpen()) {
-        QString basename = userLocalDataPath(QLatin1String("Nokia/Qt/QML/Databases/"));
+        QString basename = QmlEnginePrivate::get(engine)->offlineStoragePath + "/Databases/";
         QDir().mkpath(basename);
         basename += dbid;
         database.setDatabaseName(basename+QLatin1String(".sqllite"));