From b46652b4ac5c5a885423b208eca47123627d0bd7 Mon Sep 17 00:00:00 2001
From: Andy Katz <andrewk@indeed.com>
Date: Sat, 7 Jan 2017 19:10:22 -0600
Subject: [PATCH 1/2] add OR IGNORE for sqlite

---
 lib/dialect/postgres.js       | 14 +++++++++-----
 lib/dialect/sqlite.js         |  4 ++++
 lib/node/orIgnore.js          |  7 +++++++
 lib/node/query.js             |  6 ++++++
 test/dialects/insert-tests.js | 24 ++++++++++++++++++++++++
 5 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 lib/node/orIgnore.js

diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
index 9628f85d..6e67c38e 100644
--- a/lib/dialect/postgres.js
+++ b/lib/dialect/postgres.js
@@ -162,6 +162,7 @@ Postgres.prototype.visit = function(node) {
     case 'DEFAULT'         : return this.visitDefault(node);
     case 'IF EXISTS'       : return this.visitIfExists();
     case 'IF NOT EXISTS'   : return this.visitIfNotExists();
+    case 'OR IGNORE'       : return this.visitOrIgnore();
     case 'CASCADE'         : return this.visitCascade();
     case 'RESTRICT'        : return this.visitRestrict();
     case 'RENAME'          : return this.visitRename(node);
@@ -237,11 +238,10 @@ Postgres.prototype.visitInsert = function(insert) {
   // don't use table.column for inserts
   this._visitedInsert = true;
 
-  var result = [
-    'INSERT INTO',
-    this.visit(this._queryNode.table.toNode()),
-    '(' + insert.columns.map(this.visit.bind(this)).join(', ') + ')'
-  ];
+  var result = ['INSERT'];
+  result = result.concat(insert.nodes.map(this.visit.bind(this)));
+  result.push('INTO ' + this.visit(this._queryNode.table.toNode()));
+  result.push('(' + insert.columns.map(this.visit.bind(this)).join(', ') + ')');
 
   var paramNodes = insert.getParameters();
 
@@ -995,6 +995,10 @@ Postgres.prototype.visitIfNotExists = function() {
   return ['IF NOT EXISTS'];
 };
 
+Postgres.prototype.visitOrIgnore = function() {
+  throw new Error('PostgreSQL does not allow orIgnore clause.');
+};
+
 Postgres.prototype.visitCascade = function() {
   return ['CASCADE'];
 };
diff --git a/lib/dialect/sqlite.js b/lib/dialect/sqlite.js
index 0cd31335..948c4191 100644
--- a/lib/dialect/sqlite.js
+++ b/lib/dialect/sqlite.js
@@ -165,4 +165,8 @@ Sqlite.prototype.visitBinary = function(binary) {
   return Sqlite.super_.prototype.visitBinary.call(this, binary);
 };
 
+Sqlite.prototype.visitOrIgnore = function() {
+  return ['OR IGNORE']
+};
+
 module.exports = Sqlite;
diff --git a/lib/node/orIgnore.js b/lib/node/orIgnore.js
new file mode 100644
index 00000000..849750bc
--- /dev/null
+++ b/lib/node/orIgnore.js
@@ -0,0 +1,7 @@
+'use strict';
+
+var Node = require(__dirname);
+
+module.exports = Node.define({
+  type: 'OR IGNORE'
+});
diff --git a/lib/node/query.js b/lib/node/query.js
index 9abc9b64..1927dbe9 100644
--- a/lib/node/query.js
+++ b/lib/node/query.js
@@ -37,6 +37,7 @@ var ParameterNode   = require('./parameter');
 var PrefixUnaryNode = require('./prefixUnary');
 var IfExists        = require('./ifExists');
 var IfNotExists     = require('./ifNotExists');
+var OrIgnore        = require('./orIgnore');
 var Cascade         = require('./cascade');
 var Restrict        = require('./restrict');
 var Indexes         = require('./indexes');
@@ -468,6 +469,11 @@ var Query = Node.define({
     return this;
   },
 
+  orIgnore: function() {
+    this.nodes[0].unshift(new OrIgnore());
+    return this;
+  },
+
   cascade: function() {
     this.nodes[0].add(new Cascade());
     return this;
diff --git a/test/dialects/insert-tests.js b/test/dialects/insert-tests.js
index aca6be7b..60ba6a62 100644
--- a/test/dialects/insert-tests.js
+++ b/test/dialects/insert-tests.js
@@ -680,6 +680,30 @@ Harness.test({
   params: [2, 'test']
 });
 
+Harness.test({
+  query: customerAliasTable.insert({
+    id : 2,
+    name : 'test'
+  }).orIgnore(),
+  mysql: {
+    throws: true
+  },
+  sqlite: {
+    text  : 'INSERT OR IGNORE INTO "customer" ("id", "name") VALUES ($1, $2)',
+    string: 'INSERT OR IGNORE INTO "customer" ("id", "name") VALUES (2, \'test\')'
+  },
+  pg: {
+    throws: true
+  },
+  mssql: {
+    throws: true
+  },
+  oracle: {
+    throws: true
+  },
+  params: [2, 'test']
+});
+
 Harness.test({
   query: post.insert({
     content: 'test',

From e3f1596e225dca8c31dbeda938bff0ffc2724868 Mon Sep 17 00:00:00 2001
From: Andy Katz <andrewk@indeed.com>
Date: Sat, 7 Jan 2017 19:16:51 -0600
Subject: [PATCH 2/2] add missing semicolon

---
 lib/dialect/sqlite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialect/sqlite.js b/lib/dialect/sqlite.js
index 948c4191..fb2450d4 100644
--- a/lib/dialect/sqlite.js
+++ b/lib/dialect/sqlite.js
@@ -166,7 +166,7 @@ Sqlite.prototype.visitBinary = function(binary) {
 };
 
 Sqlite.prototype.visitOrIgnore = function() {
-  return ['OR IGNORE']
+  return ['OR IGNORE'];
 };
 
 module.exports = Sqlite;