null+****@clear*****
null+****@clear*****
2012年 8月 3日 (金) 14:20:25 JST
SHIMODA Hiroshi 2012-08-03 14:20:25 +0900 (Fri, 03 Aug 2012) New Revision: 5bfd5267f5fff62187458737d3775820cd6d65f7 https://github.com/groonga/gcs/commit/5bfd5267f5fff62187458737d3775820cd6d65f7 Log: alter table => reference table Modified files: lib/database/index-field.js test/database-index-field.test.js Modified: lib/database/index-field.js (+20 -20) =================================================================== --- lib/database/index-field.js 2012-08-02 18:39:22 +0900 (35a018b) +++ lib/database/index-field.js 2012-08-03 14:20:25 +0900 (4845532) @@ -65,12 +65,12 @@ IndexField.prototype = { this._indexColumnName = this.domain.tableName + '_' + this.columnName; return this._indexColumnName; }, - get alterTableName() { - if (!this._alterTableName) - this._alterTableName = this.domain.tableName + '_' + this.columnName; - return this._alterTableName; + get referenceTableName() { + if (!this._referenceTableName) + this._referenceTableName = this.domain.tableName + '_' + this.columnName; + return this._referenceTableName; }, - get alterTableKeyType() { + get referenceTableKeyType() { var type = this.type; switch (type) { case 'uint': @@ -79,7 +79,7 @@ IndexField.prototype = { return nroonga.ShortText; default: throw new Error('Unsupported index field type ' + type + - ' for alter table'); + ' for reference table'); } }, fieldTypeToColumnType: function(fieldType) { @@ -89,7 +89,7 @@ IndexField.prototype = { case 'uint': return nroonga.UInt32; case 'literal': - return this.alterTableName; + return this.referenceTableName; default: throw new Error('Unsupported index field type ' + fieldType); } @@ -100,7 +100,7 @@ IndexField.prototype = { return 'text'; case nroonga.UInt32: return 'uint'; - case this.alterTableName: + case this.referenceTableName: return 'literal'; default: throw new Error('Unsupported column type ' + columnType); @@ -130,7 +130,7 @@ IndexField.prototype = { } else if (column.type == 'fix') { if (column.range == nroonga.UInt32) return this._type = 'uint'; - else if (column.range == this.alterTableName) + else if (column.range == this.referenceTableName) return this._type = 'literal'; } @@ -161,18 +161,18 @@ IndexField.prototype = { }, createSync: function() { - var alterTableName = this.domain.termsTableName; + var referenceTableName = this.domain.termsTableName; var type = this.type; var columnType = this.fieldTypeToColumnType(type); if (type == 'uint' || type == 'literal') { this.context.commandSync('table_create', { - name: this.alterTableName, + name: this.referenceTableName, flags: nroonga.TABLE_HASH_KEY, - key_type: this.alterTableKeyType + key_type: this.referenceTableKeyType }); - alterTableName = this.alterTableName; + referenceTableName = this.referenceTableName; } this.context.commandSync('column_create', { @@ -182,7 +182,7 @@ IndexField.prototype = { type: columnType }); this.context.commandSync('column_create', { - table: alterTableName, + table: referenceTableName, name: this.indexColumnName, flags: nroonga.INDEX_COLUMN_DEFAULT_FLAGS, type: this.domain.tableName, @@ -193,7 +193,7 @@ IndexField.prototype = { var type = this.type; if (type == 'uint' || type == 'literal') { this.context.commandSync('table_remove', { - name: this.alterTableName + name: this.referenceTableName }); } this.context.commandSync('column_remove', { @@ -206,19 +206,19 @@ IndexField.prototype = { var type = this.type; if (type == 'uint' || type == 'literal') { this.context.commandSync('column_remove', { - table: this.alterTableName, + table: this.referenceTableName, name: this.indexColumnName }); this.context.commandSync('table_remove', { - name: this.alterTableName + name: this.referenceTableName }); this.context.commandSync('table_create', { - name: this.alterTableName, + name: this.referenceTableName, flags: nroonga.TABLE_HASH_KEY, - key_type: this.alterTableKeyType + key_type: this.referenceTableKeyType }); this.context.commandSync('column_create', { - table: this.alterTableName, + table: this.referenceTableName, name: this.indexColumnName, flags: nroonga.INDEX_COLUMN_DEFAULT_FLAGS, type: this.domain.tableName, Modified: test/database-index-field.test.js (+7 -7) =================================================================== --- test/database-index-field.test.js 2012-08-02 18:39:22 +0900 (c055ccc) +++ test/database-index-field.test.js 2012-08-03 14:20:25 +0900 (c2e3d31) @@ -67,9 +67,9 @@ suite('database', function() { 'testdomain_' + Domain.DEFAULT_ID + '_valid_123'); }); - test('alterTableName', function() { + test('referenceTableName', function() { var field = new IndexField('valid_123', domain); - assert.equal(field.alterTableName, + assert.equal(field.referenceTableName, 'testdomain_' + Domain.DEFAULT_ID + '_valid_123'); }); @@ -271,9 +271,9 @@ suite('database', function() { 'table_create ' + domain.termsTableName + ' ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + - 'table_create ' + field.alterTableName + ' ' + + 'table_create ' + field.referenceTableName + ' ' + 'TABLE_HASH_KEY UInt32\n' + - 'column_create ' + field.alterTableName + ' ' + + 'column_create ' + field.referenceTableName + ' ' + field.indexColumnName + ' ' + 'COLUMN_INDEX|WITH_POSITION ' + domain.tableName + ' ' + field.columnName; @@ -314,15 +314,15 @@ suite('database', function() { 'table_create ' + domain.termsTableName + ' ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + - 'table_create ' + field.alterTableName + ' ' + + 'table_create ' + field.referenceTableName + ' ' + 'TABLE_HASH_KEY ShortText\n' + - 'column_create ' + field.alterTableName + ' ' + + 'column_create ' + field.referenceTableName + ' ' + field.indexColumnName + ' ' + 'COLUMN_INDEX|WITH_POSITION ' + domain.tableName + ' ' + field.columnName + '\n' + 'column_create ' + domain.tableName + ' ' + field.columnName + ' COLUMN_SCALAR ' + - field.alterTableName; + field.referenceTableName; assert.equal(dump, expected); }); -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...ダウンロード
