Merge pull request brianc#65 from brianc/hotfix/rename-table

brianc · brianc · commit b4d257f7ddea · 2013-05-14T19:49:13.000-07:00
renameColumn not working?
diff --git a/lib/table.js b/lib/table.js
@@ -60,13 +60,13 @@ Table.prototype.hasColumn = function(col) {
 Table.prototype.getColumn =
 Table.prototype.get =
 function(colName) {
-  var col = this.createColumn(colName);
-
-  if(!this.hasColumn(col)) {
-    throw new Error('Table ' + this._name + ' does not have a column named ' + colName);
+  for(var i = 0; i < this.columns.length; i++) {
+    var col = this.columns[i];
+    if(col.name == colName) {
+      return col;
+    }
   }
-
-  return col;
+  throw new Error('Table ' + this._name + ' does not have a column named ' + colName);
 };
 
 Table.prototype.getSchema = function() {
diff --git a/test/dialects/alter-table-tests.js b/test/dialects/alter-table-tests.js
@@ -121,3 +121,21 @@ Harness.test({
   mysql : 'ALTER TABLE `group` CHANGE COLUMN `userId` `id` varchar(100)',
   params: []
 });
+
+var UserWithSignature = Table.define({
+  name:    'UserWithSignature',
+  columns: [{
+    name:     'Signature',
+    dataType: "VARCHAR(255) NOT NULL DEFAULT 'Signature'"
+  }]
+})
+
+Harness.test({
+  query:  UserWithSignature.alter().renameColumn(UserWithSignature.get('Signature'), 'sig'),
+  pg:     'ALTER TABLE "UserWithSignature" RENAME COLUMN "Signature" TO "sig"',
+  mysql:  'ALTER TABLE `UserWithSignature` CHANGE COLUMN `Signature` `sig` VARCHAR(255) NOT NULL DEFAULT \'Signature\'',
+  sqlite: {
+    text  : 'Sqlite cannot rename columns',
+    throws: true
+  }
+})
