SHIMODA Hiroshi
null+****@clear*****
Mon Aug 13 13:30:24 JST 2012
SHIMODA Hiroshi 2012-08-13 13:30:24 +0900 (Mon, 13 Aug 2012) New Revision: 8921c2e1c5e6d7179436245957b1565bbe6b22a4 https://github.com/groonga/gcs/commit/8921c2e1c5e6d7179436245957b1565bbe6b22a4 Log: Rename methods: dump => dumpSync, load => loadSync Modified files: lib/database/domain.js lib/database/index-field.js test/database-domain.test.js test/database-index-field.test.js Modified: lib/database/domain.js (+2 -2) =================================================================== --- lib/database/domain.js 2012-08-13 13:55:03 +0900 (4ada171) +++ lib/database/domain.js 2012-08-13 13:30:24 +0900 (21a5deb) @@ -321,7 +321,7 @@ Domain.prototype = { return !!this.getIdFromDatabase(); }, - dump: function() { + dumpSync: function() { var dump = this.context.commandSync('dump', { tables: this.tableName }); @@ -350,7 +350,7 @@ Domain.prototype = { return values; }, - load: function(values) { + loadSync: function(values) { values = values.map(function(record) { if ('id' in record && !('_key' in record)) { record['_key'] = record['id']; Modified: lib/database/index-field.js (+2 -2) =================================================================== --- lib/database/index-field.js 2012-08-13 13:55:03 +0900 (bfb74cb) +++ lib/database/index-field.js 2012-08-13 13:30:24 +0900 (4b0dd68) @@ -260,10 +260,10 @@ IndexField.prototype = { upgradeToMultipleValuesSync: function() { if (this.multipleValues) return; - var values = this.domain.dump(); + var values = this.domain.dumpSync(); this.deleteSync(); this.createSync(true); - this.domain.load(values); + this.domain.loadSync(values); } }; Modified: test/database-domain.test.js (+7 -7) =================================================================== --- test/database-domain.test.js 2012-08-13 13:55:03 +0900 (ef15a6f) +++ test/database-domain.test.js 2012-08-13 13:30:24 +0900 (1c73cbf) @@ -417,15 +417,15 @@ suite('database', function() { temporaryDatabase = undefined; }); - test('dump for blank domain', function() { - var actualDump = domain.dump(); + test('dumpSync for blank domain', function() { + var actualDump = domain.dumpSync(); assert.deepEqual(actualDump, []); }); - test('dump', function() { + test('dumpSync', function() { utils.loadDumpFile(context, __dirname + '/fixture/companies/data.grn'); - var actualDump = domain.dump(); + var actualDump = domain.dumpSync(); assert.isTrue(Array.isArray(actualDump), actualDump); assert.equal(actualDump.length, 10, actualDump); @@ -455,7 +455,7 @@ suite('database', function() { assert.deepEqual(actualDump.slice(0, 3), expectedDump); }); - test('load', function() { + test('loadSync', function() { utils.loadDumpFile(context, __dirname + '/fixture/companies/data.grn'); var values = [ @@ -467,9 +467,9 @@ suite('database', function() { name: 'Nergal Heavy Industries', product: 'nadesico' } ]; - domain.load(values); + domain.loadSync(values); - var actualDump = domain.dump(); + var actualDump = domain.dumpSync(); var expectedDump = [ { id: 'id10', address: 'New York, United States', Modified: test/database-index-field.test.js (+2 -2) =================================================================== --- test/database-index-field.test.js 2012-08-13 13:55:03 +0900 (643df3d) +++ test/database-index-field.test.js 2012-08-13 13:30:24 +0900 (e4f5807) @@ -398,7 +398,7 @@ suite('database', function() { field.createSync(); assert.isFalse(field.multipleValues); - field.domain.load([ + field.domain.loadSync([ { id: 'id1', product: 'groonga' }, { id: 'id2', product: 'nroonga' } ]); @@ -407,7 +407,7 @@ suite('database', function() { assert.isTrue(field.exists()); assert.isTrue(field.multipleValues); - var actualDump = field.domain.dump(); + var actualDump = field.domain.dumpSync(); var expectedDump = [ { id: 'id1', product: ['groonga'] }, { id: 'id2', product: ['nroonga'] } -------------- next part -------------- HTML����������������������������...Download