Merge lp:~kevin-wright-1/u1db-qt/index-10-mai-i into lp:u1db-qt

[Kevin Wright]

Changed some lines in Index::setExpression to fix a bug that caused an Index to not be pointed to as expected, and missed having itself defined properly.

Changed some lines in Index::setExpression to fix a bug that caused an Index to not be pointed to as expected, and missed having itself defined properly.

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

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

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

I proposed a branch incorporating this fix with a test case.

review: Disapprove

Unmerged revisions

=== modified file 'src/index.cpp'
--- src/index.cpp	2013-04-25 13:38:33 +0000
+++ src/index.cpp	2013-05-10 13:46:44 +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);
 }