kysely 0.20.0 → 0.20.1

package/dist/cjs/dialect/postgres/postgres-introspector.js

@@ -22,38 +22,40 @@ class PostgresIntrospector {
             .selectFrom('pg_catalog.pg_attribute as a')
             .innerJoin('pg_catalog.pg_class as c', 'a.attrelid', 'c.oid')
             .innerJoin('pg_catalog.pg_namespace as ns', 'c.relnamespace', 'ns.oid')
-            .innerJoin('pg_catalog.pg_tables as t', (join) => join
-            .onRef('t.tablename', '=', 'c.relname')
-            .onRef('t.schemaname', '=', 'ns.nspname'))
             .innerJoin('pg_catalog.pg_type as typ', 'a.atttypid', 'typ.oid')
             .select([
             'a.attname as column',
             'a.attnotnull as not_null',
             'a.atthasdef as has_default',
-            't.tablename as table',
-            't.schemaname as schema',
+            'c.relname as table',
+            'ns.nspname as schema',
             'typ.typname as type',
             // Detect if the column is auto incrementing by finding the sequence
             // that is created for `serial` and `bigserial` columns.
             this.#db
                 .selectFrom('pg_class')
                 .select((0, sql_js_1.sql) `true`.as('auto_incrementing'))
+                // Make sure the sequence is in the same schema as the table.
+                .whereRef('relnamespace', '=', 'c.relnamespace')
                 .where('relkind', '=', 'S')
-                .where('relname', '=', (0, sql_js_1.sql) `t.tablename || '_' || a.attname || '_seq'`)
+                .where('relname', '=', (0, sql_js_1.sql) `c.relname || '_' || a.attname || '_seq'`)
                 .as('auto_incrementing'),
         ])
-            .where('t.schemaname', '!~', '^pg_')
-            .where('t.schemaname', '!=', 'information_schema')
-            .where('a.attnum', '>=', 0) // No system columns
+            // r == normal table
+            .where('c.relkind', '=', 'r')
+            .where('ns.nspname', '!~', '^pg_')
+            .where('ns.nspname', '!=', 'information_schema')
+            // No system columns
+            .where('a.attnum', '>=', 0)
             .where('a.attisdropped', '!=', true)
-            .orderBy('t.schemaname')
-            .orderBy('t.tablename')
+            .orderBy('ns.nspname')
+            .orderBy('c.relname')
             .orderBy('a.attname')
             .castTo();
         if (!options.withInternalKyselyTables) {
             query = query
-                .where('t.tablename', '!=', migrator_js_1.DEFAULT_MIGRATION_TABLE)
-                .where('t.tablename', '!=', migrator_js_1.DEFAULT_MIGRATION_LOCK_TABLE);
+                .where('c.relname', '!=', migrator_js_1.DEFAULT_MIGRATION_TABLE)
+                .where('c.relname', '!=', migrator_js_1.DEFAULT_MIGRATION_LOCK_TABLE);
         }
         const rawColumns = await query.execute();
         return this.#parseTableMetadata(rawColumns);

package/dist/cjs/index.d.ts

@@ -73,6 +73,7 @@ export * from './migration/file-migration-provider.js';
 export * from './plugin/kysely-plugin.js';
 export * from './plugin/camel-case/camel-case-plugin.js';
 export * from './plugin/deduplicate-joins/deduplicate-joins-plugin.js';
+export * from './plugin/with-schema/with-schema-plugin.js';
 export * from './operation-node/add-column-node.js';
 export * from './operation-node/add-constraint-node.js';
 export * from './operation-node/alias-node.js';

package/dist/cjs/index.js

@@ -89,6 +89,7 @@ __exportStar(require("./migration/file-migration-provider.js"), exports);
 __exportStar(require("./plugin/kysely-plugin.js"), exports);
 __exportStar(require("./plugin/camel-case/camel-case-plugin.js"), exports);
 __exportStar(require("./plugin/deduplicate-joins/deduplicate-joins-plugin.js"), exports);
+__exportStar(require("./plugin/with-schema/with-schema-plugin.js"), exports);
 __exportStar(require("./operation-node/add-column-node.js"), exports);
 __exportStar(require("./operation-node/add-constraint-node.js"), exports);
 __exportStar(require("./operation-node/alias-node.js"), exports);

package/dist/cjs/operation-node/reference-node.d.ts

@@ -13,5 +13,5 @@ export interface ReferenceNode extends OperationNode {
 export declare const ReferenceNode: Readonly<{
     is(node: OperationNode): node is ReferenceNode;
     create(table: TableNode, column: ColumnNode): ReferenceNode;
-    createSelectAll(table: string): ReferenceNode;
+    createSelectAll(table: TableNode): ReferenceNode;
 }>;

package/dist/cjs/operation-node/reference-node.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferenceNode = void 0;
-const table_node_js_1 = require("./table-node.js");
 const select_all_node_js_1 = require("./select-all-node.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 /**
@@ -21,7 +20,7 @@ exports.ReferenceNode = (0, object_utils_js_1.freeze)({
     createSelectAll(table) {
         return (0, object_utils_js_1.freeze)({
             kind: 'ReferenceNode',
-            table: table_node_js_1.TableNode.create(table),
+            table,
             column: select_all_node_js_1.SelectAllNode.create(),
         });
     },

package/dist/cjs/operation-node/selection-node.d.ts

@@ -3,6 +3,7 @@ import { ColumnNode } from './column-node.js';
 import { OperationNode } from './operation-node.js';
 import { ReferenceNode } from './reference-node.js';
 import { SelectAllNode } from './select-all-node.js';
+import { TableNode } from './table-node.js';
 declare type SelectionNodeChild = ColumnNode | ReferenceNode | AliasNode | SelectAllNode;
 export interface SelectionNode extends OperationNode {
     readonly kind: 'SelectionNode';
@@ -15,6 +16,6 @@ export declare const SelectionNode: Readonly<{
     is(node: OperationNode): node is SelectionNode;
     create(selection: SelectionNodeChild): SelectionNode;
     createSelectAll(): SelectionNode;
-    createSelectAllFromTable(table: string): SelectionNode;
+    createSelectAllFromTable(table: TableNode): SelectionNode;
 }>;
 export {};

package/dist/cjs/parser/select-parser.js

@@ -6,6 +6,7 @@ const selection_node_js_1 = require("../operation-node/selection-node.js");
 const reference_parser_js_1 = require("./reference-parser.js");
 const dynamic_reference_builder_js_1 = require("../dynamic/dynamic-reference-builder.js");
 const complex_expression_parser_js_1 = require("./complex-expression-parser.js");
+const table_parser_js_1 = require("./table-parser.js");
 function parseSelectExpressionOrList(selection) {
     if ((0, object_utils_js_1.isReadonlyArray)(selection)) {
         return selection.map((it) => parseSelectExpression(it));
@@ -40,7 +41,7 @@ function parseSelectAll(table) {
 exports.parseSelectAll = parseSelectAll;
 function parseSelectAllArg(table) {
     if ((0, object_utils_js_1.isString)(table)) {
-        return selection_node_js_1.SelectionNode.createSelectAllFromTable(table);
+        return selection_node_js_1.SelectionNode.createSelectAllFromTable((0, table_parser_js_1.parseTable)(table));
     }
     throw new Error(`invalid value selectAll expression: ${JSON.stringify(table)}`);
 }

package/dist/esm/dialect/postgres/postgres-introspector.js

@@ -20,38 +20,40 @@ export class PostgresIntrospector {
             .selectFrom('pg_catalog.pg_attribute as a')
             .innerJoin('pg_catalog.pg_class as c', 'a.attrelid', 'c.oid')
             .innerJoin('pg_catalog.pg_namespace as ns', 'c.relnamespace', 'ns.oid')
-            .innerJoin('pg_catalog.pg_tables as t', (join) => join
-            .onRef('t.tablename', '=', 'c.relname')
-            .onRef('t.schemaname', '=', 'ns.nspname'))
             .innerJoin('pg_catalog.pg_type as typ', 'a.atttypid', 'typ.oid')
             .select([
             'a.attname as column',
             'a.attnotnull as not_null',
             'a.atthasdef as has_default',
-            't.tablename as table',
-            't.schemaname as schema',
+            'c.relname as table',
+            'ns.nspname as schema',
             'typ.typname as type',
             // Detect if the column is auto incrementing by finding the sequence
             // that is created for `serial` and `bigserial` columns.
             this.#db
                 .selectFrom('pg_class')
                 .select(sql `true`.as('auto_incrementing'))
+                // Make sure the sequence is in the same schema as the table.
+                .whereRef('relnamespace', '=', 'c.relnamespace')
                 .where('relkind', '=', 'S')
-                .where('relname', '=', sql `t.tablename || '_' || a.attname || '_seq'`)
+                .where('relname', '=', sql `c.relname || '_' || a.attname || '_seq'`)
                 .as('auto_incrementing'),
         ])
-            .where('t.schemaname', '!~', '^pg_')
-            .where('t.schemaname', '!=', 'information_schema')
-            .where('a.attnum', '>=', 0) // No system columns
+            // r == normal table
+            .where('c.relkind', '=', 'r')
+            .where('ns.nspname', '!~', '^pg_')
+            .where('ns.nspname', '!=', 'information_schema')
+            // No system columns
+            .where('a.attnum', '>=', 0)
             .where('a.attisdropped', '!=', true)
-            .orderBy('t.schemaname')
-            .orderBy('t.tablename')
+            .orderBy('ns.nspname')
+            .orderBy('c.relname')
             .orderBy('a.attname')
             .castTo();
         if (!options.withInternalKyselyTables) {
             query = query
-                .where('t.tablename', '!=', DEFAULT_MIGRATION_TABLE)
-                .where('t.tablename', '!=', DEFAULT_MIGRATION_LOCK_TABLE);
+                .where('c.relname', '!=', DEFAULT_MIGRATION_TABLE)
+                .where('c.relname', '!=', DEFAULT_MIGRATION_LOCK_TABLE);
         }
         const rawColumns = await query.execute();
         return this.#parseTableMetadata(rawColumns);

package/dist/esm/index.d.ts

@@ -73,6 +73,7 @@ export * from './migration/file-migration-provider.js';
 export * from './plugin/kysely-plugin.js';
 export * from './plugin/camel-case/camel-case-plugin.js';
 export * from './plugin/deduplicate-joins/deduplicate-joins-plugin.js';
+export * from './plugin/with-schema/with-schema-plugin.js';
 export * from './operation-node/add-column-node.js';
 export * from './operation-node/add-constraint-node.js';
 export * from './operation-node/alias-node.js';

package/dist/esm/index.js

@@ -74,6 +74,7 @@ export * from './migration/file-migration-provider.js';
 export * from './plugin/kysely-plugin.js';
 export * from './plugin/camel-case/camel-case-plugin.js';
 export * from './plugin/deduplicate-joins/deduplicate-joins-plugin.js';
+export * from './plugin/with-schema/with-schema-plugin.js';
 export * from './operation-node/add-column-node.js';
 export * from './operation-node/add-constraint-node.js';
 export * from './operation-node/alias-node.js';

package/dist/esm/operation-node/reference-node.d.ts

@@ -13,5 +13,5 @@ export interface ReferenceNode extends OperationNode {
 export declare const ReferenceNode: Readonly<{
     is(node: OperationNode): node is ReferenceNode;
     create(table: TableNode, column: ColumnNode): ReferenceNode;
-    createSelectAll(table: string): ReferenceNode;
+    createSelectAll(table: TableNode): ReferenceNode;
 }>;

package/dist/esm/operation-node/reference-node.js

@@ -1,5 +1,4 @@
 /// <reference types="./reference-node.d.ts" />
-import { TableNode } from './table-node.js';
 import { SelectAllNode } from './select-all-node.js';
 import { freeze } from '../util/object-utils.js';
 /**
@@ -19,7 +18,7 @@ export const ReferenceNode = freeze({
     createSelectAll(table) {
         return freeze({
             kind: 'ReferenceNode',
-            table: TableNode.create(table),
+            table,
             column: SelectAllNode.create(),
         });
     },

package/dist/esm/operation-node/selection-node.d.ts

@@ -3,6 +3,7 @@ import { ColumnNode } from './column-node.js';
 import { OperationNode } from './operation-node.js';
 import { ReferenceNode } from './reference-node.js';
 import { SelectAllNode } from './select-all-node.js';
+import { TableNode } from './table-node.js';
 declare type SelectionNodeChild = ColumnNode | ReferenceNode | AliasNode | SelectAllNode;
 export interface SelectionNode extends OperationNode {
     readonly kind: 'SelectionNode';
@@ -15,6 +16,6 @@ export declare const SelectionNode: Readonly<{
     is(node: OperationNode): node is SelectionNode;
     create(selection: SelectionNodeChild): SelectionNode;
     createSelectAll(): SelectionNode;
-    createSelectAllFromTable(table: string): SelectionNode;
+    createSelectAllFromTable(table: TableNode): SelectionNode;
 }>;
 export {};

package/dist/esm/parser/select-parser.js

@@ -4,6 +4,7 @@ import { SelectionNode } from '../operation-node/selection-node.js';
 import { parseAliasedStringReference } from './reference-parser.js';
 import { isDynamicReferenceBuilder, } from '../dynamic/dynamic-reference-builder.js';
 import { parseAliasedComplexExpression, } from './complex-expression-parser.js';
+import { parseTable } from './table-parser.js';
 export function parseSelectExpressionOrList(selection) {
     if (isReadonlyArray(selection)) {
         return selection.map((it) => parseSelectExpression(it));
@@ -36,7 +37,7 @@ export function parseSelectAll(table) {
 }
 function parseSelectAllArg(table) {
     if (isString(table)) {
-        return SelectionNode.createSelectAllFromTable(table);
+        return SelectionNode.createSelectAllFromTable(parseTable(table));
     }
     throw new Error(`invalid value selectAll expression: ${JSON.stringify(table)}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",