Incorrect order of query parameters when using subqueries

[whitelynx]

When building a query using a subquery, and using parameters in both, the resulting order of the parameters is incorrect. This specifically seems to happen when the main query uses db.raw() in its select clause.

Given this JS:

var subquery = db().select().from('tbl').where({baz: 'some string'}).as('g');
var query = db().select(db.raw('?', [3]), 'g.geom').from(subquery).where({'g.bzzz': false});
console.log(query.toSQL());
console.log(query.toString());

...we get this output:

{ method: 'select',
  options: undefined,
  bindings: [ 'some string', 3, false ],
  sql: 'select ?, "g"."geom" from (select * from "tbl" where "baz" = ?) as "g" where "g"."bzzz" = ?' }

select 'some string', "g"."geom" from (select * from "tbl" where "baz" = '3') as "g" where "g"."bzzz" = 'false'

...whereas we would expect to get:

{ method: 'select',
  options: undefined,
  bindings: [ 3, 'some string', false ],
  sql: 'select ?, "g"."geom" from (select * from "tbl" where "baz" = ?) as "g"' }

select '3', "g"."geom" from (select * from "tbl" where "baz" = 'some string') as "g" where "g"."bzzz" = 'false'

It seems as if the subquery handling code is just naively prepending the subquery's parameters to the outer query's parameters, instead of inserting them between parameters from the outer's select clause and the ones from the outer's where.

[whitelynx]

Possibly related to #682.

[whitelynx]

Also, this is at least an issue both on master and in version 0.7.3.

[whitelynx]

This actually does work correctly when the subquery is in a .where() call, instead of .from():

var subquery = db().select('id').from('tbl').where({baz: 'some string'}).as('g');
var query = db().select(db.raw('?', [3]), 'g.geom').from('tbl').where('parent_id', 'in', subquery).where({bzzz: false});
console.log(query.toSQL());
console.log(query.toString());

---

{ method: 'select',
  options: undefined,
  bindings: [ 3, 'some string', false ],
  sql: 'select ?, "g"."geom" from "tbl" where "parent_id" in (select "id" from "tbl" where "baz" = ?) as "g" and "bzzz" = ?' }

select '3', "g"."geom" from "tbl" where "parent_id" in (select "id" from "tbl" where "baz" = 'some string') as "g" and "bzzz" = 'false'