不要怂,就是干,撸起袖子干!

Commit 4d6cce82 by Dr. Evil

Code formatting

1 parent 4619a544
......@@ -9,31 +9,35 @@ var Utils = require('../../utils')
, Promise = require('../../promise')
, sequelizeErrors = require('../../errors.js');
var parseDialectSpecificFields = {
// Parses hstore fields if the model has any hstore fields.
// This cannot be done in the 'pg' lib because hstore is a UDT.
hstore: function (value, options) {
if (value === null) return null;
return DataTypes.ARRAY.is(options.dataType, DataTypes.HSTORE) ?
Utils._.map(
JSON.parse('[' + value.substring(1, value.length - 1) + ']'), function (v) {
return hstore.parse(v);
}) : hstore.parse(value);
},
range: function (value, options) {
if (value === null) return null;
return DataTypes.ARRAY.is(options.dataType, DataTypes.RANGE) ?
Utils._.map(
JSON.parse('[' + value.substring(1, value.length - 1) + ']'),
function (v) {
return range.parse(v, options.dataType.type);
}) :
range.parse(value, options.dataType);
}
},
dialectSpecificTypes = Utils._.keys(parseDialectSpecificFields);
var parseDialectSpecificFields,
dialectSpecificTypes;
parseDialectSpecificFields = {
// Parses hstore fields if the model has any hstore fields.
// This cannot be done in the 'pg' lib because hstore is a UDT.
hstore: function (value, options) {
if (value === null) return null;
return DataTypes.ARRAY.is(options.dataType, DataTypes.HSTORE) ?
Utils._.map(
JSON.parse('[' + value.substring(1, value.length - 1) + ']'), function (v) {
return hstore.parse(v);
}) : hstore.parse(value);
},
range: function (value, options) {
if (value === null) return null;
return DataTypes.ARRAY.is(options.dataType, DataTypes.RANGE) ?
Utils._.map(
JSON.parse('[' + value.substring(1, value.length - 1) + ']'),
function (v) {
return range.parse(v, options.dataType.type);
}) :
range.parse(value, options.dataType);
}
};
dialectSpecificTypes = Utils._.keys(parseDialectSpecificFields);
function dialectSpecificFieldDatatypeMap (options, prefix) {
if (!Utils._.isArray(options.types))
......
......@@ -744,8 +744,8 @@ if (dialect.match(/^postgres/)) {
});
it('should update range correctly', function() {
var User = this.User,
period = [new Date(2015, 0, 1), new Date(2015, 11, 31)];
var User = this.User
, period = [new Date(2015, 0, 1), new Date(2015, 11, 31)];
return User.create({ username: 'user', email: ['foo@bar.com'], course_period: period}).then(function(newUser) {
// Check to see if the default value for a range field works
......@@ -775,8 +775,8 @@ if (dialect.match(/^postgres/)) {
});
it('should update range correctly and return the affected rows', function () {
var User = this.User,
period = [new Date(2015, 1, 1), new Date(2015, 10, 30)];
var User = this.User
, period = [new Date(2015, 1, 1), new Date(2015, 10, 30)];
return User.create({
username: 'user',
......@@ -863,9 +863,9 @@ if (dialect.match(/^postgres/)) {
});
it('should read range correctly from included models as well', function () {
var self = this,
period = [new Date(2016, 0, 1), new Date(2016, 11, 31)],
HolidayDate = this.sequelize.define('holidayDate', {
var self = this
, period = [new Date(2016, 0, 1), new Date(2016, 11, 31)]
, HolidayDate = this.sequelize.define('holidayDate', {
period: DataTypes.RANGE(DataTypes.DATE)
});
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!