Skip to content

Commit 8393d16

Browse files

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

lib/dialects/base/blocks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ module.exports = function(dialect) {
377377

378378
dialect.blocks.add('queries', function(params) {
379379
return _(params.queries).map(function(query) {
380-
return dialect.buildTemplate('subQuery', {queryBody: query});
380+
return dialect.buildTemplate('query', {queryBody: query});
381381
}).join(' ' + params.type + (params.all ? ' all' : '') + ' ');
382382
});
383383

tests/5_union.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('Union, except, intersect', function() {
4343
}]
4444
});
4545

46-
expect(result.query).to.be.equal('(select * from "users") union (select * from "vipUsers");');
46+
expect(result.query).to.be.equal('select * from "users" union select * from "vipUsers";');
4747
expect(result.values).to.be.eql({});
4848
});
4949
});
@@ -60,8 +60,8 @@ describe('Union, except, intersect', function() {
6060
}]
6161
});
6262

63-
expect(result.query).to.be.equal('(select * from "users") union all (select * from ' +
64-
'"vipUsers");');
63+
expect(result.query).to.be.equal('select * from "users" union all select * from ' +
64+
'"vipUsers";');
6565
expect(result.values).to.be.eql({});
6666
});
6767

@@ -75,7 +75,7 @@ describe('Union, except, intersect', function() {
7575
}]
7676
});
7777

78-
expect(result.query).to.be.equal('(select * from "users") except (select * from "vipUsers");');
78+
expect(result.query).to.be.equal('select * from "users" except select * from "vipUsers";');
7979
expect(result.values).to.be.eql({});
8080
});
8181

@@ -90,8 +90,8 @@ describe('Union, except, intersect', function() {
9090
}]
9191
});
9292

93-
expect(result.query).to.be.equal('(select * from "users") except all (select * from ' +
94-
'"vipUsers");');
93+
expect(result.query).to.be.equal('select * from "users" except all select * from ' +
94+
'"vipUsers";');
9595
expect(result.values).to.be.eql({});
9696
});
9797

@@ -105,8 +105,8 @@ describe('Union, except, intersect', function() {
105105
}]
106106
});
107107

108-
expect(result.query).to.be.equal('(select * from "users") intersect (select * from ' +
109-
'"vipUsers");');
108+
expect(result.query).to.be.equal('select * from "users" intersect select * from ' +
109+
'"vipUsers";');
110110
expect(result.values).to.be.eql({});
111111
});
112112

@@ -121,8 +121,8 @@ describe('Union, except, intersect', function() {
121121
}]
122122
});
123123

124-
expect(result.query).to.be.equal('(select * from "users") intersect all (select * from ' +
125-
'"vipUsers");');
124+
expect(result.query).to.be.equal('select * from "users" intersect all select * from ' +
125+
'"vipUsers";');
126126
expect(result.values).to.be.eql({});
127127
});
128128

@@ -138,8 +138,8 @@ describe('Union, except, intersect', function() {
138138
}
139139
});
140140

141-
expect(result.query).to.be.equal('select * from ((select * from "users") union (select * ' +
142-
'from "vipUsers"));');
141+
expect(result.query).to.be.equal('select * from (select * from "users" union select * ' +
142+
'from "vipUsers");');
143143
expect(result.values).to.be.eql({});
144144
});
145145
});
@@ -157,7 +157,7 @@ describe('Union, except, intersect', function() {
157157
});
158158

159159
expect(result.query).to.be.equal(
160-
'(select * from "users") union (select * from "vipUsers") order by "age";'
160+
'select * from "users" union select * from "vipUsers" order by "age";'
161161
);
162162
expect(result.values).to.be.eql({});
163163
});
@@ -174,7 +174,7 @@ describe('Union, except, intersect', function() {
174174
});
175175

176176
expect(result.query).to.be.equal(
177-
'(select * from "users") union (select * from "vipUsers") order by "age", "gender";'
177+
'select * from "users" union select * from "vipUsers" order by "age", "gender";'
178178
);
179179
expect(result.values).to.be.eql({});
180180
});
@@ -194,7 +194,7 @@ describe('Union, except, intersect', function() {
194194
});
195195

196196
expect(result.query).to.be.equal(
197-
'(select * from "users") union (select * from "vipUsers") order by "age" asc, "gender" desc;'
197+
'select * from "users" union select * from "vipUsers" order by "age" asc, "gender" desc;'
198198
);
199199
expect(result.values).to.be.eql({});
200200
});
@@ -213,7 +213,7 @@ describe('Union, except, intersect', function() {
213213
});
214214

215215
expect(result.query).to.be.equal(
216-
'(select * from "users") union (select * from "vipUsers") limit 5;'
216+
'select * from "users" union select * from "vipUsers" limit 5;'
217217
);
218218
expect(result.values).to.be.eql({});
219219
});
@@ -230,7 +230,7 @@ describe('Union, except, intersect', function() {
230230
});
231231

232232
expect(result.query).to.be.equal(
233-
'(select * from "users") union (select * from "vipUsers") offset 5;'
233+
'select * from "users" union select * from "vipUsers" offset 5;'
234234
);
235235
expect(result.values).to.be.eql({});
236236
});
@@ -248,7 +248,7 @@ describe('Union, except, intersect', function() {
248248
});
249249

250250
expect(result.query).to.be.equal(
251-
'(select * from "users") union (select * from "vipUsers") limit 10 offset 20;'
251+
'select * from "users" union select * from "vipUsers" limit 10 offset 20;'
252252
);
253253
expect(result.values).to.be.eql({});
254254
});

0 commit comments

Comments
 (0)