Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/declarative/sql/data/error-outsidetransaction.js b/tests/auto/declarative/sql/data/error-outsidetransaction.js
new file mode 100644
index 0000000..a7af3bd
--- /dev/null
+++ b/tests/auto/declarative/sql/data/error-outsidetransaction.js
@@ -0,0 +1,17 @@
+function test() {
+    var db = openDatabaseSync("QmlTestDB-data/error-notransaction", "1.0", "Test database from Qt autotests", 1000000);
+    var r="transaction_not_finished";
+    var v;
+
+    try {
+        db.transaction(function(tx) { v = tx });
+        v.executeSql("SELECT 'bad'")
+    } catch (err) {
+        if (err.message == "executeSql called outside transaction()")
+            r = "passed";
+        else
+            r = "WRONG ERROR="+err.message;
+    }
+
+    return r;
+}