Fix table and column searching by MySQL driver (mtxr#1005)

gjsjohnmurray · Oct 17, 2022 · 7b33bcb · 7b33bcb
1 parent 0aebf17
commit 7b33bcb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/driver.mysql/package.json b/packages/driver.mysql/package.json
@@ -2,7 +2,7 @@
   "name": "sqltools-driver-mysql",
   "displayName": "SQLTools MySQL/MariaDB",
   "description": "SQLTools MySQL/MariaDB",
-  "version": "0.4.0",
+  "version": "0.4.1-SNAPSHOT",
   "engines": {
     "vscode": "^1.42.0"
   },

diff --git a/packages/driver.mysql/src/ls/queries.ts b/packages/driver.mysql/src/ls/queries.ts
@@ -123,14 +123,14 @@ SELECT
   T.TABLE_CATALOG AS "catalog",
   (CASE WHEN T.TABLE_TYPE = 'BASE TABLE' THEN 0 ELSE 1 END) AS "isView",
   (CASE WHEN T.TABLE_TYPE = 'BASE TABLE' THEN 'table' ELSE 'view' END) AS description,
-  ('"' || T.TABLE_SCHEMA || '"."' || T.TABLE_NAME || '"') as detail
+  CONCAT(T.TABLE_SCHEMA, '.', T.TABLE_NAME) AS detail
 FROM
   INFORMATION_SCHEMA.TABLES AS T
 WHERE
   T.TABLE_SCHEMA NOT IN ('information_schema', 'performance_schema', 'sys', 'mysql')
   ${p => p.search ? `AND (
-    (T.TABLE_SCHEMA || '.' || T.TABLE_NAME) LIKE '%${p.search}%'
-    OR ('"' || T.TABLE_SCHEMA || '"."' || T.TABLE_NAME || '"') LIKE '%${p.search}%'
+    CONCAT(T.TABLE_SCHEMA, '.', T.TABLE_NAME) LIKE '%${p.search}%'
+    OR CONCAT('"', T.TABLE_SCHEMA, '"."', T.TABLE_NAME, '"') LIKE '%${p.search}%'
     OR T.TABLE_NAME LIKE '%${p.search}%'
   )` : ''}
 ORDER BY
@@ -171,7 +171,7 @@ WHERE
   }
   ${p => p.search
     ? `AND (
-      (C.TABLE_NAME || '.' || C.COLUMN_NAME) LIKE '%${p.search}%'
+      CONCAT(C.TABLE_NAME, '.', C.COLUMN_NAME) LIKE '%${p.search}%'
       OR C.COLUMN_NAME LIKE '%${p.search}%'
     )`
     : ''