Navigation Menu

Skip to content

Commit

Permalink
Domain#getSynonymSync: return null for failure case
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Aug 14, 2012
1 parent ebe3c1b commit e6782d5
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
15 changes: 12 additions & 3 deletions lib/database/domain.js
Expand Up @@ -276,16 +276,25 @@ Domain.prototype = {
throw new Error('no context');

if (!this.hasSynonymsTableSync())
return [];
return null;

var options = {
table: this.synonymsTableName,
key: key,
output_columns: SYNONYMS_COLUMN
};
var getResult = this.context.commandSync('get', options);
var synonyms = getResult[1][0];
var getResult;
try {
getResult = this.context.commandSync('get', options);
} catch (error) {
if (/nonexistent key:/.test(error.message)) {
return null;
} else {
throw error;
}
}

var synonyms = getResult[1][0];
return synonyms;
},

Expand Down
11 changes: 10 additions & 1 deletion test/database-domain.test.js
Expand Up @@ -359,7 +359,7 @@ suite('database', function() {
assert.equal(dumpExpected, dumpActual);
});

test('getSynonymSync', function() {
test('getSynonymSync, existent', function() {
var domain = new Domain('companies', context);
domain.updateSynonymsSync({
tokio: ['tonkin', 'tokyo']
Expand All @@ -368,6 +368,15 @@ suite('database', function() {
assert.deepEqual(domain.getSynonymSync('tokio'), ['tonkin', 'tokyo']);
});

test('getSynonymSync, nonexistent', function() {
var domain = new Domain('companies', context);
domain.updateSynonymsSync({
tokio: ['tonkin', 'tokyo']
});

assert.deepEqual(domain.getSynonymSync('hokkaido'), null);
});

test('getSynonymsSync', function() {
var domain = new Domain('companies', context);
domain.updateSynonymsSync({
Expand Down

0 comments on commit e6782d5

Please sign in to comment.