Navigation Menu

Skip to content

Commit

Permalink
Rename methods: dump => dumpSync, load => loadSync
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 13, 2012
1 parent d6e4f11 commit 8921c2e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions lib/database/domain.js
Expand Up @@ -321,7 +321,7 @@ Domain.prototype = {
return !!this.getIdFromDatabase();
},

dump: function() {
dumpSync: function() {
var dump = this.context.commandSync('dump', {
tables: this.tableName
});
Expand Down Expand Up @@ -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'];
Expand Down
4 changes: 2 additions & 2 deletions lib/database/index-field.js
Expand Up @@ -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);
}
};

Expand Down
14 changes: 7 additions & 7 deletions test/database-domain.test.js
Expand Up @@ -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);

Expand Down Expand Up @@ -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 = [
Expand All @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions test/database-index-field.test.js
Expand Up @@ -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' }
]);
Expand All @@ -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'] }
Expand Down

0 comments on commit 8921c2e

Please sign in to comment.