[Groonga-commit] groonga/gcs [master] Obsolete Domain#getAlterTableName

Back to archive index

null+****@clear***** null+****@clear*****
2012年 7月 9日 (月) 17:50:59 JST


SHIMODA Hiroshi	2012-07-09 17:50:59 +0900 (Mon, 09 Jul 2012)

  New Revision: 4e6ba8dc25447954a6dbc962e96af3c8e50b327b
  https://github.com/groonga/gcs/commit/4e6ba8dc25447954a6dbc962e96af3c8e50b327b

  Log:
    Obsolete Domain#getAlterTableName

  Modified files:
    lib/api/2011-02-01/configuration.js
    lib/domain.js
    test/domain.test.js

  Modified: lib/api/2011-02-01/configuration.js (+3 -5)
===================================================================
--- lib/api/2011-02-01/configuration.js    2012-07-09 17:48:02 +0900 (6bf2198)
+++ lib/api/2011-02-01/configuration.js    2012-07-09 17:50:59 +0900 (254c5d3)
@@ -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
       });
     }
 

  Modified: lib/domain.js (+0 -3)
===================================================================
--- lib/domain.js    2012-07-09 17:48:02 +0900 (3d3fabb)
+++ lib/domain.js    2012-07-09 17:50:59 +0900 (2f419be)
@@ -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));

  Modified: test/domain.test.js (+6 -1)
===================================================================
--- test/domain.test.js    2012-07-09 17:48:02 +0900 (6a0e60d)
+++ test/domain.test.js    2012-07-09 17:50:59 +0900 (7e1d596)
@@ -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');
     });
   });
 });
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
Download 



Groonga-commit メーリングリストの案内
Back to archive index