Skip to content

Commit 6bd2f6a

Browse files
iteufelojourmel
authored andcommitted
Fixed code style
Replaced spaces with tabs Reverted package.json
1 parent 2022daf commit 6bd2f6a

File tree

5 files changed

+232
-230
lines changed

5 files changed

+232
-230
lines changed

lib/dialects/mssql/blocks.js

+53-53
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,57 @@
33
var _ = require('underscore');
44

55
module.exports = function(dialect) {
6-
dialect.blocks.set('limit', function(params) {
7-
return (!isNaN(params.offset)) ? '' : 'top(' + dialect.builder._pushValue(params.limit) + ')';
8-
});
9-
10-
dialect.blocks.set('offset', function(params) {
11-
var pre = (!params.sort) ? 'order by 1 ' : '';
12-
if (params.limit) {
13-
var str = pre + 'offset ' + dialect.builder._pushValue(params.offset);
14-
str += ' rows fetch next ' + dialect.builder._pushValue(params.limit) + ' rows only';
15-
return str;
16-
}else {
17-
return pre + 'OFFSET ' + dialect.builder._pushValue(params.offset) + ' rows';
18-
}
19-
});
20-
21-
dialect.blocks.set('returning', function(params) {
22-
var result = dialect.buildBlock('fields', {fields: params.returning});
23-
24-
if (result) result = 'output ' + result;
25-
26-
return result;
27-
});
28-
29-
dialect.blocks.set('insert:values', function(params) {
30-
var values = params.values;
31-
32-
if (!_.isArray(values)) values = [values];
33-
34-
var fields = params.fields || _(values)
35-
.chain()
36-
.map(function(row) {
37-
return _(row).keys();
38-
})
39-
.flatten()
40-
.uniq()
41-
.value();
42-
43-
return dialect.buildTemplate('insertValues', {
44-
fields: fields,
45-
returning: params.returning || undefined,
46-
values: _(values).map(function(row) {
47-
return _(fields).map(function(field) {
48-
return dialect.buildBlock('value', {value: row[field]});
49-
});
50-
})
51-
});
52-
});
53-
54-
dialect.blocks.add('insertValues:values', function(params) {
55-
return _(params.values).map(function(row) {
56-
return '(' + row.join(', ') + ')';
57-
}).join(', ');
58-
});
6+
dialect.blocks.set('limit', function(params) {
7+
return (!isNaN(params.offset)) ? '' : 'top(' + dialect.builder._pushValue(params.limit) + ')';
8+
});
9+
10+
dialect.blocks.set('offset', function(params) {
11+
var pre = (!params.sort) ? 'order by 1 ' : '';
12+
if (params.limit) {
13+
var str = pre + 'offset ' + dialect.builder._pushValue(params.offset);
14+
str += ' rows fetch next ' + dialect.builder._pushValue(params.limit) + ' rows only';
15+
return str;
16+
}else {
17+
return pre + 'OFFSET ' + dialect.builder._pushValue(params.offset) + ' rows';
18+
}
19+
});
20+
21+
dialect.blocks.set('returning', function(params) {
22+
var result = dialect.buildBlock('fields', {fields: params.returning});
23+
24+
if (result) result = 'output ' + result;
25+
26+
return result;
27+
});
28+
29+
dialect.blocks.set('insert:values', function(params) {
30+
var values = params.values;
31+
32+
if (!_.isArray(values)) values = [values];
33+
34+
var fields = params.fields || _(values)
35+
.chain()
36+
.map(function(row) {
37+
return _(row).keys();
38+
})
39+
.flatten()
40+
.uniq()
41+
.value();
42+
43+
return dialect.buildTemplate('insertValues', {
44+
fields: fields,
45+
returning: params.returning || undefined,
46+
values: _(values).map(function(row) {
47+
return _(fields).map(function(field) {
48+
return dialect.buildBlock('value', {value: row[field]});
49+
});
50+
})
51+
});
52+
});
53+
54+
dialect.blocks.add('insertValues:values', function(params) {
55+
return _(params.values).map(function(row) {
56+
return '(' + row.join(', ') + ')';
57+
}).join(', ');
58+
});
5959
};

lib/dialects/mssql/index.js

+35-36
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,44 @@ var _ = require('underscore');
55
var util = require('util');
66
var templatesInit = require('./templates');
77
var blocksInit = require('./blocks');
8-
var templateChecks = require('../../utils/templateChecks');
98

109
var Dialect = module.exports = function(builder) {
1110

12-
builder._pushValue = function(value) {
13-
if (_.isUndefined(value) || _.isNull(value)) {
14-
return 'null';
15-
} else if (_.isBoolean(value)) {
16-
return String(Number(value));
17-
} else if (_.isNumber(value)) {
18-
return String(value);
19-
} else if (_.isString(value) || _.isDate(value)) {
20-
if (this.options.separatedValues) {
21-
var placeholder = this._getPlaceholder();
22-
23-
if (this.options.namedValues) {
24-
this._values[placeholder] = value;
25-
} else {
26-
this._values.push(value);
27-
}
28-
29-
return this._wrapPlaceholder(placeholder);
30-
} else {
31-
if (_.isDate(value)) value = value.toISOString();
32-
33-
return '\'' + value + '\'';
34-
}
35-
} else {
36-
throw new Error('Wrong value type "' + (typeof value) + '"');
37-
}
38-
};
39-
40-
BaseDialect.call(this, builder);
41-
42-
// init templates
43-
templatesInit(this);
44-
45-
// init blocks
46-
blocksInit(this);
11+
builder._pushValue = function(value) {
12+
if (_.isUndefined(value) || _.isNull(value)) {
13+
return 'null';
14+
} else if (_.isBoolean(value)) {
15+
return String(Number(value));
16+
} else if (_.isNumber(value)) {
17+
return String(value);
18+
} else if (_.isString(value) || _.isDate(value)) {
19+
if (this.options.separatedValues) {
20+
var placeholder = this._getPlaceholder();
21+
22+
if (this.options.namedValues) {
23+
this._values[placeholder] = value;
24+
} else {
25+
this._values.push(value);
26+
}
27+
28+
return this._wrapPlaceholder(placeholder);
29+
} else {
30+
if (_.isDate(value)) value = value.toISOString();
31+
32+
return '\'' + value + '\'';
33+
}
34+
} else {
35+
throw new Error('Wrong value type "' + (typeof value) + '"');
36+
}
37+
};
38+
39+
BaseDialect.call(this, builder);
40+
41+
// init templates
42+
templatesInit(this);
43+
44+
// init blocks
45+
blocksInit(this);
4746

4847
};
4948

0 commit comments

Comments
 (0)