Merge lp:~kalikiana/u1db-qt/no.results into lp:u1db-qt

[Cris Dywan]

Shuffle Index::setExpression to ensure Index is defined

Shuffle Index::setExpression to ensure Index is defined

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

PASSED: Continuous integration, rev:90
http://91.189.93.125:8080/job/u1db-qt-ci/45/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/45
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/45

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/45/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

review: Approve

=== modified file 'src/index.cpp'
--- src/index.cpp	2013-04-25 13:38:33 +0000
+++ src/index.cpp	2013-05-10 16:08:25 +0000
@@ -146,14 +146,14 @@
     if (m_expression == expression)
         return;
 
-    if (m_database)
-    {
-        m_database->putIndex(m_name, expression);
-        Q_EMIT dataInvalidated();
-    }
-
     m_expression = expression;
 
+    if (m_database)
+    {
+        m_database->putIndex(m_name, m_expression);
+        Q_EMIT dataInvalidated();
+    }
+   
     Q_EMIT expressionChanged(expression);
 }
 

=== modified file 'tests/tst_query.qml'
--- tests/tst_query.qml	2013-05-01 23:06:01 +0000
+++ tests/tst_query.qml	2013-05-10 16:08:25 +0000
@@ -26,6 +26,7 @@
 
     U1db.Database {
         id: gents
+        path: 'aDatabaseU'
     }
 
     U1db.Document {
@@ -131,12 +132,11 @@
     function workaroundQueryAndWait (buggyQuery) {
         var realQuery = buggyQuery.query;
         spyDocumentsChanged.target = buggyQuery
-        buggyQuery.query = '*'
-        buggyQuery.query = realQuery;
         spyDocumentsChanged.wait();
     }
 
     function test_0_wrongUse () {
+        workaroundQueryAndWait(wrongQuery)
         ignoreWarning('u1db: Unexpected type QVariantMap for query')
         wrongQuery.query = { 'name': 'Ivanka' }
         ignoreWarning('u1db: Unexpected type QObject* for query')