duckdb 0.6.2-dev529.0 → 0.6.2-dev551.0

package/test/{udf.test.js → udf.test.ts}

@@ -1,16 +1,17 @@
-var duckdb = require('..');
-var assert = require('assert');
+import * as duckdb from "..";
+import {TableData} from "..";
+import * as assert from 'assert';
 
 describe('UDFs', function() {
     describe('arity', function() {
-        var db;
+        let db: duckdb.Database;
         before(function(done) {
             db = new duckdb.Database(':memory:', done);
         });
 
         it('0ary int', function(done) {
             db.register_udf("udf", "integer", () => 42);
-            db.all("select udf() v", function(err, rows) {
+            db.all("select udf() v", function(err: Error | null, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 42);
             });
@@ -19,7 +20,7 @@ describe('UDFs', function() {
 
         it('0ary double', function(done) {
             db.register_udf("udf", "double", () => 4.2);
-            db.all("select udf() v", function(err, rows) {
+            db.all("select udf() v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 4.2);
             });
@@ -28,7 +29,7 @@ describe('UDFs', function() {
 
         it('0ary string', function(done) {
             db.register_udf("udf", "varchar", () => 'hello');
-            db.all("select udf() v", function(err, rows) {
+            db.all("select udf() v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 'hello');
             });
@@ -37,7 +38,7 @@ describe('UDFs', function() {
 
         it('0ary int null', function(done) {
             db.register_udf("udf", "integer", () => undefined);
-            db.all("select udf() v", function(err, rows) {
+            db.all("select udf() v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, undefined);
             });
@@ -47,7 +48,7 @@ describe('UDFs', function() {
 
         it('0ary string null', function(done) {
             db.register_udf("udf", "varchar", () => undefined);
-            db.all("select udf() v", function(err, rows) {
+            db.all("select udf() v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, undefined);
             });
@@ -57,7 +58,7 @@ describe('UDFs', function() {
 
         it('unary int', function(done) {
             db.register_udf("udf", "integer", (x) => x+1);
-            db.all("select udf(42) v", function(err, rows) {
+            db.all("select udf(42) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 43);
             });
@@ -66,7 +67,7 @@ describe('UDFs', function() {
 
         it('unary double', function(done) {
             db.register_udf("udf", "double", (x) => x);
-            db.all("select udf(4.2::double) v", function(err, rows) {
+            db.all("select udf(4.2::double) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 4.2);
             });
@@ -75,7 +76,7 @@ describe('UDFs', function() {
 
         it('unary int null', function(done) {
             db.register_udf("udf", "integer", (x) => undefined);
-            db.all("select udf(42) v", function(err, rows) {
+            db.all("select udf(42) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, undefined);
             });
@@ -85,7 +86,7 @@ describe('UDFs', function() {
 
         it('unary double null', function(done) {
             db.register_udf("udf", "double", (x) => undefined);
-            db.all("select udf(4.2::double) v", function(err, rows) {
+            db.all("select udf(4.2::double) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, undefined);
             });
@@ -95,7 +96,7 @@ describe('UDFs', function() {
 
         it('unary string', function(done) {
             db.register_udf("udf", "varchar", (x) => 'hello ' + x);
-            db.all("select udf('world') v", function(err, rows) {
+            db.all("select udf('world') v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 'hello world');
             });
@@ -104,7 +105,7 @@ describe('UDFs', function() {
 
         it('unary string null', function(done) {
             db.register_udf("udf", "varchar", (x) => undefined);
-            db.all("select udf('world') v", function(err, rows) {
+            db.all("select udf('world') v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, undefined);
             });
@@ -113,7 +114,7 @@ describe('UDFs', function() {
 
         it('binary int', function(done) {
             db.register_udf("udf", "integer", (x, y) => x + y);
-            db.all("select udf(40, 2) v", function(err, rows) {
+            db.all("select udf(40, 2) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 42);
             });
@@ -122,7 +123,7 @@ describe('UDFs', function() {
 
         it('binary string', function(done) {
             db.register_udf("udf", "varchar", (x, y) => x + ' ' + y);
-            db.all("select udf('hello', 'world') v", function(err, rows) {
+            db.all("select udf('hello', 'world') v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 'hello world');
             });
@@ -131,7 +132,7 @@ describe('UDFs', function() {
 
         it('ternary int', function(done) {
             db.register_udf("udf", "integer", (x, y, z) => x + y + z);
-            db.all("select udf(21, 20, 1) v", function(err, rows) {
+            db.all("select udf(21, 20, 1) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 42);
             });
@@ -140,7 +141,7 @@ describe('UDFs', function() {
 
         it('unary larger series', function(done) {
             db.register_udf("udf", "integer", (x) => 1);
-            db.all("select sum(udf(range::double)) v from range(10000)", function(err, rows) {
+            db.all("select sum(udf(range::double)) v from range(10000)", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 10000);
             });
@@ -149,14 +150,14 @@ describe('UDFs', function() {
     });
 
     describe('types', function() {
-        var db;
+        var db: duckdb.Database;
         before(function(done) {
             db = new duckdb.Database(':memory:', done);
         });
 
         it('tinyint', function(done) {
             db.register_udf("udf", "integer", (x) => x+1);
-            db.all("select udf(42::tinyint) v", function(err, rows) {
+            db.all("select udf(42::tinyint) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 43);
             });
@@ -165,7 +166,7 @@ describe('UDFs', function() {
 
         it('smallint', function(done) {
             db.register_udf("udf", "integer", (x) => x+1);
-            db.all("select udf(42::smallint) v", function(err, rows) {
+            db.all("select udf(42::smallint) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 43);
             });
@@ -174,7 +175,7 @@ describe('UDFs', function() {
 
         it('int', function(done) {
             db.register_udf("udf", "integer", (x) => x+1);
-            db.all("select udf(42::integer) v", function(err, rows) {
+            db.all("select udf(42::integer) v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].v, 43);
             });
@@ -183,7 +184,7 @@ describe('UDFs', function() {
 
         it('timestamp', function(done) {
             db.register_udf("udf", "timestamp", (x) => x);
-            db.all("select udf(timestamp '1992-09-20 11:30:00') v", function(err, rows) {
+            db.all("select udf(timestamp '1992-09-20 11:30:00') v", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
             });
             db.unregister_udf("udf", done);
@@ -193,7 +194,7 @@ describe('UDFs', function() {
             db.register_udf("udf", "integer", a => {
                 return (a.x == null ? -100 : a.x);
             });
-            db.all("SELECT min(udf({'x': (case when v % 2 = 0 then v else null end)::INTEGER, 'y': 42}))::INTEGER as foo FROM generate_series(1, 10000) as t(v)", function(err, rows) {
+            db.all("SELECT min(udf({'x': (case when v % 2 = 0 then v else null end)::INTEGER, 'y': 42}))::INTEGER as foo FROM generate_series(1, 10000) as t(v)", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].foo, -100);
             });
@@ -204,7 +205,7 @@ describe('UDFs', function() {
             db.register_udf("udf", "integer", a => {
                 return (a.x == null ? -100 : a.x.y);
             });
-            db.all("SELECT min(udf({'x': (case when v % 2 = 0 then {'y': v::INTEGER } else null end), 'z': 42}))::INTEGER as foo FROM generate_series(1, 10000) as t(v)", function(err, rows) {
+            db.all("SELECT min(udf({'x': (case when v % 2 = 0 then {'y': v::INTEGER } else null end), 'z': 42}))::INTEGER as foo FROM generate_series(1, 10000) as t(v)", function(err: null | Error, rows: TableData) {
                 if (err) throw err;
                 assert.equal(rows[0].foo, -100);
             });

package/test/{unicode.test.js → unicode.test.ts}

@@ -1,13 +1,14 @@
-var sqlite3 = require('..');
-var assert = require('assert');
+import * as sqlite3 from '..';
+import {TableData} from "..";
+import * as assert from 'assert';
 
 describe('unicode', function() {
-    var first_values = [],
-        trailing_values = [],
-        subranges = new Array(2),
-        len = subranges.length,
-        db,
-        i;
+    let i;
+    let first_values: number[] = [],
+      trailing_values: number[] = [],
+      subranges = new Array(2),
+      len = subranges.length,
+      db: sqlite3.Database;
 
     before(function(done) { db = new sqlite3.Database(':memory:', done); });
 
@@ -35,12 +36,12 @@ describe('unicode', function() {
         subranges[1].push(i);
     }
 
-    function random_choice(arr) {
+    function random_choice(arr: number[]) {
         return arr[Math.random() * arr.length | 0];
     }
 
     function random_utf8() {
-        var first = random_choice(first_values);
+        const first = random_choice(first_values);
 
         if (first < 0x80) {
             return String.fromCharCode(first);
@@ -56,8 +57,8 @@ describe('unicode', function() {
     }
 
     function randomString() {
-        var str = '',
-        i;
+        let str = '',
+          i;
 
         for (i = Math.random() * 300; i > 0; i--) {
             str += random_utf8();
@@ -68,23 +69,23 @@ describe('unicode', function() {
 
 
         // Generate random data.
-    var data = [];
-    var length = Math.floor(Math.random() * 1000) + 200;
-    for (var i = 0; i < length; i++) {
+    const data: string[] = [];
+    const length = Math.floor(Math.random() * 1000) + 200;
+    for (i = 0; i < length; i++) {
         data.push(randomString());
     }
 
-    var inserted = 0;
-    var retrieved = 0;
+    let inserted = 0;
+    let retrieved = 0;
 
     it('should create the table', function(done) {
         db.run("CREATE TABLE foo (id int, txt text)", done);
     });
 
     it('should insert all values', function(done) {
-        var stmt = db.prepare("INSERT INTO foo VALUES(?, ?)");
-        for (var i = 0; i < data.length; i++) {
-            stmt.run(i, data[i], function(err) {
+        const stmt = db.prepare("INSERT INTO foo VALUES(?, ?)");
+        for (let i = 0; i < data.length; i++) {
+            stmt.run(i, data[i], function(err: null | Error) {
                 if (err) throw err;
                 inserted++;
             });
@@ -93,10 +94,10 @@ describe('unicode', function() {
     });
 
     it('should retrieve all values', function(done) {
-        db.all("SELECT txt FROM foo ORDER BY id", function(err, rows) {
+        db.all("SELECT txt FROM foo ORDER BY id", function(err: null | Error, rows: TableData) {
             if (err) throw err;
 
-            for (var i = 0; i < rows.length; i++) {
+            for (let i = 0; i < rows.length; i++) {
                 assert.equal(rows[i].txt, data[i]);
                 retrieved++;
             }

package/test/support/helper.js

@@ -1,37 +0,0 @@
-var assert = require('assert');
-var fs = require('fs');
-var pathExists = require('fs').existsSync || require('path').existsSync;
-
-exports.deleteFile = function(name) {
-    try {
-        fs.unlinkSync(name);
-    } catch(err) {
-        if (err.errno !== process.ENOENT && err.code !== 'ENOENT' && err.syscall !== 'unlink') {
-            throw err;
-        }
-    }
-};
-
-exports.ensureExists = function(name,cb) {
-    if (!pathExists(name)) {
-        fs.mkdirSync(name);
-    };
-}
-
-assert.fileDoesNotExist = function(name) {
-    try {
-        fs.statSync(name);
-    } catch(err) {
-        if (err.errno !== process.ENOENT && err.code !== 'ENOENT' && err.syscall !== 'unlink') {
-            throw err;
-        }
-    }
-};
-
-assert.fileExists = function(name) {
-    try {
-        fs.statSync(name);
-    } catch(err) {
-        throw err;
-    }
-};