Merge lp:~kalikiana/u1db-qt/query-crash-fix into lp:u1db-qt

[Cris Dywan]

Bail out of dataInvalidated if index is unset

Bail out of dataInvalidated if index is unset

[Kevin Wright (kevin-wright-1)]

Confirmed.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'query.cpp'
--- query.cpp	2013-04-06 02:14:24 +0000
+++ query.cpp	2013-04-12 11:53:35 +0000
@@ -107,6 +107,9 @@
 {
     m_hash.clear();
 
+    if (!m_index)
+        return;
+
     Database *db = m_index->getDatabase();
     if(db){
         if(db->documentCount>0){

=== modified file 'tests/tst_database.qml'
--- tests/tst_database.qml	2013-04-09 11:32:11 +0000
+++ tests/tst_database.qml	2013-04-12 11:53:35 +0000
@@ -72,6 +72,17 @@
         range: [['a', 'b'], ['*']]
     }
 
+    U1db.Query {
+        id: allQuery
+        index: myIndex
+        query: '*'
+    }
+
+    U1db.Query {
+        id: defaultAllQuery
+        index: myIndex
+    }
+
     ListView {
         id: myList
         model: myDatabase