Merge pull request #16 from themost-framework/use-sqlite3-latest

Use sqlite3@latest
themost-framework · May 5, 2022 · a96b08d · a96b08d
2 parents a16ee23 + e9c2aab
commit a96b08d
Show file tree

Hide file tree

Showing 4 changed files with 1,799 additions and 526 deletions.
diff --git a/SqliteAdapter.js b/SqliteAdapter.js
@@ -5,7 +5,7 @@ const util = require('util');
 const {TraceUtils} = require('@themost/common');
 const { QueryExpression, QueryField, SqlUtils } = require('@themost/query');
 const { SqliteFormatter } = require('./SqliteFormatter');
-const sqlite = require('@themost/sqlite3');
+const sqlite = require('sqlite3');
 const sqlite3 = sqlite.verbose();
 const SqlDateRegEx = /^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\.\d+\+[0-1][0-9]:[0-5][0-9]$/;
 /**

diff --git a/SqliteFormatter.js b/SqliteFormatter.js
@@ -36,11 +36,6 @@ class SqliteFormatter extends SqlFormatter {
             forceAlias: true
         };
     }
-    escapeName(name) {
-        if (typeof name === 'string')
-            return name.replace(/(\w+)/ig, this.settings.nameFormat);
-        return name;
-    }
     /**
      * Escapes an object or a value and returns the equivalent sql value.
      * @param {*} value - A value that is going to be escaped for SQL statements