Reverted mysql overlapping join test

This commit is contained in:
Vincent Schoettke 2014-08-11 14:11:09 +02:00 committed by Vincent Schoettke
parent 9ef99b5f92
commit d85a13a6f6

View File

@ -769,13 +769,15 @@ module.exports = function(knex) {
it('supports joins with overlapping column names', function() { it('supports joins with overlapping column names', function() {
if (knex.client.dialect === 'oracle') { if (knex.client.dialect === 'oracle') {
console.warn("Overlapping column names not supported with oracle"); console.warn("Overlapping column names not supported with oracle");
} else { return;
}
return knex('accounts as a1') return knex('accounts as a1')
.leftJoin('accounts as a2', function() { .leftJoin('accounts as a2', function() {
this.on('a1.email', '<>', 'a2.email'); this.on('a1.email', '<>', 'a2.email');
}) })
.select(['a1.email', 'a2.email']) .select(['a1.email', 'a2.email'])
.where('a1.id', '=', '1') .where(knex.raw('a1.id = 1'))
.options({ .options({
nestTables: true, nestTables: true,
rowMode: 'array' rowMode: 'array'
@ -825,7 +827,6 @@ module.exports = function(knex) {
}] }]
); );
}); });
}
}); });
}); });