fix: semicolon inside strings breaks queries, closes #59

antares-sql · Apr 28, 2021 · 1b09909 · 1b09909
1 parent 04cd806
commit 1b09909
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "faker": "^5.3.1",
     "marked": "^2.0.2",
     "moment": "^2.29.1",
-    "mssql": "^6.2.3",
+    "mssql": "^6.3.1",
     "mysql2": "^2.2.5",
     "node-sql-parser": "^3.1.0",
     "pg": "^8.5.1",

diff --git a/src/main/libs/clients/MySQLClient.js b/src/main/libs/clients/MySQLClient.js
@@ -1278,7 +1278,7 @@ export class MySQLClient extends AntaresCore {
       const nestTables = args.nest ? '.' : false;
       const resultsArr = [];
       let paramsArr = [];
-      const queries = args.split ? sql.split(';') : [sql];
+      const queries = args.split ? sql.split(/(?!\B['"][^'"]*);(?![^'"]*['"]\B)/gm) : [sql];
 
       if (process.env.NODE_ENV === 'development') this._logger(sql);// TODO: replace BLOB content with a placeholder
 

diff --git a/src/main/libs/clients/PostgreSQLClient.js b/src/main/libs/clients/PostgreSQLClient.js
@@ -1255,7 +1255,7 @@ export class PostgreSQLClient extends AntaresCore {
 
       const resultsArr = [];
       let paramsArr = [];
-      const queries = args.split ? sql.split(';') : [sql];
+      const queries = args.split ? sql.split(/(?!\B'[^']*);(?![^']*'\B)/gm) : [sql];
 
       if (process.env.NODE_ENV === 'development') this._logger(sql);// TODO: replace BLOB content with a placeholder