qlite: cleanup, fix nullity issues

1 files changed, 16 insertions, 47 deletions

diff --git a/qlite/src/update_builder.vala b/qlite/src/update_builder.vala
index 6aad2aa1..139009c5 100644
--- a/qlite/src/update_builder.vala
+++ b/qlite/src/update_builder.vala
@@ -5,18 +5,18 @@ namespace Qlite {
 public class UpdateBuilder : StatementBuilder {
 
     // UPDATE [OR ...]
-    private string or_val;
+    private string? or_val;
 
     // [...]
-    private Table table;
+    private Table? table;
     private string table_name;
 
     // SET [...]
-    private StatementBuilder.Field[] fields;
+    private StatementBuilder.AbstractField[] fields = {};
 
     // WHERE [...]
-    private string selection;
-    private StatementBuilder.Field[] selection_args;
+    private string selection = "1";
+    private StatementBuilder.AbstractField[] selection_args = {};
 
     internal UpdateBuilder(Database db, Table table) {
         base(db);
@@ -35,59 +35,28 @@ public class UpdateBuilder : StatementBuilder {
     }
 
     public UpdateBuilder set<T>(Column<T> column, T value) {
-        if (fields == null) {
-            fields = { new StatementBuilder.Field<T>(column, value) };
-        } else {
-            StatementBuilder.Field[] fields_new = new StatementBuilder.Field[fields.length+1];
-            for (int i = 0; i < fields.length; i++) {
-                fields_new[i] = fields[i];
-            }
-            fields_new[fields.length] = new Field<T>(column, value);
-            fields = fields_new;
-        }
+        fields += new Field<T>(column, value);
         return this;
     }
 
     public UpdateBuilder set_null<T>(Column<T> column) throws DatabaseError {
         if (column.not_null) throw new DatabaseError.ILLEGAL_QUERY(@"Can't set non-null column $(column.name) to null");
-        if (fields == null) {
-            fields = { new NullField<T>(column) };
-        } else {
-            StatementBuilder.Field[] fields_new = new StatementBuilder.Field[fields.length+1];
-            for (int i = 0; i < fields.length; i++) {
-                fields_new[i] = fields[i];
-            }
-            fields_new[fields.length] = new NullField<T>(column);
-            fields = fields_new;
-        }
+        fields += new NullField<T>(column);
         return this;
     }
 
-    public UpdateBuilder where(string selection, string[]? selection_args = null) throws DatabaseError {
-        if (this.selection != null) throw new DatabaseError.ILLEGAL_QUERY("selection was already done, but where() was called.");
+    public UpdateBuilder where(string selection, string[] selection_args = {}) throws DatabaseError {
+        if (this.selection != "1") throw new DatabaseError.ILLEGAL_QUERY("selection was already done, but where() was called.");
         this.selection = selection;
-        if (selection_args != null) {
-            this.selection_args = new StatementBuilder.Field[selection_args.length];
-            for (int i = 0; i < selection_args.length; i++) {
-                this.selection_args[i] = new StatementBuilder.StringField(selection_args[i]);
-            }
+        foreach (string arg in selection_args) {
+            this.selection_args += new StatementBuilder.StringField(arg);
         }
         return this;
     }
 
     public UpdateBuilder with<T>(Column<T> column, string comp, T value) {
-        if (selection == null) {
-            selection = @"$(column.name) $comp ?";
-            selection_args = { new StatementBuilder.Field<T>(column, value) };
-        } else {
-            selection = @"($selection) AND $(column.name) $comp ?";
-            StatementBuilder.Field[] selection_args_new = new StatementBuilder.Field[selection_args.length+1];
-            for (int i = 0; i < selection_args.length; i++) {
-                selection_args_new[i] = selection_args[i];
-            }
-            selection_args_new[selection_args.length] = new Field<T>(column, value);
-            selection_args = selection_args_new;
-        }
+        selection_args += new Field<T>(column, value);
+        selection = @"($selection) AND $(column.name) $comp ?";
         return this;
     }
 
@@ -103,13 +72,13 @@ public class UpdateBuilder : StatementBuilder {
 
     internal override Statement prepare() throws DatabaseError {
         string sql = "UPDATE";
-        if (or_val != null) sql += @" OR $or_val";
+        if (or_val != null) sql += @" OR $((!)or_val)";
         sql += @" $table_name SET ";
         for (int i = 0; i < fields.length; i++) {
             if (i != 0) {
                 sql += ", ";
             }
-            sql += @"$(fields[i].column.name) = ?";
+            sql += @"$(((!)fields[i].column).name) = ?";
         }
         sql += @" WHERE $selection";
         Statement stmt = db.prepare(sql);
@@ -123,7 +92,7 @@ public class UpdateBuilder : StatementBuilder {
     }
 
     public void perform() throws DatabaseError {
-        if (fields == null || fields.length == 0) return;
+        if (fields.length == 0) return;
         if (prepare().step() != DONE) {
             throw new DatabaseError.EXEC_ERROR(@"SQLite error: $(db.errcode()) - $(db.errmsg())");
         }