fix(bindings/nodejs): add more tests for native types (#528)

databendlabs · Dec 6, 2024 · e3b4f69 · e3b4f69
1 parent 4fa3689
commit e3b4f69
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 19 deletions.
diff --git a/.github/workflows/bindings.nodejs.yml b/.github/workflows/bindings.nodejs.yml
@@ -10,7 +10,9 @@ on:
     branches:
       - main
     paths:
+      - "core/**"
       - "sql/**"
+      - "driver/**"
       - "bindings/nodejs/**"
       - ".github/workflows/bindings.nodejs.yml"
 
@@ -30,7 +32,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
       - name: Corepack
         working-directory: bindings/nodejs
         run: corepack enable
@@ -72,7 +74,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
       - name: Install ziglang
         if: contains(matrix.target, '-unknown-linux-')
         uses: goto-bus-stop/setup-zig@v2
@@ -121,7 +123,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
       - name: Corepack
         working-directory: bindings/nodejs
         run: corepack enable

diff --git a/.github/workflows/bindings.python.yml b/.github/workflows/bindings.python.yml
@@ -10,7 +10,9 @@ on:
     branches:
       - main
     paths:
+      - "core/**"
       - "sql/**"
+      - "driver/**"
       - "bindings/python/**"
       - ".github/workflows/bindings.python.yml"
 
@@ -147,8 +149,7 @@ jobs:
           pattern: bindings-python-*
           merge-multiple: true
       - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@unstable/v1
         with:
           skip-existing: true
-          verify-metadata: false
           packages-dir: bindings/python/artifacts
diff --git a/bindings/nodejs/README.md b/bindings/nodejs/README.md
@@ -57,7 +57,7 @@ while (row) {
 | `TINYINT`   | `Number`  |
 | `SMALLINT`  | `Number`  |
 | `INT`       | `Number`  |
-| `BIGINT`    | `Number`  |
+| `BIGINT`    | `BigInt`  |
 | `FLOAT`     | `Number`  |
 | `DOUBLE`    | `Number`  |
 | `DECIMAL`   | `String`  |

diff --git a/bindings/nodejs/package.json b/bindings/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "databend-driver",
-  "author": "Databend Authors <opensource@databendlabs.com>",
+  "author": "Databend Authors <opensource@databend.com>",
   "version": "0.24.2",
   "license": "Apache-2.0",
   "main": "index.js",

diff --git a/bindings/nodejs/src/lib.rs b/bindings/nodejs/src/lib.rs
@@ -18,7 +18,6 @@ extern crate napi_derive;
 use std::collections::HashMap;
 
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
-use napi::tokio::time::Interval;
 use napi::{bindgen_prelude::*, Env};
 use once_cell::sync::Lazy;
 use tokio_stream::StreamExt;

diff --git a/bindings/nodejs/tests/binding.js b/bindings/nodejs/tests/binding.js
@@ -38,10 +38,52 @@ Then("Select string {string} should be equal to {string}", async function (input
 });
 
 Then("Select types should be expected native types", async function () {
-  // Binary
+  // BOOLEAN
   {
-    const row = await this.conn.queryRow("select to_binary('xyz')");
-    assert.deepEqual(row.values(), [Buffer.from("xyz")]);
+    const row = await this.conn.queryRow("SELECT true, false");
+    assert.deepEqual(row.values(), [true, false]);
+  }
+
+  // TINYINT
+  {
+    const row = await this.conn.queryRow("SELECT 1::TINYINT, 2::TINYINT");
+    assert.deepEqual(row.values(), [1, 2]);
+  }
+
+  // SMALLINT
+  {
+    const row = await this.conn.queryRow("SELECT 1::SMALLINT, 2::SMALLINT");
+    assert.deepEqual(row.values(), [1, 2]);
+  }
+
+  // INT
+  {
+    const row = await this.conn.queryRow("SELECT 1::INT, 2::INT");
+    assert.deepEqual(row.values(), [1, 2]);
+  }
+
+  // BIGINT
+  {
+    const row = await this.conn.queryRow("SELECT 14294967295::BIGINT, 1::BIGINT");
+    assert.deepEqual(row.values(), [14294967295n, 1n]);
+  }
+
+  // FLOAT
+  {
+    const row = await this.conn.queryRow("SELECT 1.11::FLOAT, 2.22::FLOAT");
+    assert.deepEqual(
+      row.values().map((v) => v.toFixed(2)),
+      [1.11, 2.22],
+    );
+  }
+
+  // DOUBLE
+  {
+    const row = await this.conn.queryRow("SELECT 1.11::DOUBLE, 2.22::DOUBLE");
+    assert.deepEqual(
+      row.values().map((v) => v.toFixed(2)),
+      [1.11, 2.22],
+    );
   }
 
   // Decimal
@@ -50,24 +92,50 @@ Then("Select types should be expected native types", async function () {
     assert.deepEqual(row.values(), ["15.7563", "5.0"]);
   }
 
-  // Array
+  // DATE
   {
-    const row = await this.conn.queryRow(`SELECT [10::Decimal(15,2), 1.1+2.3]`);
-    assert.deepEqual(row.values(), [["10.00", "3.40"]]);
+    const row = await this.conn.queryRow("SELECT to_date('2020-01-01'), to_date('2020-01-02')");
+    assert.deepEqual(row.values(), [new Date("2020-01-01"), new Date("2020-01-02")]);
   }
 
-  // Map
+  // TIMESTAMP
   {
-    const row = await this.conn.queryRow(`SELECT {'xx':to_date('2020-01-01')}`);
-    assert.deepEqual(row.values(), [{ xx: new Date("2020-01-01") }]);
+    const row = await this.conn.queryRow(
+      "SELECT to_datetime('2020-01-01 12:34:56.789'), to_datetime('2020-01-02 12:34:56.789')",
+    );
+    assert.deepEqual(row.values(), [new Date("2020-01-01T12:34:56.789Z"), new Date("2020-01-02T12:34:56.789Z")]);
+  }
+
+  // VARCHAR
+  {
+    const row = await this.conn.queryRow("SELECT 'xyz', 'abc'");
+    assert.deepEqual(row.values(), ["xyz", "abc"]);
   }
 
-  // Tuple
+  // BINARY
+  {
+    const row = await this.conn.queryRow("select to_binary('xyz')");
+    assert.deepEqual(row.values(), [Buffer.from("xyz")]);
+  }
+
+  // ARRAY
+  {
+    const row = await this.conn.queryRow(`SELECT [10::Decimal(15,2), 1.1+2.3]`);
+    assert.deepEqual(row.values(), [["10.00", "3.40"]]);
+  }
+
+  // TUPLE
   {
     const row = await this.conn.queryRow(`SELECT (10, '20', to_datetime('2024-04-16 12:34:56.789'))`);
     assert.deepEqual(row.values(), [[10, "20", new Date("2024-04-16T12:34:56.789Z")]]);
   }
 
+  // MAP
+  {
+    const row = await this.conn.queryRow(`SELECT {'xx':to_date('2020-01-01')}`);
+    assert.deepEqual(row.values(), [{ xx: new Date("2020-01-01") }]);
+  }
+
   // Variant as String
   {
     const value =

diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml
@@ -19,6 +19,6 @@ tokio-stream = { workspace = true }
 
 ctor = "0.2"
 once_cell = "1.20"
-pyo3 = { version = "0.23", features = ["abi3-py37", "chrono"] }
+pyo3 = { version = "0.23.3", features = ["abi3-py37", "chrono"] }
 pyo3-async-runtimes = { version = "0.23", features = ["tokio-runtime"] }
 tokio = "1.42"