Database driver adaptations #32

tksilicon · 2020-08-04T14:04:05Z

Following issue #4 , the Postgres referenced in #2 was adapted. Deno-sqlite was selected. DSO can now run on Postgres and Sqlite as well as MySQL.

Changes have been made to readme file. It seems there is need to bump up Deno version to 1.1.
Github workflow for automated testing needs to be updated to have Postgres and Sqlite Databases.

afinch7 · 2020-08-04T16:14:10Z

Here's a patch for #33

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e950cfa..001c3d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,8 +18,18 @@ jobs:
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: "true"
           MYSQL_ROOT_PASSWORD: ""
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
+      postgres:
+        image: postgres:10.8
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: "thankgodukachukwu"
+          POSTGRES_PASSWORD: "test_orm" 
+          POSTGRES_DB: "test_orm"
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        
     steps:
       - uses: actions/checkout@v2
       - name: Setup Deno
diff --git a/docker-compose.yml b/docker-compose.yml
index 682dddf..33420df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,4 +7,12 @@ services:
       - 3306:3306
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-      MYSQL_ROOT_PASSWORD: ""
\ No newline at end of file
+      MYSQL_ROOT_PASSWORD: ""
+  postgres:
+    image: postgres:10.8
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: "thankgodukachukwu"
+      POSTGRES_PASSWORD: "test_orm" 
+      POSTGRES_DB: "test_orm"
\ No newline at end of file
diff --git a/test.ts b/test.ts
index 8be1365..8c810d1 100644
--- a/test.ts
+++ b/test.ts
@@ -46,7 +46,7 @@ const config2 = {
   user: "thankgodukachukwu",
   database: "test_orm",
   hostname: "127.0.0.1",
-  password: "",
+  password: "test_orm",
   port: 5432,
 };

tksilicon · 2020-08-04T16:44:43Z

Here's a patch for #33

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e950cfa..001c3d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,8 +18,18 @@ jobs:
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: "true"
           MYSQL_ROOT_PASSWORD: ""
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
+      postgres:
+        image: postgres:10.8
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: "thankgodukachukwu"
+          POSTGRES_PASSWORD: "test_orm" 
+          POSTGRES_DB: "test_orm"
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        
     steps:
       - uses: actions/checkout@v2
       - name: Setup Deno
diff --git a/docker-compose.yml b/docker-compose.yml
index 682dddf..33420df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,4 +7,12 @@ services:
       - 3306:3306
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-      MYSQL_ROOT_PASSWORD: ""
\ No newline at end of file
+      MYSQL_ROOT_PASSWORD: ""
+  postgres:
+    image: postgres:10.8
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: "thankgodukachukwu"
+      POSTGRES_PASSWORD: "test_orm" 
+      POSTGRES_DB: "test_orm"
\ No newline at end of file
diff --git a/test.ts b/test.ts
index 8be1365..8c810d1 100644
--- a/test.ts
+++ b/test.ts
@@ -46,7 +46,7 @@ const config2 = {
   user: "thankgodukachukwu",
   database: "test_orm",
   hostname: "127.0.0.1",
-  password: "",
+  password: "test_orm",
   port: 5432,
 };

Thanks, two more things:

Sqlite in ci-yml and docker-compose.yml
In ci.yml, steps. Replace:

steps:
- uses: actions/checkout@v2
- name: Setup Deno
uses: denolib/setup-deno@v2
with:
deno-version: ${{ matrix.deno }}
- name: Check format
run: |
deno fmt --check
- name: Test
run: |
deno test -c tsconfig.json --allow-net

with

steps:
- uses: actions/checkout@v2
- name: Setup Deno
uses: denolib/setup-deno@v2
with:
deno-version: ${{ matrix.deno }}
- name: Check format
run: |
deno fmt --check
- name: Test
run: |
deno test --allow-net --allow-read --allow-write -c tsconfig.json

manyuanrong · 2020-08-05T01:57:14Z

src/drivers/base.ts

+export interface Base {
+  type: string; // MySQl|Postgres|Sqlite
+}


I prefer the base file to define a unified abstraction of different database clients, similar to:

export enum ClientType { MYSQL = "MYSQL", POSTGRESS = "POSTGRESS", SQLITE = "SQLITE", } export interface DsoConnection { query<T = any>(sql: string, params?: any[]): Promise<T>; execute<T = any>(sql: string, params?: any[]): Promise<T>; } /** Transaction processor */ export interface TransactionProcessor<T> { (connection: DsoConnection): Promise<T>; } export interface PoolInfo { size: number; maxSize: number; available: number; } /** * DSO client */ export abstract class DsoClient { /** get pool info */ abstract get pool(): PoolInfo; /** * connect to database * @param config config for client * @returns Clinet instance */ abstract connect<T>(config: T): Promise<DsoClient>; /** * excute query sql * @param sql query sql string * @param params query params */ abstract async query<T = any>(sql: string, params?: any[]): Promise<T>; /** * excute sql * @param sql sql string * @param params query params */ abstract async execute<T = any>(sql: string, params?: any[]): Promise<T>; /** * Execute a transaction process, and the transaction successfully * returns the return value of the transaction process * @param processor transation processor */ abstract async transaction<T = any>( processor: TransactionProcessor<T> ): Promise<T>; /** * close connection */ abstract async close(): Promise<void>; } // import { Client } from "../../deps.ts"; // export class MysqlClient extends DsoClient { // #client: Client = new Client(); // async close(): Promise<void> { // this.#client.close(); // } // async connect(config: MysqlConfig): Promise<DsoClient> { // await this.#client.connect(config); // return this; // } // ... // }

This can avoid using too much template code when dso implements core functions, which is not conducive to maintenance and understanding

manyuanrong · 2020-08-05T01:59:55Z

src/dso.ts

+  get configClientReturn(): _ClientType {
+    return _configClientReturn;
+  },
+
  /**
   * all models


Once we establish the correct client abstraction, the client used or exported by dso at this time will be DsoClient

manyuanrong

This is a lot of work. Thank you for your effort. I suggest to separate some of the changes and merge them first. For example, the abstraction of DsoClient and the implementation of MySQL.

manyuanrong · 2020-08-05T02:02:06Z

src/dso.ts

+  async connect<T extends PostgresConfig | MysqlConfig | SqliteConfig>(
+    config: T,
+  ): Promise<_ClientType | undefined> {
+    if (config["type"].toUpperCase() === "POSTGRES") {
+      _clientPostgres = new PostgresClient(config["clientConfig"]);
+      await _clientPostgres.connect();
+
+      return _configClientReturn = {
+        postgres: _clientPostgres,
+      };
+    } else if (config["type"].toUpperCase() === "MYSQL") {
+      if (config["client"] && config["client"] instanceof Client) {
+        _client = config["client"];
+      } else {
+        _client = new Client();
+        await _client.connect(config["clientConfig"]);
+      }
+      return _configClientReturn = {
+        mysql: _client,
+      };
+    } else if (config["type"].toUpperCase() === "SQLITE") {
+      const configgy: any = config["clientConfig"];
+
+      _clientSqlite = new SqliteClient(configgy["database"]);
+
+      return _configClientReturn = {
+        sqlite: _clientSqlite,
+      };


Since different databases will inherit and implement a unified DsoClient abstract class, I think such a large amount of template code will be avoided

I will update with the changes requested.

tksilicon added 5 commits August 4, 2020 14:29

feat:databaseDriverAdaptations - addedd Postgres|Sqlite

3af23ab

feat:databaseDriverAdaptations - addedd Postgres|Sqlite

184a019

feat:databaseDriverAdaptations - addedd Postgres|Sqlite

638ce2c

feat:databaseDriverAdaptations - addedd Postgres|Sqlite

b181a85

feat:databaseDriverAdaptations - Postgres|Sqlite

d5b500a

tksilicon added 9 commits August 4, 2020 18:32

feat:databaseDriverAdaptations - Postgres|Sqlite

69a0bd9

feat:databaseDriverAdaptations - Postgres|Sqlite

e004f05

feat:databaseDriverAdaptations - Postgres|Sqlite

37aa379

feat:databaseDriverAdaptations - Postgres|Sqlite

a819428

feat:databaseDriverAdaptations - Postgres|Sqlite

ecbf4f0

feat:databaseDriverAdaptations - Postgres|Sqlite

fcfca4f

feat:databaseDriverAdaptations - Postgres|Sqlite

c022ef4

feat:databaseDriverAdaptations - Postgres|Sqlite

d566ab5

feat:databaseDriverAdaptations - Postgres|Sqlite

882a794

tksilicon requested a review from manyuanrong August 4, 2020 18:39

tksilicon self-assigned this Aug 4, 2020

tksilicon added the enhancement New feature or request label Aug 4, 2020

tksilicon added 2 commits August 4, 2020 19:46

feat:databaseDriverAdaptations - Postgres|Sqlite

4c5f1c8

feat:databaseDriverAdaptations - Postgres|Sqlite

135b742

manyuanrong reviewed Aug 5, 2020

View reviewed changes

manyuanrong requested changes Aug 5, 2020

View reviewed changes

tksilicon mentioned this pull request Nov 4, 2020

Database driver adaptations mysql #38

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Database driver adaptations #32

Database driver adaptations #32

tksilicon commented Aug 4, 2020

afinch7 commented Aug 4, 2020

tksilicon commented Aug 4, 2020

manyuanrong Aug 5, 2020

manyuanrong Aug 5, 2020

manyuanrong left a comment

manyuanrong Aug 5, 2020

tksilicon Aug 10, 2020

Database driver adaptations #32

Are you sure you want to change the base?

Database driver adaptations #32

Conversation

tksilicon commented Aug 4, 2020

afinch7 commented Aug 4, 2020

tksilicon commented Aug 4, 2020

manyuanrong Aug 5, 2020

Choose a reason for hiding this comment

manyuanrong Aug 5, 2020

Choose a reason for hiding this comment

manyuanrong left a comment

Choose a reason for hiding this comment

manyuanrong Aug 5, 2020

Choose a reason for hiding this comment

tksilicon Aug 10, 2020

Choose a reason for hiding this comment