Obsolete Domain#getAlterTableName

groonga · Jul 9, 2012 · 4e6ba8d · 4e6ba8d
1 parent a062f83
commit 4e6ba8d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/api/2011-02-01/configuration.js b/lib/api/2011-02-01/configuration.js
@@ -223,14 +223,13 @@ handlers.DefineIndexField = function(database, request, response) {
         source: field.columnName
       });
     } else if (fieldType == 'uint') {
-      var alterTableName = domain.getAlterTableName(field.columnName);
       database.commandSync('table_create', {
-        name: alterTableName,
+        name: field.alterTableName,
         flags: Database.TABLE_HASH_KEY,
         key_type: columnType
       });
       database.commandSync('column_create', {
-        table: alterTableName,
+        table: field.alterTableName,
         name: field.indexColumnName,
         flags: Database.INDEX_COLUMN_DEFAULT_FLAGS,
         type: domain.tableName,
@@ -283,9 +282,8 @@ handlers.DeleteIndexField = function(database, request, response) {
     });
 
     if (column.type == field.fieldTypeToColumnType('uint')) {
-      var alterTableName = domain.getAlterTableName(field.columnName);
       database.commandSync('table_remove', {
-        name: alterTableName
+        name: field.alterTableName
       });
     }
 

diff --git a/lib/domain.js b/lib/domain.js
@@ -70,9 +70,6 @@ Domain.prototype = {
       this._termsTableName = this.tableName + '_BigramTerms';
     return this._termsTableName;
   },
-  getAlterTableName: function(field) {
-    return this.tableName + '_' + field;
-  },
   getIndexField: function(field) {
     return this.indexFields[field] ||
            (this.indexFields[field] = new IndexField(field, this));

diff --git a/test/domain.test.js b/test/domain.test.js
@@ -184,6 +184,11 @@ suite('domain', function() {
       assert.equal(field.indexColumnName, 'testdomain_valid_123');
     });
 
+    test('alterTableName', function() {
+      var field = new IndexField('valid_123', domain);
+      assert.equal(field.alterTableName, 'testdomain_valid_123');
+    });
+
     test('fieldTypeToColumnType (text)', function() {
       var field = new IndexField('valid_123', domain);
       assert.equal(field.fieldTypeToColumnType('text'),
@@ -199,7 +204,7 @@ suite('domain', function() {
     test('fieldTypeToColumnType (literal)', function() {
       var field = new IndexField('valid_123', domain);
       assert.equal(field.fieldTypeToColumnType('literal'),
-                   domain.tableName + '_valid_123');
+                   'testdomain_valid_123');
     });
   });
 });