1) 1.11.0.

2) The SQLite flavor is added.
3) `Column.default()` is added.

Author: RobinBobin

README.md

@@ -207,16 +207,20 @@ This is the "entry point" of the builder. It contains only `static` methods and
 
 The following methods return `this` to allow method chaining.
 
- - primary()
-	
-	Adds `PRIMARY KEY` to this column definition.
+ - <a name="columnDefault"></a>default()
+
+	Adds `DEFAULT value` to this column definition. The `value` is quoted if it's a string.
 
  - foreign()
 
 	Adds `REFERENCES tableName(columnName)` to this column definition.
 
 		tb.integer("type").foreign("tableName", "columnName");
 
+ - notNull()
+	
+	Adds `NOT NULL` to this column definition.
+
  - onDelete()
 
 	Adds `ON DELETE action` to this column definition.
@@ -225,9 +229,9 @@ The following methods return `this` to allow method chaining.
             .foreign("tableName", "column name")
             .onDelete("action");
 
- - notNull()
+ - primary()
 
-	Adds `NOT NULL` to this column definition.
+	Adds `PRIMARY KEY` to this column definition.	
 
 #### <a name="uniqueBuilder"></a>[UniqueBuilder<i class="icon-up"></i>](#cuniqueBuilder)
 
@@ -483,7 +487,8 @@ The following methods return `this` to allow method chaining.
 
 Version number|Changes
 -|-
-v1.10.0|1. `SqlBuilder.beginTransaction()` added.<br>2. Several `SqlBuilder` documented.
+v1.11.0|1. The SQLite flavor is added.<br>2. [`Column.default()`](#columnDefault) is added.
+v1.10.0|1. `SqlBuilder.beginTransaction()` added.<br>2. Several `SqlBuilder` methods documented.
 v1.9.2|`Condition.like()` parameter default values were invalid.
 v1.9.1|`Condition.like()`: parameters `startsWith` / `endsWith` [added](#conditionLike).
 v1.9.0|Parameter `debug` is added to each sql-executing method.

index.js

@@ -1,10 +1,14 @@
-import SqlBldr from "./js/SqlBuilder";
+import Condition from "./js/Condition";
 import SelectBuilder from "./js/SelectBuilder";
+import SqlBldr from "./js/SqlBuilder";
 import WhereBuilder from "./js/WhereBuilder";
-import Condition from "./js/Condition";
+import PG from "./js/flavors/PG";
+import SQLite from "./js/flavors/SQLite/SQLite";
 
 export default class SqlBuilder extends SqlBldr {
-   static SelectBuilder = SelectBuilder;
-   static WhereBuilder = WhereBuilder;
-   static Condition = Condition;
+  static Condition = Condition;
+  static PG = PG;
+  static SelectBuilder = SelectBuilder;
+  static SQLite = SQLite;
+  static WhereBuilder = WhereBuilder;
 };

js/Column.js

@@ -1,33 +1,41 @@
-import { ArrayStringifier } from "simple-common-utils";
+import {
+  ArrayStringifier,
+  StaticUtils
+} from "simple-common-utils";
 import Entry from "./Entry";
+import SqlBuilderOptions from "./SqlBuilderOptions";
 
 export default class Column extends Entry {
-   constructor(name, type) {
-      super(name);
-      
-      this.type = type;
-   }
-   
-   primary() {
-      return this.attr("PRIMARY KEY");
-   }
-   
-   foreign(tableName, columnName) {
-      return this.attr(`REFERENCES ${tableName}(${columnName})`);
-   }
-   
-   onDelete(action) {
-      return this.attr(`ON DELETE ${action}`);
-   }
-   
-   notNull() {
-      return this.attr("NOT NULL");
-   }
-   
-   toString() {
-      return `${this.name} ${this.type}` + new ArrayStringifier(this.attrs)
-         .setPrefix(" ")
-         .setSeparator(" ")
-         .process();
-   }
+  constructor(name, type) {
+    super(name);
+    
+    this.type = type;
+  }
+  
+  default(value) {
+    return this.attr(`DEFAULT ${StaticUtils.quoteIfString(value, SqlBuilderOptions.getQuotingSymbol())}`);
+  }
+  
+  foreign(tableName, columnName) {
+    return this.attr(`REFERENCES ${tableName}(${columnName})`);
+  }
+  
+  notNull() {
+    return this.attr("NOT NULL");
+  }
+  
+  onDelete(action) {
+    return this.attr(`ON DELETE ${action}`);
+  }
+  
+  primary() {
+    return this.attr("PRIMARY KEY");
+  }
+  
+  toString() {
+    return `${this.name} ${this.type}` + new ArrayStringifier(this.attrs)
+      .setPrefix(" ")
+      .setSeparator(" ")
+      .process();
+  }
 }

js/InsertUpdateBuilder.js

@@ -42,8 +42,16 @@ export default class InsertUpdateBuilder extends BuilderWithWhere {
             str = this._finalizeToStringProcessing(str);
          }
       } else {
+         let prefix = "UPDATE";
+         
+         if (this.table) {
+            prefix += ` ${this.table}`;
+         }
+         
+         prefix += " SET ";
+         
          str = new ArrayStringifier(this.pairs)
-            .setPrefix(`UPDATE ${this.table} SET `)
+            .setPrefix(prefix)
             .setElementProcessor(pair => `${pair[0]} = ${pair[1]}`)
             .setPostfix(`${this.whereBuilder}`)
             .process();

js/SqlBuilder.js

@@ -3,17 +3,8 @@ import SelectBuilder from "./SelectBuilder";
 import SqlBuilderOptions from "./SqlBuilderOptions";
 import TableBuilder from "./TableBuilder";
 import WhereBuilder from "./WhereBuilder";
-import PG from "./flavors/PG";
-
-function executeSql(callback, obj, debug = false) {
-  callback(obj);
-  
-  return SqlBuilder.executeSql(obj.toString(), debug);
-}
 
 export default class SqlBuilder {
-  static PG = PG;
-  
   static beginTransaction(debug = false) {
     return SqlBuilder.executeSql("BEGIN TRANSACTION", debug);
   }
@@ -23,7 +14,7 @@ export default class SqlBuilder {
   }
 
   static createTable(name, callback, ifNotExists = true, debug = false) {
-    return executeSql(callback, new TableBuilder(name, ifNotExists), debug);
+    return SqlBuilder.prepareAndExecute(callback, new TableBuilder(name, ifNotExists), debug);
   }
 
   static delete(table, callbackOrWhere, debug = false) {
@@ -59,7 +50,13 @@ export default class SqlBuilder {
   }
 
   static insert(table, callback, debug = false) {
-    return executeSql(callback, new InsertUpdateBuilder(true, table), debug);
+    return SqlBuilder.prepareAndExecute(callback, new InsertUpdateBuilder(true, table), debug);
+  }
+  
+  static prepareAndExecute(callback, obj, debug = false) {
+    callback(obj);
+    
+    return SqlBuilder.executeSql(obj.toString(), debug);
   }
 
   static rollback(debug = false) {
@@ -72,7 +69,7 @@ export default class SqlBuilder {
     let result;
 
     if (!asSubquery) {
-      result = executeSql(callback, sb, debug);
+      result = SqlBuilder.prepareAndExecute(callback, sb, debug);
     } else {
       callback(sb);
 
@@ -117,6 +114,6 @@ export default class SqlBuilder {
   }
 
   static update(table, callback, debug = false) {
-    return executeSql(callback, new InsertUpdateBuilder(false, table), debug);
+    return SqlBuilder.prepareAndExecute(callback, new InsertUpdateBuilder(false, table), debug);
   }
 }

js/flavors/Flavor.js

@@ -1,2 +1,9 @@
 export default class SqlFlavor {
-}
+  static extend() {
+    throw new Error("SqlFlavor.extend() must be overriden");
+  }
+  
+  static reset() {
+    throw new Error("SqlFlavor.reset() must be overriden");
+  }
+};

js/flavors/SQLite/SQLite.js

@@ -0,0 +1,17 @@
+import UpsertBuilder from "./UpsertBuilder";
+import Flavor from "../Flavor";
+import SqlBuilder from "../../SqlBuilder";
+
+export default class SQLite extends Flavor {
+  static extend() {
+    SqlBuilder.upsert = SQLite.__upsert;
+  }
+  
+  static reset() {
+    delete SqlBuilder.upsert;
+  }
+  
+  static __upsert(table, callback, debug = false) {
+    return SqlBuilder.prepareAndExecute(callback, new UpsertBuilder(table), debug);
+  }
+};

js/flavors/SQLite/UpsertBuilder.js

@@ -0,0 +1,60 @@
+import { ArrayStringifier } from "simple-common-utils";
+import BuilderWithWhere from "../../BuilderWithWhere";
+import InsertUpdateBuilder from "../../InsertUpdateBuilder";
+
+export default class UpsertBuilder extends InsertUpdateBuilder {
+  constructor(table) {
+    super(true, table);
+  }
+  
+  doNothing() {
+    this.__doUpdate = null;
+  }
+  
+  doUpdate() {
+    this.__doUpdate = new InsertUpdateBuilder(false, "");
+    
+    return this.__doUpdate;
+  }
+  
+  onConflict(...indexedColumns) {
+    this.__indexedColumns = indexedColumns.length ? indexedColumns : null;
+    
+    return this;
+  }
+  
+  toString() {
+    let str = super.toString();
+    
+    str += " ON CONFLICT";
+    
+    if (this.__indexedColumns) {
+      str += new ArrayStringifier(this.__indexedColumns)
+        .setPrefix(" (")
+        .setPostfix(")")
+        .process();
+      
+      if (this.__onConflictWhere) {
+        str += this.__onConflictWhere.whereBuilder.toString();
+      }
+    }
+    
+    str += " DO ";
+    
+    if (!this.__doUpdate) {
+      str += "NOTHING";
+    } else {
+      str += this.__doUpdate.toString();
+    }
+    
+    return str;
+  }
+  
+  where(callbackOrConditionString, add = true) {
+    this.__onConflictWhere = new BuilderWithWhere();
+    
+    this.__onConflictWhere.where(callbackOrConditionString, add);
+    
+    return this;
+  }
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-sql-query-builder",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "A simple SQL query builder.",
   "main": "index.js",
   "scripts": {