@deterministic-code/datasources-mysql 0.1.11 → 0.1.14

package/dist/MysqlAlterTableStatementRenderer.d.ts

@@ -1,6 +1,8 @@
-import { AlterTableStatementTextRenderer, type AlterAction, type Column } from "@deterministic-code/datasources";
+import { AlterTableStatementTextRenderer, type AlterAction, type Column, type NotNull } from "@deterministic-code/datasources";
 export declare class MysqlAlterTableStatementRenderer extends AlterTableStatementTextRenderer {
     protected typeName(column: Column): string;
+    protected columnDefault(column: Column): string;
+    protected notNullSql(value?: NotNull): string;
     protected identity(column: Column): string;
     protected actionSql(action: AlterAction): string;
 }

package/dist/MysqlAlterTableStatementRenderer.js

@@ -4,6 +4,12 @@ export class MysqlAlterTableStatementRenderer extends AlterTableStatementTextRen
     typeName(column) {
         return columnTypes[column.type] ?? column.type;
     }
+    columnDefault(column) {
+        return column.default == null ? "" : ` DEFAULT ${column.default.value}`;
+    }
+    notNullSql(value) {
+        return value == null ? "" : " NOT NULL";
+    }
     identity(column) {
         return column.identity ? " AUTO_INCREMENT" : "";
     }

package/dist/MysqlCreateTableStatementRenderer.d.ts

@@ -1,5 +1,7 @@
-import { CreateTableStatementTextRenderer, type Column } from "@deterministic-code/datasources";
+import { CreateTableStatementTextRenderer, type Column, type NotNull } from "@deterministic-code/datasources";
 export declare class MysqlCreateTableStatementRenderer extends CreateTableStatementTextRenderer {
     protected typeName(column: Column): string;
+    protected columnDefault(column: Column): string;
+    protected notNullSql(value?: NotNull): string;
     protected identity(column: Column): string;
 }

package/dist/MysqlCreateTableStatementRenderer.js

@@ -4,6 +4,12 @@ export class MysqlCreateTableStatementRenderer extends CreateTableStatementTextR
     typeName(column) {
         return columnTypes[column.type] ?? column.type;
     }
+    columnDefault(column) {
+        return column.default == null ? "" : ` DEFAULT ${column.default.value}`;
+    }
+    notNullSql(value) {
+        return value == null ? "" : " NOT NULL";
+    }
     identity(column) {
         return column.identity ? " AUTO_INCREMENT" : "";
     }

package/dist/MysqlDriver.js

@@ -1,4 +1,4 @@
-import { DatasourceError, DefaultValueConverter, DeterministicTypeConverter, StatementTextRenderer, } from "@deterministic-code/datasources";
+import { DatasourceError, DefaultValueConverter, sqlStringLiteral, DeterministicTypeConverter, StatementTextRenderer, } from "@deterministic-code/datasources";
 import { MysqlConnection } from "./connection.js";
 import { MysqlCommand } from "./command.js";
 import { MysqlTransaction } from "./transaction.js";
@@ -63,8 +63,10 @@ export class MysqlDriver {
         utcNow: () => `(UTC_TIMESTAMP(3))`,
         booleanOn: "1",
         booleanOff: "0",
-        hex: (arg) => `X'${arg}'`,
-        hexReverse: /^X'(.*)'$/,
+        hex: (arg) => `(X'${arg}')`,
+        hexReverse: /^(?:\(X'(.*)'\)|X'(.*)')$/,
+        quote: (arg) => `(${sqlStringLiteral(arg)})`,
+        quoteReverse: /^(?:\('(.*)'\)|'(.*)')$/,
     });
     columnType = (name) => columnTypes[name] ??
         (() => {

package/dist/MysqlStatementRenderer.d.ts

@@ -1,4 +1,4 @@
-import { AlterTableStatement, BulkUpdateStatement, CreateBulkCreateStoredProcedureStatement, CreateBulkDeleteStoredProcedureStatement, CreateBulkUpdateStoredProcedureStatement, CreateCreateStoredProcedureStatement, CreateDeleteStoredProcedureStatement, CreateReadStoredProcedureStatement, CreateTableStatement, CreateTriggerStatement, CreateUpdateStoredProcedureStatement, DropIndexStatement, DropRoutineStatement, SelectInsertedIdStatement, StatementRenderer, type StatementTextRenderer } from "@deterministic-code/datasources";
+import { AlterTableStatement, BulkUpdateStatement, CreateBulkCreateStoredProcedureStatement, CreateBulkDeleteStoredProcedureStatement, CreateBulkUpdateStoredProcedureStatement, CreateCreateStoredProcedureStatement, CreateDeleteStoredProcedureStatement, CreateNestedReadStoredProcedureStatement, CreateReadStoredProcedureStatement, CreateTableStatement, CreateTriggerStatement, CreateUpdateStoredProcedureStatement, DropIndexStatement, DropRoutineStatement, SelectInsertedIdStatement, StatementRenderer, type StatementTextRenderer } from "@deterministic-code/datasources";
 export declare class MysqlStatementRenderer extends StatementRenderer {
     constructor(text: StatementTextRenderer);
     protected visitSelectInsertedId(inserted: SelectInsertedIdStatement): string;
@@ -10,6 +10,7 @@ export declare class MysqlStatementRenderer extends StatementRenderer {
     protected visitDropRoutine(routine: DropRoutineStatement): string;
     protected visitCreateCreateStoredProcedureStatement(statement: CreateCreateStoredProcedureStatement): string;
     protected visitCreateReadStoredProcedureStatement(statement: CreateReadStoredProcedureStatement): string;
+    protected visitCreateNestedReadStoredProcedureStatement(statement: CreateNestedReadStoredProcedureStatement): string;
     protected visitCreateUpdateStoredProcedureStatement(statement: CreateUpdateStoredProcedureStatement): string;
     protected visitCreateDeleteStoredProcedureStatement(statement: CreateDeleteStoredProcedureStatement): string;
     protected visitCreateBulkCreateStoredProcedureStatement(statement: CreateBulkCreateStoredProcedureStatement): string;

package/dist/MysqlStatementRenderer.js

@@ -42,6 +42,9 @@ export class MysqlStatementRenderer extends StatementRenderer {
     visitCreateReadStoredProcedureStatement(statement) {
         return new MysqlStoredProcedureStatementRenderer().renderRead(statement);
     }
+    visitCreateNestedReadStoredProcedureStatement(statement) {
+        return new MysqlStoredProcedureStatementRenderer().renderNestedRead(statement);
+    }
     visitCreateUpdateStoredProcedureStatement(statement) {
         return new MysqlStoredProcedureStatementRenderer().renderUpdate(statement);
     }

package/dist/MysqlStoredProcedureStatementRenderer.d.ts

@@ -1,6 +1,7 @@
-import type { CreateBulkCreateStoredProcedureStatement, CreateBulkDeleteStoredProcedureStatement, CreateBulkUpdateStoredProcedureStatement, CreateCreateStoredProcedureStatement, CreateDeleteStoredProcedureStatement, CreateReadStoredProcedureStatement, CreateUpdateStoredProcedureStatement } from "@deterministic-code/datasources";
+import type { CreateBulkCreateStoredProcedureStatement, CreateBulkDeleteStoredProcedureStatement, CreateBulkUpdateStoredProcedureStatement, CreateCreateStoredProcedureStatement, CreateDeleteStoredProcedureStatement, CreateNestedReadStoredProcedureStatement, CreateReadStoredProcedureStatement, CreateUpdateStoredProcedureStatement } from "@deterministic-code/datasources";
 export declare class MysqlStoredProcedureStatementRenderer {
     renderCreate(statement: CreateCreateStoredProcedureStatement): string;
+    renderNestedRead(statement: CreateNestedReadStoredProcedureStatement): string;
     renderRead(statement: CreateReadStoredProcedureStatement): string;
     renderUpdate(statement: CreateUpdateStoredProcedureStatement): string;
     renderDelete(statement: CreateDeleteStoredProcedureStatement): string;

package/dist/MysqlStoredProcedureStatementRenderer.js

@@ -1,3 +1,4 @@
+import { DefaultStatementTextRenderer } from "@deterministic-code/datasources";
 const params = (list) => list.map((p) => `  IN ${p.name} ${p.type}`).join(",\n");
 const where = (columns) => columns.map((c) => `t.${c} = ${c}`).join(" AND ");
 const jsonColumns = (columns) => columns.map((c) => `${c.name} ${c.type} PATH '$.${c.name}'`).join(", ");
@@ -26,6 +27,13 @@ export class MysqlStoredProcedureStatementRenderer {
   SELECT LAST_INSERT_ID() AS ${statement.key};`;
         return procedure(statement.name, `\n${params(statement.parameters)}\n`, body);
     }
+    renderNestedRead(statement) {
+        const select = DefaultStatementTextRenderer.instance.render(statement.select);
+        const signature = statement.arguments
+            .map((argument) => `IN ${argument.parameter.name} ${argument.parameter.type}`)
+            .join(", ");
+        return procedure(statement.name, signature, `  ${select};`);
+    }
     renderRead(statement) {
         const aliased = statement.columns.map((c) => `t.${c}`).join(", ");
         if (statement.byProperties.length === 0) {

package/dist/register-sql-generate.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/register-sql-generate.js

@@ -0,0 +1,3 @@
+import { register } from "@deterministic-code/datasources-code-generators/common/sql-dialect";
+import { MysqlDriver } from "./MysqlDriver.js";
+register("mysql", new MysqlDriver());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-mysql",
-  "version": "0.1.11",
+  "version": "0.1.14",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -18,7 +18,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@deterministic-code/datasources": "^0.1.11",
+    "@deterministic-code/datasources": "^0.1.14",
     "mysql2": "^3.14.0"
   }
 }