Use columnize instead of wrap in using().

This is an attempt to fix knex#2136. Also added an integration test, couldn't find any existing.

src/query/compiler.js

@@ -594,7 +594,7 @@ assign(QueryCompiler.prototype, {
   },
 
   onUsing(clause) {
-    return this.formatter.wrap(clause.column);
+    return '(' + this.formatter.columnize(clause.column) + ')';
   },
 
   // Where Clause

test/integration/builder/joins.js

@@ -1889,5 +1889,59 @@ module.exports = function(knex) {
           );
         });
     });
+
+    it('Can use .using()', () => {
+      let joinName = 'accounts_join_test';
+
+      return knex.schema
+        .dropTableIfExists(joinName)
+        .then(() =>
+          knex.schema.createTable(joinName, (table) => {
+            table.bigint('id');
+            table.string('email');
+            table.integer('testcolumn');
+          })
+        )
+        .then(() =>
+          knex(joinName).insert([
+            {
+              id: 3,
+              email: knex('accounts')
+                .where({ id: 3 })
+                .select('email')
+                .limit(1),
+              testcolumn: 50,
+            },
+            {
+              id: 3,
+              email: knex('accounts')
+                .whereNot({ id: 3 })
+                .select('email')
+                .limit(1),
+              testcolumn: 70,
+            },
+          ])
+        )
+        .then(() =>
+          knex('accounts').join(joinName, (builder) =>
+            builder.using(['id', 'email'])
+          )
+        )
+        .then((rows) => {
+          expect(rows.length).to.equal(1);
+          expect(rows[0].testcolumn).to.equal(50);
+
+          return knex('accounts')
+            .join(joinName, (builder) => builder.using(['id']))
+            .orderBy('testcolumn');
+        })
+        .then((rows) => {
+          expect(rows.length).to.equal(2);
+          expect(rows[0].testcolumn).to.equal(50);
+          expect(rows[1].testcolumn).to.equal(70);
+
+          return true;
+        });
+    });
   });
 };

test/unit/query/builder.js

@@ -6634,17 +6634,45 @@ describe('QueryBuilder', function() {
         }),
       {
         mysql: {
-          sql: 'select * from `accounts` inner join `table1` using `id`',
+          sql: 'select * from `accounts` inner join `table1` using (`id`)',
         },
         mssql: {
           //sql: 'select * from [accounts] inner join [table1] on [accounts].[id] = [table1].[id]'
-          sql: 'select * from [accounts] inner join [table1] using [id]',
+          sql: 'select * from [accounts] inner join [table1] using ([id])',
         },
         pg: {
-          sql: 'select * from "accounts" inner join "table1" using "id"',
+          sql: 'select * from "accounts" inner join "table1" using ("id")',
         },
         'pg-redshift': {
-          sql: 'select * from "accounts" inner join "table1" using "id"',
+          sql: 'select * from "accounts" inner join "table1" using ("id")',
+        },
+      }
+    );
+
+    testsql(
+      qb()
+        .select('*')
+        .from('accounts')
+        .innerJoin('table1', function() {
+          this.using(['id', 'test']);
+        }),
+      {
+        mysql: {
+          sql:
+            'select * from `accounts` inner join `table1` using (`id`, `test`)',
+        },
+        mssql: {
+          //sql: 'select * from [accounts] inner join [table1] on [accounts].[id] = [table1].[id]'
+          sql:
+            'select * from [accounts] inner join [table1] using ([id], [test])',
+        },
+        pg: {
+          sql:
+            'select * from "accounts" inner join "table1" using ("id", "test")',
+        },
+        'pg-redshift': {
+          sql:
+            'select * from "accounts" inner join "table1" using ("id", "test")',
         },
       }
     );