Merge lp:~kevin-wright-1/u1db-qt/kevin-wright-1-addCreateIndexList into lp:u1db-qt

[Kevin Wright]

Added the function int Database::createIndexList(QString index_name, QStringList expressions), which corresponds to the u1db.c function: int u1db_create_index_list(u1database *db, const char *index_name, int n_expressions, const char **expressions). It is currently marked INCOMPLETE.

[lp:~kevin-wright-1/u1db-qt/kevin-wright-1-addCreateIndexList]

14. By Kevin Wright on 2013-02-26

Added the function int Database::createIndex(u1database *db, const char *index_name, QStringList expressions). It is currently marked INCOMPLETE.

15. By Kevin Wright on 2013-02-26

Modified comment: int Database::createIndex(QString index_name, QStringList expressions), which corresponds to the u1db.c function: int u1db_create_index(u1database *db, const char *index_name, int n_expressions, ...). It is being marked as INCOMPLETE

[Cris Dywan (kalikiana)]

We might want to replace the return values with setError() later. Also for consistency it'd be nice to use placeholders (:foo instead of ?) everywhere. For now, this looks great!

review: Approve

[Cris Dywan (kalikiana)]

Note that I'll rename createIndex(List) to putIndex(List) because it conflicts with QAbstractListModel methods.

=== modified file 'database.cpp'
--- database.cpp	2013-02-25 12:49:54 +0000
+++ database.cpp	2013-02-26 13:57:20 +0000
@@ -259,6 +259,123 @@
     return m_path;
 }
 
+/* int Database::createIndexList(QString index_name, QStringList expressions) 
+
+corresponds to the u1db.c function:
+
+int u1db_create_index_list(u1database *db, const char *index_name, int n_expressions, const char **expressions) 
+
+It is currently marked INCOMPLETE */
+
+
+/* Tests to create for createIndexList: does it return a value, what is the value it returns, is the value returned an acceptable value, what is the expected result for an index_name that we know is unique as well as one we know is not unique, is the database NULL or not, is the expressions list empty or not, is the index_name empty or not
+*/
+
+int Database::createIndexList(QString index_name, QStringList expressions)
+{
+    int U1DB_OK, U1DB_INVALID_PARAMETER, U1DB_DUPLICATE_INDEX_NAME, SQLITE_OK = 0; // These are here temporarily
+    int status = U1DB_OK; 
+    int i = 0;
+
+    if (m_db.isOpen() == false  || index_name.isEmpty() == false || expressions.isEmpty() == false) {
+        return U1DB_INVALID_PARAMETER; // is this really the correct return value for all three of the conditions above?
+    }
+    
+    for (i = 0; i < expressions.count(); ++i) {
+        if (expressions[i].isEmpty() == true || expressions[i].isNull() == true) {
+            return U1DB_INVALID_PARAMETER;
+        }
+    }
+       
+    //status = u1db__find_unique_expressions(db, n_expressions, expressions, &n_unique, &unique_expressions); // needs to be modified
+
+    if (status != U1DB_OK) {
+        return status;
+    }
+        
+    //QString statement = "SELECT field FROM index_definitions WHERE name = ".index_name." ORDER BY offset DESC";
+    QSqlQuery query; 
+    query.prepare("SELECT field FROM index_definitions WHERE name = ? ORDER BY offset DESC");
+    query.addBindValue(index_name);
+    
+    QStringList results;
+    
+    //QSqlQuery query(statement);
+    
+    // Add a check to ensure our query was OK -- what return value do we need here if there was an error rather than simply an empty set of results?
+    
+    while (query.next()) {    	
+         results.append(query.value(0).toString());  
+    }
+    
+    for (i = 0; i < expressions.count(); i++) {
+        if (results.contains(expressions.at(i))==true) {
+            return U1DB_DUPLICATE_INDEX_NAME;
+        }
+    }     
+        
+    if (results.count() > 0) {
+        status = SQLITE_OK;
+        return status;
+    }
+    else{
+    	
+    
+    // Should probably use a prepared statement here ... or some alternative
+    
+    for (i = 0; i < expressions.count(); ++i) {
+    	   							
+     			query.prepare("INSERT INTO index_definitions VALUES (?, ?, ?)");
+     			query.addBindValue(index_name);
+     			query.addBindValue(i);
+     			query.addBindValue(expressions.at(i));
+     			
+     			if(query.exec()==false){
+     				// Actually in the orginal C function the check was to see if the return value was SQLITE_CONSTRAINT and not only whether the exec generally failed
+     				status = U1DB_DUPLICATE_INDEX_NAME;
+     				// Is it safe to assume that all insert statements in this loop need to be rolled back?
+     				return status;
+     			}
+     			
+    }
+    
+    //status = u1db__index_all_docs(db, n_unique, unique_expressions); // Needs to be modified
+    
+    return status;
+    
+    }
+    
+    
+    
+}
+
+
+/* int Database::createIndex(QString index_name, QStringList expressions)
+
+corresponds to the u1db.c function:
+
+int u1db_create_index(u1database *db, const char *index_name, int n_expressions, ...) 
+
+It is being marked as INCOMPLETE */
+
+int Database::createIndex(QString index_name, QStringList expressions)
+{
+   int U1DB_OK, U1DB_NOMEM;
+   int i;
+
+   int status = U1DB_OK;
+        
+   if(expressions.isEmpty() == true) {
+	status = U1DB_NOMEM;	
+   }
+   else
+   {    		
+     status = createIndexList(index_name, expressions);
+     return status;
+   }
+    
+}
+
 QT_END_NAMESPACE_U1DB
 
 #include "moc_database.cpp"

=== modified file 'database.h'
--- database.h	2013-02-25 12:49:54 +0000
+++ database.h	2013-02-26 13:57:20 +0000
@@ -47,6 +47,8 @@
     Q_INVOKABLE int putDoc(QVariant newDoc, const QString& docID=QString());
     Q_INVOKABLE QList<QVariant> listDocs();
     Q_INVOKABLE QString lastError();
+    Q_INVOKABLE int createIndexList(QString index_name, QStringList expressions);
+    Q_INVOKABLE int createIndex(QString index_name, QStringList expressions);
 Q_SIGNALS:
     void pathChanged(const QString& path);
     void errorChanged(const QString& error);