Merge pull request #307 from Zhomart/update-deps

Update dex, sqlite, mysql, mongodb, postgres deps for compatibility with the latest deno v1.16.2

.gitignore

@@ -12,4 +12,5 @@ design/*.sketch
 examples/
 .deno_plugins
 .nova/*
-tsconfig.json
+tsconfig.json
+.env

deps.ts

@@ -1,25 +1,22 @@
 export * as ConsoleColor from "https://deno.land/x/[email protected]/mod.ts";
 
-// NOTE(eveningkid): this has not be versioned because the Github releases are not up-to-date.
-// Only master is valid at the moment. Seems safe for now since there is no commits being added
-export { default as SQLQueryBuilder } from "https://raw.githubusercontent.com/aghussb/dex/master/mod.ts";
+// NOTE: Migrate to the official https://github.com/aghussb/dex when it's updated to the
+//       latest deno version.
+export { default as SQLQueryBuilder } from "https://raw.githubusercontent.com/Zhomart/dex/930253915093e1e08d48ec0409b4aee800d8bd0c/mod-dyn.ts";
 
 export { camelCase, snakeCase } from "https://deno.land/x/[email protected]/mod.ts";
 
 export {
   Client as MySQLClient,
   configLogger as configMySQLLogger,
   Connection as MySQLConnection,
-} from "https://deno.land/x/[email protected].0/mod.ts";
-export type { LoggerConfig } from "https://deno.land/x/[email protected].0/mod.ts";
+} from "https://deno.land/x/[email protected].1/mod.ts";
+export type { LoggerConfig } from "https://deno.land/x/[email protected].1/mod.ts";
 
-export { Client as PostgresClient } from "https://deno.land/x/postgres@v0.11.2/mod.ts";
+export { Client as PostgresClient } from "https://deno.land/x/postgres@v0.14.2/mod.ts";
 
-export { DB as SQLiteClient } from "https://deno.land/x/sqlite@v2.3.1/mod.ts";
+export { DB as SQLiteClient } from "https://deno.land/x/sqlite@v3.1.3/mod.ts";
 
-// NOTE(eveningkid): upgrading to 0.24.0 would raise an issue asking for the --unstable flag.
-// This would be asked to anyone using denodb, not only mongodb users.
-// Should wait on a version that isn't using any unstable API
-export { MongoClient as MongoDBClient, Bson } from "https://deno.land/x/[email protected]/mod.ts";
-export type { ConnectOptions as MongoDBClientOptions } from "https://deno.land/x/[email protected]/mod.ts";
-export type { Database as MongoDBDatabase } from "https://deno.land/x/[email protected]/src/database.ts";
+export { MongoClient as MongoDBClient, Bson } from "https://deno.land/x/[email protected]/mod.ts";
+export type { ConnectOptions as MongoDBClientOptions } from "https://deno.land/x/[email protected]/mod.ts";
+export type { Database as MongoDBDatabase } from "https://deno.land/x/[email protected]/src/database.ts";

lib/connectors/mysql-connector.ts

@@ -65,6 +65,7 @@ export class MySQLConnector implements Connector {
   async query(
     queryDescription: QueryDescription,
     client?: MySQLClient | MySQLConnection,
+  // deno-lint-ignore no-explicit-any
   ): Promise<any | any[]> {
     await this._makeConnection();
 

lib/connectors/postgres-connector.ts

@@ -59,7 +59,7 @@ export class PostgresConnector implements Connector {
     await this._makeConnection();
 
     try {
-      const [{ result }] = (
+      const [result] = (
         await this._client.queryObject("SELECT 1 + 1 as result")
       ).rows;
       return result === 2;
@@ -68,6 +68,7 @@ export class PostgresConnector implements Connector {
     }
   }
 
+  // deno-lint-ignore no-explicit-any
   async query(queryDescription: QueryDescription): Promise<any | any[]> {
     await this._makeConnection();
 

lib/connectors/sqlite3-connector.ts

@@ -48,27 +48,23 @@ export class SQLite3Connector implements Connector {
     }
   }
 
+  // deno-lint-ignore no-explicit-any
   query(queryDescription: QueryDescription): Promise<any | any[]> {
     this._makeConnection();
 
     const query = this._translator.translateToQuery(queryDescription);
     const subqueries = query.split(/;(?=(?:[^'"]|'[^']*'|"[^"]*")*$)/);
 
-    const results = subqueries.map(async (subquery, index) => {
-      const response = this._client.query(subquery + ";", []);
+    const results = subqueries.map((subquery, index) => {
+      const preparedQuery = this._client.prepareQuery(subquery + ";");
+      const response = preparedQuery.allEntries();
+      preparedQuery.finalize();
 
       if (index < subqueries.length - 1) {
-        response.return();
         return [];
       }
 
-      const results = [];
-      let columns;
-
-      try {
-        columns = response.columns();
-      } catch {
-        // If there are no matching records, .columns will throw an error
+      if (response.length === 0) {
         if (queryDescription.type === "insert" && queryDescription.values) {
           return {
             affectedRows: this._client.changes,
@@ -83,36 +79,28 @@ export class SQLite3Connector implements Connector {
         return { affectedRows: this._client.changes };
       }
 
-      for (const row of response) {
-        const result: { [k: string]: FieldValue } = {};
-
-        let i = 0;
-        for (const column of row!) {
-          const columnName = columns[i].name;
+      return response.map(row => {
+        const result: Record<string, FieldValue> = {};
+        for (const [columnName, value] of Object.entries(row)) {
           if (columnName === "count(*)") {
-            result.count = column;
+            result.count = value as FieldValue;
           } else if (columnName.startsWith("max(")) {
-            result.max = column;
+            result.max = value as FieldValue;
           } else if (columnName.startsWith("min(")) {
-            result.min = column;
+            result.min = value as FieldValue;
           } else if (columnName.startsWith("sum(")) {
-            result.sum = column;
+            result.sum = value as FieldValue;
           } else if (columnName.startsWith("avg(")) {
-            result.avg = column;
+            result.avg = value as FieldValue;
           } else {
-            result[columns[i].name] = column;
+            result[columnName] = value as FieldValue;
           }
-
-          i++;
         }
-
-        results.push(result);
-      }
-
-      return results;
+        return result;
+      });
     });
 
-    return results[results.length - 1];
+    return Promise.resolve(results[results.length - 1]);
   }
 
   async transaction(queries: () => Promise<void>) {

tests/connection.ts

@@ -12,7 +12,7 @@ const defaultMySQLOptions = {
 };
 
 const defaultSQLiteOptions = {
-  filepath: "test.db",
+  filepath: "test.sqlite",
 };
 
 const getMySQLConnection = (options = {}, debug = true): Database => {

tests/deps.ts

@@ -1 +1 @@
-export { assertEquals } from "https://deno.land/std@0.56.0/testing/asserts.ts";
+export { assertEquals } from "https://deno.land/std@0.115.1/testing/asserts.ts";

tests/units/queries/sqlite/response.test.ts

@@ -84,6 +84,10 @@ Deno.test("SQLite: Response model", async () => {
     "Update many records response",
   );
 
+  const articleCount = await Article.where({ title: "hola mundo!" }).count();
+
+  assertEquals(articleCount, 2, "Return article count");
+
   const deleteManyResponse = await Article.where({ title: "hola mundo!" })
     .delete();