@malloydata/db-mysql 0.0.391 → 0.0.392

package/dist/mysql_connection.js

@@ -44,6 +44,13 @@ const malloy_1 = require("@malloydata/malloy");
 const connection_1 = require("@malloydata/malloy/connection");
 const crypto_1 = require("crypto");
 const MYSQL = __importStar(require("mysql2/promise"));
+/**
+ * A bare or schema-qualified SQL identifier — `name` or `db.name`. Anything
+ * else (dashes, dots-as-extensions, slashes, special characters) needs to be
+ * wrapped in backticks for `DESCRIBE` to parse it as one identifier rather
+ * than e.g. parsing `my-table` as subtraction.
+ */
+const SQL_IDENTIFIER_CHAIN = /^[A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)*$/;
 class MySQLExecutor {
     static getConnectionOptionsFromEnv() {
         const user = process.env['MYSQL_USER'];
@@ -160,9 +167,9 @@ class MySQLConnection extends connection_1.BaseConnection {
             connection: this.name,
             fields: [],
         };
-        const quotedTablePath = tablePath.match(/[:*/]/)
-            ? `\`${tablePath}\``
-            : tablePath;
+        const quotedTablePath = SQL_IDENTIFIER_CHAIN.test(tablePath)
+            ? tablePath
+            : `\`${tablePath}\``;
         const infoQuery = `DESCRIBE ${quotedTablePath}`;
         const result = await this.runRawSQL(infoQuery);
         await this.schemaFromResult(result, structDef);
@@ -234,9 +241,7 @@ class MySQLConnection extends connection_1.BaseConnection {
         if (!metadata) {
             return jsonArray;
         }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const filteredArray = jsonArray
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             .filter(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (element) => element !== null && !MySQLConnection.checkIsMalloyMetadata(element))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-mysql",
-  "version": "0.0.391",
+  "version": "0.0.392",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,12 +17,13 @@
     "lint-fix": "eslint '**/*.ts{,x}' --fix",
     "test": "jest --config=../../jest.config.js",
     "build": "tsc --build",
+    "dev": "tsc --build",
     "clean": "tsc --build --clean && rm -f tsconfig.tsbuildinfo",
     "malloyc": "ts-node ../../scripts/malloy-to-json",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.391",
+    "@malloydata/malloy": "0.0.392",
     "@types/node": "^22.7.4",
     "fastestsmallesttextencoderdecoder": "^1.0.22",
     "luxon": "^3.5.0",