rado 1.3.0-preview.4 → 1.3.0-preview.6

package/dist/core/Database.js

@@ -53,6 +53,12 @@ var Database = class extends Builder {
     return this.driver.prepare(emitter.sql).all(emitter.bind());
   }
   migrate(...tables) {
+    if (this.dialect.runtime === "mysql" && tables.length > 1) {
+      const run = async () => {
+        for (const table of tables) await this.migrate(table);
+      };
+      return run();
+    }
     const computeDiff = this.diff;
     return this.transaction(
       txGenerator(function* (tx) {

package/dist/core/Table.d.ts

@@ -1,5 +1,6 @@
 import { type Column, type JsonColumn } from './Column.js';
-import type { ForeignKeyConstraint, PrimaryKeyConstraint, UniqueConstraint } from './Constraint.js';
+import type { ForeignKeyConstraint, UniqueConstraint } from './Constraint.js';
+import { PrimaryKeyConstraint } from './Constraint.js';
 import { Field } from './expr/Field.js';
 import type { Input } from './expr/Input.js';
 import { type JsonExpr } from './expr/Json.js';
@@ -32,6 +33,7 @@ export declare class TableApi<Definition extends TableDefinition = TableDefiniti
     indexes(): Record<string, Index>;
 }
 export declare function tableFields(targetName: string, columns: TableDefinition): Record<string, HasSql>;
+export declare function primaryKeyColumns(tableApi: TableApi): Set<string>;
 export type Table<Definition extends TableDefinition = Record<never, Column>, Name extends string = string> = TableFields<Definition, Name> & HasTable<Definition, Name> & HasSelection & HasCreate & HasDrop;
 export type TableFields<Definition extends TableDefinition, TableName extends string = string> = {
     [K in keyof Definition]: Definition[K] extends JsonColumn<infer T> ? JsonExpr<T> : Definition[K] extends Column<infer T, [

package/dist/core/Table.js

@@ -1,6 +1,7 @@
 // src/core/Table.ts
 import { collectEnumQuery } from "../postgres/enum.js";
 import { formatColumn } from "./Column.js";
+import { PrimaryKeyConstraint } from "./Constraint.js";
 import { Field } from "./expr/Field.js";
 import { jsonExpr } from "./expr/Json.js";
 import { Index } from "./Index.js";
@@ -114,6 +115,18 @@ function tableFields(targetName, columns) {
     })
   );
 }
+function primaryKeyColumns(tableApi) {
+  const columns = /* @__PURE__ */ new Set();
+  for (const [name, column] of entries(tableApi.columns)) {
+    const columnApi = getData(column);
+    if (columnApi.primary) columns.add(columnApi.name ?? name);
+  }
+  for (const constraint of Object.values(tableApi.config ?? {})) {
+    if (!(constraint instanceof PrimaryKeyConstraint)) continue;
+    for (const field of getData(constraint).fields) columns.add(field.fieldName);
+  }
+  return columns;
+}
 function table(name, columns, config, schemaName) {
   const api = assign(new TableApi(), {
     name,
@@ -164,6 +177,7 @@ function tableCreator(nameTable) {
 export {
   TableApi,
   alias,
+  primaryKeyColumns,
   table,
   tableCreator,
   tableFields

package/dist/driver/pg.js

@@ -3,6 +3,17 @@ import { AsyncDatabase } from "../core/Database.js";
 import { postgresDialect } from "../postgres/dialect.js";
 import { postgresDiff } from "../postgres/diff.js";
 import { setTransaction } from "../postgres/transactions.js";
+function isPool(client) {
+  return "connect" in client && "totalCount" in client && "idleCount" in client && "waitingCount" in client;
+}
+async function acquireClient(client, depth) {
+  if (depth > 0 || !isPool(client)) return { client };
+  const acquired = await client.connect();
+  return {
+    client: acquired,
+    release: () => acquired.release()
+  };
+}
 var PreparedStatement = class {
   constructor(client, sql, name) {
     this.client = client;
@@ -59,8 +70,9 @@ var PgDriver = class _PgDriver {
     return new PreparedStatement(this.client, sql, options?.name);
   }
   async close() {
-    if ("end" in this.client) return this.client.end();
+    if (this.depth > 0) throw new Error("Cannot close a transaction");
     if ("release" in this.client) return this.client.release();
+    if ("end" in this.client) return this.client.end();
   }
   async batch(queries) {
     return this.transaction(async (tx) => {
@@ -71,8 +83,7 @@ var PgDriver = class _PgDriver {
     }, {});
   }
   async transaction(run, options) {
-    const acquiredClient = this.depth === 0 && "totalCount" in this.client ? await this.client.connect() : void 0;
-    const client = acquiredClient ?? this.client;
+    const { client, release } = await acquireClient(this.client, this.depth);
     try {
       await client.query(this.depth > 0 ? `savepoint d${this.depth}` : "begin");
       if (this.depth === 0) await client.query(setTransaction(options));
@@ -87,7 +98,7 @@ var PgDriver = class _PgDriver {
       );
       throw error;
     } finally {
-      acquiredClient?.release();
+      release?.();
     }
   }
 };

package/dist/mysql/diff.js

@@ -4,6 +4,7 @@ import { eq } from "../core/expr/Conditions.js";
 import { getData, getTable } from "../core/Internal.js";
 import { schema } from "../core/Schema.js";
 import { sql } from "../core/Sql.js";
+import { primaryKeyColumns } from "../core/Table.js";
 import { txGenerator } from "../universal.js";
 import * as column from "./columns.js";
 import { mysqlDialect } from "./dialect.js";
@@ -77,15 +78,24 @@ var mysqlDiff = (hasTable) => {
           {
             type: sql.unsafe(type),
             notNull: column2.notNull && !isAutoIncrement,
+            nullable: !column2.notNull,
             defaultValue: column2.defaultValue && !isAutoIncrement ? sql.unsafe(column2.defaultValue) : void 0
           }
         ];
       })
     );
+    const primaryKeys = primaryKeyColumns(tableApi);
     const schemaColumns = new Map(
       Object.entries(tableApi.columns).map(([name, column2]) => {
         const columnApi = getData(column2);
-        return [columnApi.name ?? name, columnApi];
+        const columnName = columnApi.name ?? name;
+        return [
+          columnName,
+          {
+            ...columnApi,
+            nullable: !columnApi.notNull && !primaryKeys.has(columnName)
+          }
+        ];
       })
     );
     const columnNames = /* @__PURE__ */ new Set([
@@ -120,13 +130,13 @@ var mysqlDiff = (hasTable) => {
             })
           );
         }
-        if (Boolean(localInstruction.notNull) !== Boolean(schemaInstruction.notNull)) {
+        if (Boolean(localInstruction.nullable) !== Boolean(schemaInstruction.nullable)) {
           stmts.push(
             sql.query({
               alterTable,
               modifyColumn: [
                 column2,
-                schemaInstruction.notNull ? sql`${schemaInstruction.type} not null` : sql`${schemaInstruction.type} null`
+                schemaInstruction.nullable ? sql`${schemaInstruction.type} null` : sql`${schemaInstruction.type} not null`
               ]
             })
           );

package/dist/postgres/diff.js

@@ -14,7 +14,7 @@ import {
 } from "../core/expr/Conditions.js";
 import { getData, getTable } from "../core/Internal.js";
 import { sql } from "../core/Sql.js";
-import { table } from "../core/Table.js";
+import { primaryKeyColumns, table } from "../core/Table.js";
 import { concat, txGenerator } from "../universal.js";
 import * as column from "./columns.js";
 import { postgresDialect } from "./dialect.js";
@@ -115,15 +115,24 @@ var postgresDiff = (hasTable) => {
           {
             type: sql.unsafe(column2.type.toLowerCase()),
             notNull: column2.notNull,
+            nullable: !column2.notNull,
             defaultValue: column2.defaultValue ? sql.unsafe(column2.defaultValue) : void 0
           }
         ];
       })
     );
+    const primaryKeys = primaryKeyColumns(tableApi);
     const schemaColumns = new Map(
       Object.entries(tableApi.columns).map(([name, column2]) => {
         const columnApi = getData(column2);
-        return [columnApi.name ?? name, columnApi];
+        const columnName = columnApi.name ?? name;
+        return [
+          columnName,
+          {
+            ...columnApi,
+            nullable: !columnApi.notNull && !primaryKeys.has(columnName)
+          }
+        ];
       })
     );
     const stmts = [];
@@ -159,13 +168,13 @@ var postgresDiff = (hasTable) => {
             })
           );
         }
-        if (Boolean(localInstruction.notNull) !== Boolean(schemaInstruction.notNull)) {
+        if (Boolean(localInstruction.nullable) !== Boolean(schemaInstruction.nullable)) {
           stmts.push(
             sql.query({
               alterTable,
               alterColumn: [
                 column2,
-                schemaInstruction.notNull ? sql`set not null` : sql`drop not null`
+                schemaInstruction.nullable ? sql`drop not null` : sql`set not null`
               ]
             })
           );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "1.3.0-preview.4",
+  "version": "1.3.0-preview.6",
   "license": "MIT",
   "repository": {
     "type": "git",