fix(postgresql): add primaryKey option for uuid

lib/dialects/postgres/schema/pg-columncompiler.js

@@ -124,6 +124,13 @@ class ColumnCompiler_PG extends ColumnCompiler {
       (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '')
     );
   }
+
+  uuid(options = { primaryKey: false }) {
+    return (
+      'uuid' +
+      (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '')
+    );
+  }
 }
 
 ColumnCompiler_PG.prototype.bigint = 'bigint';
@@ -133,7 +140,6 @@ ColumnCompiler_PG.prototype.double = 'double precision';
 ColumnCompiler_PG.prototype.floating = 'real';
 ColumnCompiler_PG.prototype.smallint = 'smallint';
 ColumnCompiler_PG.prototype.tinyint = 'smallint';
-ColumnCompiler_PG.prototype.uuid = 'uuid';
 
 function jsonColumn(client, jsonb) {
   if (

lib/schema/columncompiler.js

@@ -277,8 +277,10 @@ ColumnCompiler.prototype.geography = 'geography';
 ColumnCompiler.prototype.point = 'point';
 ColumnCompiler.prototype.enu = 'varchar';
 ColumnCompiler.prototype.bit = ColumnCompiler.prototype.json = 'text';
-ColumnCompiler.prototype.uuid = ({ useBinaryUuid = false } = {}) =>
-  useBinaryUuid ? 'binary(16)' : 'char(36)';
+ColumnCompiler.prototype.uuid = ({
+  useBinaryUuid = false,
+  primaryKey = false,
+} = {}) => (useBinaryUuid ? 'binary(16)' : 'char(36)');
 ColumnCompiler.prototype.integer =
   ColumnCompiler.prototype.smallint =
   ColumnCompiler.prototype.mediumint =

test/integration2/schema/misc.spec.js

@@ -482,6 +482,47 @@ describe('Schema (misc)', () => {
           });
         });
 
+        describe('uuid types - postgres', () => {
+          before(async () => {
+            await knex.schema.createTable('uuid_column', (table) => {
+              table.uuid('id', { primaryKey: true });
+            });
+          });
+
+          it('#5211 - creates an uuid column as primary key', function () {
+            if (!isPgBased(knex)) {
+              return this.skip();
+            }
+
+            const table_name = 'uuid_columns_test';
+            const expected_column = 'id';
+
+            return knex
+              .raw(
+                'SELECT c.oid FROM pg_catalog.pg_class c WHERE c.relname = ?',
+                [table_name]
+              )
+              .then((res) => {
+                const column_oid = res.rows[0].oid;
+
+                return knex
+                  .raw(
+                    `select c.column_name
+                     from INFORMATION_SCHEMA.COLUMNS c
+                     join INFORMATION_SCHEMA.KEY_COLUMN_USAGE cu
+                     on (c.table_name = cu.table_name and c.column_name = cu.column_name)
+                     where c.table_name = ? and cu.constraint_name like '%_pkey`,
+                    table_name
+                  )
+                  .then((res) => {
+                    const column_name = res.rows[0].column_name;
+
+                    expect(column_name).to.equal(expected_column);
+                  });
+              });
+          });
+        });
+
         describe('increments types - mysql', () => {
           before(() =>
             Promise.all([

test/unit/schema-builder/postgres.js

@@ -137,6 +137,19 @@ describe('PostgreSQL SchemaBuilder', function () {
     );
   });
 
+  it('create table with uuid primary key in one go', function () {
+    tableSql = client
+      .schemaBuilder()
+      .createTable('uuid_primary', function (table) {
+        table.uuid('id', { primaryKey: true });
+      })
+      .toSQL();
+    equal(1, tableSql.length);
+    expect(tableSql[0].sql).to.equal(
+      'create table "uuid_primary" ("id" uuid primary key)'
+    );
+  });
+
   it('basic alter table', function () {
     tableSql = client
       .schemaBuilder()
@@ -446,7 +459,6 @@ describe('PostgreSQL SchemaBuilder', function () {
       );
     });
 
-
     it('refresh view concurrently', function () {
       tableSql = client
         .schemaBuilder()