YUKI Hiroshi
null+****@clear*****
Thu Nov 15 18:30:54 JST 2012
YUKI Hiroshi 2012-11-15 18:30:54 +0900 (Thu, 15 Nov 2012) New Revision: 831079f359504dfa168261058dac8f7a9f85f1ee https://github.com/groonga/gcs/commit/831079f359504dfa168261058dac8f7a9f85f1ee Log: Fix variable name confliction Modified files: lib/database/domain.js lib/database/index-field.js Modified: lib/database/domain.js (+2 -2) =================================================================== --- lib/database/domain.js 2012-11-15 18:24:42 +0900 (be3ce11) +++ lib/database/domain.js 2012-11-15 18:30:54 +0900 (4f7a57f) @@ -8,7 +8,7 @@ var nativeNroonga = require('nroonga'); var nroonga = require('../wrapped-nroonga'); -var errors = require('../errors'); +var ValidationError = require('../errors').ValidationError; var IndexField = require('./index-field').IndexField; var MINIMUM_NAME_LENGTH = @@ -92,7 +92,7 @@ function assertValidDomainName(domain) { var prefix = errors.length > 1 ? errors.length + ' validation errors detected: ' : '1 validation error detected: '; - throw new errors.ValidationError(prefix + errors.join('; ')); + throw new ValidationError(prefix + errors.join('; ')); } } Modified: lib/database/index-field.js (+3 -3) =================================================================== --- lib/database/index-field.js 2012-11-15 18:24:42 +0900 (3a200f5) +++ lib/database/index-field.js 2012-11-15 18:30:54 +0900 (63fe18f) @@ -1,5 +1,5 @@ var nroonga = require('../wrapped-nroonga'); -var errors = require('../errors'); +var ValidationError = require('../errors').ValidationError; var MINIMUM_NAME_LENGTH = exports.MINIMUM_NAME_LENGTH = @@ -82,7 +82,7 @@ function assertValidFieldName(field) { var prefix = errors.length > 1 ? errors.length + ' validation errors detected: ' : '1 validation error detected: '; - throw new errors.ValidationError(prefix + errors.join('; ')); + throw new ValidationError(prefix + errors.join('; ')); } } @@ -104,7 +104,7 @@ function assertValidFieldType(type) { var prefix = errors.length > 1 ? errors.length + ' validation errors detected: ' : '1 validation error detected: '; - throw new errors.ValidationError(prefix + errors.join('; ')); + throw new ValidationError(prefix + errors.join('; ')); } } -------------- next part -------------- HTML����������������������������...Download
