Merge pull request brianc#217 from danrzeppa/dan-temptables

brianc · brianc · commit be8039f035b4 · 2015-03-10T12:11:13.000-04:00
Support for temporary tables.
diff --git a/lib/dialect/mssql.js b/lib/dialect/mssql.js
@@ -185,7 +185,9 @@ Mssql.prototype.visitColumn = function(columnNode) {
 
 
 Mssql.prototype.visitCreate = function(create) {
-  if (!isCreateIfNotExists(create)) {
+  var isNotExists=isCreateIfNotExists(create)
+  var isTemporary=isCreateTemporary(create)
+  if (!isNotExists && !isTemporary) {
     return Mssql.super_.prototype.visitCreate.call(this, create);
   }
   // Implement our own create if not exists:
@@ -209,6 +211,7 @@ Mssql.prototype.visitCreate = function(create) {
   // if (schema) { whereClause+=' AND TABLE_SCHEMA = schemaResult.join(' ')}
   // Add some tests for this as well
 
+  if (!isNotExists) return createResult
   return ['IF NOT EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES '+whereClause+') BEGIN '+createResult.join(' ')+' END'];
 };
 
@@ -414,6 +417,10 @@ function isCreateIfNotExists(create){
   return true;
 };
 
+function isCreateTemporary(create){
+  return create.options.isTemporary
+};
+
 function isDropIfExists(drop){
   if (drop.nodes.length==0) return false;
   if (drop.nodes[0].type!='IF EXISTS') return false;
diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
@@ -249,7 +249,8 @@ Postgres.prototype.visitCreate = function(create) {
   var table = this._queryNode.table;
   var col_nodes = table.columns.map(function(col) { return col.toNode(); });
 
-  var result = ['CREATE TABLE'];
+   var result = ['CREATE TABLE'];
+  if (create.options.isTemporary) result=['CREATE TEMPORARY TABLE']
   result = result.concat(create.nodes.map(this.visit.bind(this)));
   result.push(this.visit(table.toNode()));
   var primary_col_nodes = col_nodes.filter(function(n) {
diff --git a/lib/node/create.js b/lib/node/create.js
@@ -3,5 +3,12 @@
 var Node = require(__dirname);
 
 module.exports = Node.define({
-  type: 'CREATE'
+  type: 'CREATE',
+
+  constructor: function(isTemporary) {
+    Node.call(this);
+
+    this.options = { isTemporary: isTemporary};
+  },
+
 });
diff --git a/lib/node/query.js b/lib/node/query.js
@@ -276,7 +276,7 @@ var Query = Node.define({
       this.add(createIndex);
       return createIndex;
     } else {
-      return this.add(new Create());
+      return this.add(new Create(this.table.isTemporary));
     }
   },
 
diff --git a/lib/table.js b/lib/table.js
@@ -15,6 +15,7 @@ var Table = function(config) {
   this._name = config.name;
   this._initialConfig = config;
   this.columnWhiteList = !!config.columnWhiteList;
+  this.isTemporary=!!config.isTemporary
   this.snakeToCamel = !!config.snakeToCamel;
   this.columns = [];
   this.table = this;
@@ -130,6 +131,7 @@ Table.prototype.setSchema = function(schema) {
 };
 
 Table.prototype.getName = function() {
+  if (this.sql && this.sql.dialectName=="mssql" && this.isTemporary) return "#"+this._name;
   return this._name;
 };
 
diff --git a/test/dialects/create-table-tests.js b/test/dialects/create-table-tests.js
@@ -320,3 +320,64 @@ Harness.test({
     string: 'CREATE TABLE `membership` (`group_id` int, `user_id` int, `desc` varchar, PRIMARY KEY (`group_id`, `user_id`))',
   }
 });
+
+// TEMPORARY TABLE TESTS
+
+// This tests explicitly setting the isTemporary flag to false, as opposed to all the test above here which have it
+// as undefined.
+Harness.test({
+  query: Table.define({
+    name: 'post',
+    columns: [{
+        name: 'id',
+        dataType: 'int'
+      }],
+    isTemporary:false
+  }).create(),
+  pg: {
+    text  : 'CREATE TABLE "post" ("id" int)',
+    string: 'CREATE TABLE "post" ("id" int)'
+  },
+  sqlite: {
+    text  : 'CREATE TABLE "post" ("id" int)',
+    string: 'CREATE TABLE "post" ("id" int)'
+  },
+  mysql: {
+    text  : 'CREATE TABLE `post` (`id` int)',
+    string: 'CREATE TABLE `post` (`id` int)'
+  },
+  mssql: {
+    text  : 'CREATE TABLE [post] ([id] int)',
+    string: 'CREATE TABLE [post] ([id] int)'
+  },
+  params: []
+});
+
+Harness.test({
+  query: Table.define({
+    name: 'post',
+    columns: [{
+        name: 'id',
+        dataType: 'int'
+      }],
+    isTemporary:true
+  }).create(),
+  pg: {
+    text  : 'CREATE TEMPORARY TABLE "post" ("id" int)',
+    string: 'CREATE TEMPORARY TABLE "post" ("id" int)'
+  },
+  sqlite: {
+    text  : 'CREATE TEMPORARY TABLE "post" ("id" int)',
+    string: 'CREATE TEMPORARY TABLE "post" ("id" int)'
+  },
+  mysql: {
+    text  : 'CREATE TEMPORARY TABLE `post` (`id` int)',
+    string: 'CREATE TEMPORARY TABLE `post` (`id` int)'
+  },
+  //mssql: {
+  //  text  : 'CREATE TABLE [#post] ([id] int)',
+  //  string: 'CREATE TABLE [#post] ([id] int)'
+  //},
+  params: []
+});
+

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ var Query = Node.define({`
`276`	`276`	`this.add(createIndex);`
`277`	`277`	`return createIndex;`
`278`	`278`	`} else {`
`279`		`- return this.add(new Create());`
	`279`	`+ return this.add(new Create(this.table.isTemporary));`
`280`	`280`	`}`
`281`	`281`	`},`
`282`	`282`