driftsql 1.0.4 → 1.0.5

package/dist/index.d.mts

@@ -31,7 +31,6 @@ declare class DriftSQLClient<DT> {
     private pool?;
     private mysqlClient?;
     private libsqlClient?;
-    private neonClient?;
     private postgresClient?;
     private drivers;
     constructor(options: ClientOptions);

package/dist/index.d.ts

@@ -31,7 +31,6 @@ declare class DriftSQLClient<DT> {
     private pool?;
     private mysqlClient?;
     private libsqlClient?;
-    private neonClient?;
     private postgresClient?;
     private drivers;
     constructor(options: ClientOptions);

package/dist/index.mjs

@@ -5,10 +5,11 @@ import { createClient } from '@libsql/client';
 import mysql from 'mysql2/promise';
 import fs from 'node:fs/promises';
 
-const supportedDrivers = ["postgres"];
-const mapPostgresToTypeScript = (postgresType, isNullable = false) => {
+const supportedDrivers = ["postgres", "mysql"];
+const mapDatabaseTypeToTypeScript = (dataType, isNullable = false, driverType = "postgres") => {
   const nullable = isNullable ? " | null" : "";
-  switch (postgresType.toLowerCase()) {
+  const lowerType = dataType.toLowerCase();
+  switch (lowerType) {
     case "uuid": {
       return `string${nullable}`;
     }
@@ -16,7 +17,10 @@ const mapPostgresToTypeScript = (postgresType, isNullable = false) => {
     case "varchar":
     case "text":
     case "char":
-    case "character": {
+    case "character":
+    case "longtext":
+    case "mediumtext":
+    case "tinytext": {
       return `string${nullable}`;
     }
     case "integer":
@@ -33,11 +37,16 @@ const mapPostgresToTypeScript = (postgresType, isNullable = false) => {
     case "real":
     case "float4":
     case "double precision":
-    case "float8": {
+    case "float8":
+    case "tinyint":
+    case "mediumint":
+    case "float":
+    case "double": {
       return `number${nullable}`;
     }
     case "boolean":
-    case "bool": {
+    case "bool":
+    case "bit": {
       return `boolean${nullable}`;
     }
     case "timestamp":
@@ -49,7 +58,9 @@ const mapPostgresToTypeScript = (postgresType, isNullable = false) => {
     case "time with time zone":
     case "time without time zone":
     case "timetz":
-    case "interval": {
+    case "interval":
+    case "datetime":
+    case "year": {
       return `Date${nullable}`;
     }
     case "json":
@@ -59,11 +70,21 @@ const mapPostgresToTypeScript = (postgresType, isNullable = false) => {
     case "array": {
       return `any[]${nullable}`;
     }
-    case "bytea": {
+    case "bytea":
+    case "binary":
+    case "varbinary":
+    case "blob":
+    case "longblob":
+    case "mediumblob":
+    case "tinyblob": {
       return `Buffer${nullable}`;
     }
+    case "enum":
+    case "set": {
+      return `string${nullable}`;
+    }
     default: {
-      console.warn(`Unknown PostgreSQL type: ${postgresType}, defaulting to 'any'`);
+      console.warn(`Unknown ${driverType} type: ${dataType}, defaulting to 'any'`);
       return `any${nullable}`;
     }
   }
@@ -79,33 +100,67 @@ const inspectDB = async (drivers) => {
     throw new Error(`No supported drivers found. Configured: ${configuredDrivers.join(", ")}. Supported: ${supportedDrivers.join(", ")}`);
   }
   console.log(`Found supported drivers: ${supportedConfiguredDrivers.join(", ")}`);
+  const activeDriver = supportedConfiguredDrivers[0];
   let generatedTypes = "";
   const client = new DriftSQLClient({ drivers });
-  const tables = await client.query(
-    `SELECT table_name 
-     FROM information_schema.tables 
-     WHERE table_schema = 'public' 
-     AND table_type = 'BASE TABLE'
-     ORDER BY table_name`
-  );
+  let tablesQuery;
+  let tableSchemaFilter;
+  if (activeDriver === "mysql") {
+    const dbResult = await client.query("SELECT DATABASE() as `database`", []);
+    const currentDatabase = dbResult.rows[0]?.database;
+    if (!currentDatabase) {
+      throw new Error("Could not determine current MySQL database name");
+    }
+    console.log(`Using MySQL database: ${currentDatabase}`);
+    tablesQuery = `SELECT TABLE_NAME as table_name
+                   FROM information_schema.tables 
+                   WHERE TABLE_SCHEMA = ? 
+                   AND TABLE_TYPE = 'BASE TABLE'
+                   ORDER BY TABLE_NAME`;
+    tableSchemaFilter = currentDatabase;
+  } else {
+    tablesQuery = `SELECT table_name 
+                   FROM information_schema.tables 
+                   WHERE table_schema = $1 
+                   AND table_type = 'BASE TABLE'
+                   ORDER BY table_name`;
+    tableSchemaFilter = "public";
+  }
+  const tables = await client.query(tablesQuery, tableSchemaFilter ? [tableSchemaFilter] : []);
   console.log("Tables in the database:", tables.rows.map((t) => t.table_name).join(", "));
   for (const table of tables.rows) {
     const tableName = table.table_name;
     console.log(`Inspecting table: ${tableName}`);
-    const columns = await client.query(
-      `
-      SELECT 
-        column_name, 
-        data_type, 
-        is_nullable,
-        column_default
-      FROM information_schema.columns 
-      WHERE table_name = $1 
-      AND table_schema = 'public'
-      ORDER BY ordinal_position
-    `,
-      [tableName]
-    );
+    let columnsQuery;
+    let queryParams;
+    if (activeDriver === "mysql") {
+      columnsQuery = `
+        SELECT 
+          COLUMN_NAME as column_name, 
+          DATA_TYPE as data_type, 
+          IS_NULLABLE as is_nullable,
+          COLUMN_DEFAULT as column_default
+        FROM information_schema.columns 
+        WHERE TABLE_NAME = ? 
+        AND TABLE_SCHEMA = ?
+        ORDER BY ORDINAL_POSITION
+      `;
+      queryParams = [tableName, tableSchemaFilter];
+    } else {
+      columnsQuery = `
+        SELECT 
+          column_name, 
+          data_type, 
+          is_nullable,
+          column_default
+        FROM information_schema.columns 
+        WHERE table_name = $1 
+        AND table_schema = $2
+        ORDER BY ordinal_position
+      `;
+      queryParams = [tableName, tableSchemaFilter];
+    }
+    const columns = await client.query(columnsQuery, queryParams);
     if (columns.rows.length === 0) {
       console.log(`No columns found for table: ${tableName}`);
       continue;
@@ -120,7 +175,7 @@ const inspectDB = async (drivers) => {
     generatedTypes += `export interface ${tableName.charAt(0).toUpperCase() + tableName.slice(1)} {
 `;
     for (const col of uniqueColumns.values()) {
-      const tsType = mapPostgresToTypeScript(col.data_type, col.is_nullable === "YES");
+      const tsType = mapDatabaseTypeToTypeScript(col.data_type, col.is_nullable === "YES", activeDriver);
       generatedTypes += `  ${col.column_name}: ${tsType};
 `;
     }
@@ -143,7 +198,6 @@ class DriftSQLClient {
   pool;
   mysqlClient;
   libsqlClient;
-  neonClient;
   postgresClient;
   drivers;
   constructor(options) {
@@ -189,6 +243,12 @@ class DriftSQLClient {
     return inspectDB(this.drivers);
   };
   async query(query, args) {
+    const driversCount = Object.keys(this.drivers).filter((key) => this.drivers[key] !== void 0).length;
+    if (driversCount > 1) {
+      const error = new Error("Multiple drivers are configured. Please use only one driver at a time.");
+      consola.error(error);
+      throw error;
+    }
     if (this.pool) {
       try {
         await this.pool.connect();
@@ -206,7 +266,8 @@ class DriftSQLClient {
     if (this.mysqlClient) {
       try {
         consola.warn("MySQL client is experimental and may not be compatible with the helper functions, since they originally designed for PostgreSQL and libsql. But .query() method should work.");
-        const [rows, fields] = await (await this.mysqlClient).execute(query, args || []);
+        const filteredArgs = (args || []).map((arg) => arg === void 0 ? null : arg);
+        const [rows, fields] = await (await this.mysqlClient).execute(query, filteredArgs);
         return {
           rows,
           rowCount: Array.isArray(rows) ? rows.length : 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "driftsql",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "author": "lasse vestergaard",
   "description": "A lightweight SQL client for TypeScript, supporting multiple databases like PostgreSQL, MySQL, and LibSQL.",
   "repository": "lassejlv/driftsql",