rake-db 2.3.23 → 2.3.25

package/.env.local

@@ -1,2 +1,2 @@
 DATABASE_URL=postgres://postgres:@localhost:5432/porm
-#DATABASE_URL_TEST=postgres://postgres:@localhost:5432/porm_test
+#DATABASE_URL=postgres://romeerez:e2Y6ovIJruas@ep-autumn-tooth-279704.eu-central-1.aws.neon.tech/neondb?ssl=true

package/.turbo/turbo-test:ci.log

@@ -1,22 +1,22 @@
 
-> rake-db@2.3.22 test:ci /home/romeo/dev/my/orchid-orm/packages/rake-db
+> rake-db@2.3.24 test:ci /home/romeo/dev/my/orchid-orm/packages/rake-db
 > jest --coverage --coverageReporters json-summary
 
 PASS src/commands/createOrDrop.test.ts
 PASS src/common.test.ts
-PASS src/migration/createTable.test.ts
-PASS src/migration/migration.test.ts
-PASS src/pull/structureToAst.test.ts
 PASS src/migration/changeTable.test.ts
+PASS src/pull/structureToAst.test.ts
 PASS src/commands/migrateOrRollback.test.ts
+PASS src/migration/migration.test.ts
+PASS src/migration/createTable.test.ts
 PASS src/pull/astToMigration.test.ts
+PASS src/commands/generate.test.ts
 PASS src/pull/pull.test.ts
 PASS src/rakeDb.test.ts
 PASS src/pull/dbStructure.test.ts
-PASS src/commands/generate.test.ts
 
 Test Suites: 12 passed, 12 total
-Tests:       182 passed, 182 total
+Tests:       184 passed, 184 total
 Snapshots:   0 total
-Time:        7.495 s
+Time:        6.736 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # rake-db
 
+## 2.3.25
+
+### Patch Changes
+
+- Updated dependencies
+  - pqb@0.9.14
+
+## 2.3.24
+
+### Patch Changes
+
+- Handle ssl required case in db create; Confirm db creation before asking for creds
+
 ## 2.3.23
 
 ### Patch Changes

package/dist/index.d.ts

@@ -15,7 +15,7 @@ declare type ChangeOptions = {
 };
 declare type TableChangeMethods = typeof tableChangeMethods;
 declare const tableChangeMethods: {
-    raw: (sql: string, values?: false | Record<string, unknown> | undefined) => RawExpression<ColumnType<unknown, pqb.Operators, unknown>>;
+    raw: (sql: string, values?: false | Record<string, unknown> | undefined) => RawExpression<ColumnType<unknown, pqb.BaseOperators, unknown>>;
     add: typeof add;
     drop: typeof add;
     change(from: ColumnType | Change, to: ColumnType | Change, options?: ChangeOptions): Change;
@@ -105,8 +105,8 @@ declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, op
     xml: () => pqb.XMLColumn;
     json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
         set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
-        tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest | undefined) => pqb.JSONTuple<T_1, Rest>;
-        union: <T_1 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_1) => pqb.JSONUnion<T_1>;
+        tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+        union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
         any: () => pqb.JSONAny;
         bigint: () => pqb.JSONBigInt;
         boolean: () => pqb.JSONBoolean;
@@ -121,40 +121,40 @@ declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, op
         void: () => pqb.JSONVoid;
         array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
         discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
-        enum: <U_1 extends string, T_2 extends [U_1, ...U_1[]]>(options: T_2) => pqb.JSONEnum<U_1, T_2>;
-        instanceOf: <T_3 extends new (...args: any[]) => any>(cls: T_3) => pqb.JSONInstanceOf<T_3>;
+        enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
+        instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
         intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
-        lazy: <T_4 extends pqb.JSONTypeAny>(fn: () => T_4) => pqb.JSONLazy<T_4>;
-        literal: <T_5 extends pqb.Primitive>(value: T_5) => pqb.JSONLiteral<T_5>;
+        lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
+        literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
         map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
-        nativeEnum: <T_6 extends pqb.EnumLike>(givenEnum: T_6) => pqb.JSONNativeEnum<T_6>;
-        nullable: <T_7 extends pqb.JSONTypeAny>(type: T_7) => pqb.JSONNullable<T_7>;
-        nullish: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullish<T_8>;
-        object: <T_9 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_9) => pqb.JSONObject<T_9, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_9]: T_9[k_1]["type"]; }> extends infer T_10 extends object ? { [k in keyof T_10]: pqb.addQuestionMarks<{ [k_1_1 in keyof T_9]: T_9[k_1_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1_2 in keyof T_9]: T_9[k_1_2]["type"]; }> extends infer T_10_1 extends object ? { [k_2 in keyof T_10_1]: pqb.addQuestionMarks<{ [k_1_3 in keyof T_9]: T_9[k_1_3]["type"]; }>[k_2]; } : never) & {
+        nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
+        nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
+        nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
+        object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
             [k: string]: Catchall["type"];
-        } extends infer T_11 extends object ? { [k_2 in keyof T_11]: ((pqb.addQuestionMarks<{ [k_1_4 in keyof T_9]: T_9[k_1_4]["type"]; }> extends infer T_10_2 extends object ? { [k_3 in keyof T_10_2]: pqb.addQuestionMarks<{ [k_1_5 in keyof T_9]: T_9[k_1_5]["type"]; }>[k_3]; } : never) & {
+        } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
             [k: string]: Catchall["type"];
         })[k_2]; } : never>;
-        optional: <T_12 extends pqb.JSONTypeAny>(type: T_12) => pqb.JSONOptional<T_12>;
+        optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
         record: typeof pqb.record;
     }) => Type)) => pqb.JSONColumn<Type>;
     jsonText: () => pqb.JSONTextColumn;
-    array: <Item extends ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
-    timestamps: <T_13 extends ColumnType<unknown, pqb.Operators, unknown>>(this: {
-        timestamp(): T_13;
+    array: <Item extends ColumnType<unknown, pqb.BaseOperators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
+    timestamps: <T_14 extends ColumnType<unknown, pqb.BaseOperators, unknown>>(this: {
+        timestamp(): T_14;
     }) => {
-        createdAt: T_13 & {
+        createdAt: T_14 & {
             hasDefault: true;
         };
-        updatedAt: T_13 & {
+        updatedAt: T_14 & {
             hasDefault: true;
         };
     };
     primaryKey(columns: string[], options?: {
         name?: string | undefined;
     } | undefined): {};
-    index(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions | undefined): {};
-    unique(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions | undefined): {};
+    index(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
+    unique(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
     foreignKey: {
         <Table extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table, foreignColumns: Columns, options?: ForeignKeyOptions | undefined): {};
         <Table_1 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_1, foreignColumns: Columns_1, options?: ForeignKeyOptions | undefined): {};
@@ -204,8 +204,8 @@ declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, op
         xml: () => pqb.XMLColumn;
         json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
             set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
-            tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest | undefined) => pqb.JSONTuple<T_1, Rest>;
-            union: <T_1 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_1) => pqb.JSONUnion<T_1>;
+            tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+            union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
             any: () => pqb.JSONAny;
             bigint: () => pqb.JSONBigInt;
             boolean: () => pqb.JSONBoolean;
@@ -220,40 +220,40 @@ declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, op
             void: () => pqb.JSONVoid;
             array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
             discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
-            enum: <U_1 extends string, T_2 extends [U_1, ...U_1[]]>(options: T_2) => pqb.JSONEnum<U_1, T_2>;
-            instanceOf: <T_3 extends new (...args: any[]) => any>(cls: T_3) => pqb.JSONInstanceOf<T_3>;
+            enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
+            instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
             intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
-            lazy: <T_4 extends pqb.JSONTypeAny>(fn: () => T_4) => pqb.JSONLazy<T_4>;
-            literal: <T_5 extends pqb.Primitive>(value: T_5) => pqb.JSONLiteral<T_5>;
+            lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
+            literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
             map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
-            nativeEnum: <T_6 extends pqb.EnumLike>(givenEnum: T_6) => pqb.JSONNativeEnum<T_6>;
-            nullable: <T_7 extends pqb.JSONTypeAny>(type: T_7) => pqb.JSONNullable<T_7>;
-            nullish: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullish<T_8>;
-            object: <T_9 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_9) => pqb.JSONObject<T_9, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_9]: T_9[k_1]["type"]; }> extends infer T_10 extends object ? { [k in keyof T_10]: pqb.addQuestionMarks<{ [k_1_1 in keyof T_9]: T_9[k_1_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1_2 in keyof T_9]: T_9[k_1_2]["type"]; }> extends infer T_10_1 extends object ? { [k_2 in keyof T_10_1]: pqb.addQuestionMarks<{ [k_1_3 in keyof T_9]: T_9[k_1_3]["type"]; }>[k_2]; } : never) & {
+            nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
+            nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
+            nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
+            object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
                 [k: string]: Catchall["type"];
-            } extends infer T_11 extends object ? { [k_2 in keyof T_11]: ((pqb.addQuestionMarks<{ [k_1_4 in keyof T_9]: T_9[k_1_4]["type"]; }> extends infer T_10_2 extends object ? { [k_3 in keyof T_10_2]: pqb.addQuestionMarks<{ [k_1_5 in keyof T_9]: T_9[k_1_5]["type"]; }>[k_3]; } : never) & {
+            } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
                 [k: string]: Catchall["type"];
             })[k_2]; } : never>;
-            optional: <T_12 extends pqb.JSONTypeAny>(type: T_12) => pqb.JSONOptional<T_12>;
+            optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
             record: typeof pqb.record;
         }) => Type)) => pqb.JSONColumn<Type>;
         jsonText: () => pqb.JSONTextColumn;
-        array: <Item extends ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
-        timestamps: <T_13 extends ColumnType<unknown, pqb.Operators, unknown>>(this: {
-            timestamp(): T_13;
+        array: <Item extends ColumnType<unknown, pqb.BaseOperators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
+        timestamps: <T_14 extends ColumnType<unknown, pqb.BaseOperators, unknown>>(this: {
+            timestamp(): T_14;
         }) => {
-            createdAt: T_13 & {
+            createdAt: T_14 & {
                 hasDefault: true;
             };
-            updatedAt: T_13 & {
+            updatedAt: T_14 & {
                 hasDefault: true;
             };
         };
         primaryKey(columns: string[], options?: {
             name?: string | undefined;
         } | undefined): {};
-        index(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions | undefined): {};
-        unique(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions | undefined): {};
+        index(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
+        unique(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
         foreignKey: {
             <Table extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table, foreignColumns: Columns, options?: ForeignKeyOptions | undefined): {};
             <Table_1 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_1, foreignColumns: Columns_1, options?: ForeignKeyOptions | undefined): {};
@@ -302,8 +302,8 @@ declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, op
         xml: () => pqb.XMLColumn;
         json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
             set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
-            tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest | undefined) => pqb.JSONTuple<T_1, Rest>;
-            union: <T_1 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_1) => pqb.JSONUnion<T_1>;
+            tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+            union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
             any: () => pqb.JSONAny;
             bigint: () => pqb.JSONBigInt;
             boolean: () => pqb.JSONBoolean;
@@ -318,40 +318,40 @@ declare const createMigrationInterface: (tx: TransactionAdapter, up: boolean, op
             void: () => pqb.JSONVoid;
             array: <Type_1 extends pqb.JSONTypeAny>(element: Type_1) => pqb.JSONArray<Type_1, "many">;
             discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends pqb.Primitive, Types extends [pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...pqb.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => pqb.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
-            enum: <U_1 extends string, T_2 extends [U_1, ...U_1[]]>(options: T_2) => pqb.JSONEnum<U_1, T_2>;
-            instanceOf: <T_3 extends new (...args: any[]) => any>(cls: T_3) => pqb.JSONInstanceOf<T_3>;
+            enum: <U_1 extends string, T_3 extends [U_1, ...U_1[]]>(options: T_3) => pqb.JSONEnum<U_1, T_3>;
+            instanceOf: <T_4 extends new (...args: any[]) => any>(cls: T_4) => pqb.JSONInstanceOf<T_4>;
             intersection: <Left extends pqb.JSONTypeAny, Right extends pqb.JSONTypeAny>(left: Left, right: Right) => pqb.JSONIntersection<Left, Right>;
-            lazy: <T_4 extends pqb.JSONTypeAny>(fn: () => T_4) => pqb.JSONLazy<T_4>;
-            literal: <T_5 extends pqb.Primitive>(value: T_5) => pqb.JSONLiteral<T_5>;
+            lazy: <T_5 extends pqb.JSONTypeAny>(fn: () => T_5) => pqb.JSONLazy<T_5>;
+            literal: <T_6 extends pqb.Primitive>(value: T_6) => pqb.JSONLiteral<T_6>;
             map: <Key extends pqb.JSONTypeAny, Value_1 extends pqb.JSONTypeAny>(keyType: Key, valueType: Value_1) => pqb.JSONMap<Key, Value_1>;
-            nativeEnum: <T_6 extends pqb.EnumLike>(givenEnum: T_6) => pqb.JSONNativeEnum<T_6>;
-            nullable: <T_7 extends pqb.JSONTypeAny>(type: T_7) => pqb.JSONNullable<T_7>;
-            nullish: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullish<T_8>;
-            object: <T_9 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_9) => pqb.JSONObject<T_9, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_9]: T_9[k_1]["type"]; }> extends infer T_10 extends object ? { [k in keyof T_10]: pqb.addQuestionMarks<{ [k_1_1 in keyof T_9]: T_9[k_1_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1_2 in keyof T_9]: T_9[k_1_2]["type"]; }> extends infer T_10_1 extends object ? { [k_2 in keyof T_10_1]: pqb.addQuestionMarks<{ [k_1_3 in keyof T_9]: T_9[k_1_3]["type"]; }>[k_2]; } : never) & {
+            nativeEnum: <T_7 extends pqb.EnumLike>(givenEnum: T_7) => pqb.JSONNativeEnum<T_7>;
+            nullable: <T_8 extends pqb.JSONTypeAny>(type: T_8) => pqb.JSONNullable<T_8>;
+            nullish: <T_9 extends pqb.JSONTypeAny>(type: T_9) => pqb.JSONNullish<T_9>;
+            object: <T_10 extends pqb.JSONObjectShape, UnknownKeys extends pqb.UnknownKeysParam = "strip", Catchall extends pqb.JSONTypeAny = pqb.JSONTypeAny>(shape: T_10) => pqb.JSONObject<T_10, UnknownKeys, Catchall, pqb.JSONTypeAny extends Catchall ? pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never : (pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
                 [k: string]: Catchall["type"];
-            } extends infer T_11 extends object ? { [k_2 in keyof T_11]: ((pqb.addQuestionMarks<{ [k_1_4 in keyof T_9]: T_9[k_1_4]["type"]; }> extends infer T_10_2 extends object ? { [k_3 in keyof T_10_2]: pqb.addQuestionMarks<{ [k_1_5 in keyof T_9]: T_9[k_1_5]["type"]; }>[k_3]; } : never) & {
+            } extends infer T_12 extends object ? { [k_2 in keyof T_12]: ((pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }> extends infer T_11 extends object ? { [k in keyof T_11]: pqb.addQuestionMarks<{ [k_1 in keyof T_10]: T_10[k_1]["type"]; }>[k]; } : never) & {
                 [k: string]: Catchall["type"];
             })[k_2]; } : never>;
-            optional: <T_12 extends pqb.JSONTypeAny>(type: T_12) => pqb.JSONOptional<T_12>;
+            optional: <T_13 extends pqb.JSONTypeAny>(type: T_13) => pqb.JSONOptional<T_13>;
             record: typeof pqb.record;
         }) => Type)) => pqb.JSONColumn<Type>;
         jsonText: () => pqb.JSONTextColumn;
-        array: <Item extends ColumnType<unknown, pqb.Operators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
-        timestamps: <T_13 extends ColumnType<unknown, pqb.Operators, unknown>>(this: {
-            timestamp(): T_13;
+        array: <Item extends ColumnType<unknown, pqb.BaseOperators, unknown>>(item: Item) => pqb.ArrayColumn<Item>;
+        timestamps: <T_14 extends ColumnType<unknown, pqb.BaseOperators, unknown>>(this: {
+            timestamp(): T_14;
         }) => {
-            createdAt: T_13 & {
+            createdAt: T_14 & {
                 hasDefault: true;
             };
-            updatedAt: T_13 & {
+            updatedAt: T_14 & {
                 hasDefault: true;
             };
         };
         primaryKey(columns: string[], options?: {
             name?: string | undefined;
         } | undefined): {};
-        index(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions | undefined): {};
-        unique(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions | undefined): {};
+        index(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
+        unique(columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): {};
         foreignKey: {
             <Table extends pqb.ForeignKeyTableWithColumns, Columns extends [Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>, ...Exclude<keyof InstanceType<Table>["columns"]["shape"], number | symbol>[]]>(columns: string[], fn: () => Table, foreignColumns: Columns, options?: ForeignKeyOptions | undefined): {};
             <Table_1 extends string, Columns_1 extends [string, ...string[]]>(columns: string[], table: Table_1, foreignColumns: Columns_1, options?: ForeignKeyOptions | undefined): {};

package/dist/index.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var pqb = require('pqb');
-var Enquirer = require('enquirer');
 var path = require('path');
 var promises = require('fs/promises');
+var prompts = require('prompts');
 var url = require('url');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -28,8 +28,8 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var Enquirer__default = /*#__PURE__*/_interopDefaultLegacy(Enquirer);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
+var prompts__default = /*#__PURE__*/_interopDefaultLegacy(prompts);
 
 var __defProp$6 = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
@@ -131,32 +131,35 @@ const setAdapterOptions = (options, set) => {
     return __spreadValues$6(__spreadValues$6({}, options), set);
   }
 };
-const askAdminCredentials = async () => {
-  const prompt = new Enquirer__default["default"].Snippet({
-    message: `What are postgres admin login and password?`,
-    fields: [
-      {
-        name: "user",
-        required: true
-      },
-      {
-        name: "password"
-      }
-    ],
-    values: {
-      user: "postgres",
-      password: ""
+const setAdminCredentialsToOptions = async (options, create) => {
+  const confirm = await prompts__default["default"]([
+    {
+      message: `Would you like to share admin credentials to ${create ? "create" : "drop"} a database`,
+      type: "confirm",
+      name: "confirm",
+      initial: true
+    }
+  ]);
+  if (!confirm.confirm) {
+    return;
+  }
+  const values = await prompts__default["default"]([
+    {
+      message: "Enter admin user:",
+      type: "text",
+      name: "user",
+      initial: "postgres",
+      min: 1
     },
-    template: "Admin user: {{user}}\nAdmin password: {{password}}"
-  });
-  const { values } = await prompt.run();
-  if (!values.password)
-    values.password = "";
-  return values;
-};
-const setAdminCredentialsToOptions = async (options) => {
-  const values = await askAdminCredentials();
-  return setAdapterOptions(options, values);
+    {
+      message: "Enter admin password:",
+      type: "password",
+      name: "password"
+    }
+  ]);
+  return setAdapterOptions(options, __spreadProps$5(__spreadValues$6({}, values), {
+    password: values.password || void 0
+  }));
 };
 const createSchemaMigrations = async (db, config) => {
   try {
@@ -1299,9 +1302,12 @@ const execute = async (options, sql) => {
     return "ok";
   } catch (error) {
     const err = error;
+    if (typeof err.message === "string" && err.message.includes("sslmode=require")) {
+      return "ssl required";
+    }
     if (err.code === "42P04" || err.code === "3D000") {
       return "already";
-    } else if (err.code === "42501") {
+    } else if (err.code === "42501" || typeof err.message === "string" && err.message.includes("password authentication failed")) {
       return "forbidden";
     } else {
       return { error };
@@ -1320,18 +1326,30 @@ const createOrDrop = async (options, adminOptions, config, args) => {
     console.log(args.successMessage(params));
   } else if (result === "already") {
     console.log(args.alreadyMessage(params));
+  } else if (result === "ssl required") {
+    console.log("SSL is required: append ?ssl=true to the database url string");
+    return;
   } else if (result === "forbidden") {
-    await createOrDrop(
+    let message = `Permission denied to ${args.create ? "create" : "drop"} database.`;
+    const host = adminOptions.databaseURL ? new URL(adminOptions.databaseURL).hostname : adminOptions.host;
+    const isLocal = host === "localhost";
+    if (!isLocal) {
+      message += `
+Don't use this command for database service providers, only for a local db.`;
+    }
+    console.log(message);
+    const updatedOptions = await setAdminCredentialsToOptions(
       options,
-      await setAdminCredentialsToOptions(options),
-      config,
-      args
+      args.create
     );
+    if (!updatedOptions)
+      return;
+    await createOrDrop(options, updatedOptions, config, args);
     return;
   } else {
     throw result.error;
   }
-  if (!args.createVersionsTable)
+  if (!args.create)
     return;
   const db = new pqb.Adapter(options);
   await createSchemaMigrations(db, config);
@@ -1349,7 +1367,7 @@ const createDb = async (arg, config) => {
       alreadyMessage({ database }) {
         return `Database ${database} already exists`;
       },
-      createVersionsTable: true
+      create: true
     });
   }
 };