fix: make functional tests pass with deno

.github/workflows/ci.yml

@@ -9,4 +9,4 @@ jobs:
     - name: Run tests
       run: |
         cp ./ormconfig.gh-actions.json ./ormconfig.json
-        deno run --allow-read --allow-write --config ./tsconfig.json ./test.ts
+        deno run --allow-read --allow-write --allow-env --config ./tsconfig.json ./test.ts

ormconfig.gh-actions.json

@@ -3,7 +3,7 @@
     "skip": false,
     "name": "sqlite",
     "type": "sqlite",
-    "database": "temp/sqlitedb.db",
-    "logging": true
+    "database": ":memory:",
+    "logging": false
   }
 ]

src/connection/ConnectionOptionsReader.ts

@@ -108,10 +108,12 @@ export class ConnectionOptionsReader {
             connectionOptions = new ConnectionOptionsEnvReader().read();
 
         } else if (foundFileFormat === "js") {
-            connectionOptions = await PlatformTools.load(configFile);
+            const mod = await import(configFile);
+            connectionOptions = await mod.default;
 
         } else if (foundFileFormat === "ts") {
-            connectionOptions = await PlatformTools.load(configFile);
+            const mod = await import(configFile);
+            connectionOptions = await mod.default;
 
         } else if (foundFileFormat === "json") {
             connectionOptions = PlatformTools.load(configFile);
@@ -197,10 +199,12 @@ export class ConnectionOptionsReader {
      * Gets directory where configuration file should be located.
      */
     protected get baseDirectory(): string {
-        if (this.options && this.options.root)
-            return this.options.root;
-
-        return PlatformTools.load("app-root-path").path;
+        const baseDirectory = this.options && this.options.root
+            ? this.options.root
+            : PlatformTools.load("app-root-path").path;
+        return baseDirectory.endsWith('/')
+            ? baseDirectory.slice(0, -1)
+            : baseDirectory;
     }
 
     /**

src/driver/sqlite/SqliteQueryRunner.ts

@@ -70,7 +70,6 @@ export class SqliteQueryRunner extends AbstractSqliteQueryRunner {
             await this.saveDatabaseToFileIfNeeded(databaseConnection, query);
             return result;
         } catch (err) {
-            console.error(err)
             connection.logger.logQueryError(err, query, parameters, this);
             throw new QueryFailedError(query, parameters, err);
         }

src/driver/types/ColumnTypes.ts

@@ -206,4 +206,5 @@ export type ColumnType = WithPrecisionColumnType
     |BooleanConstructor
     |DateConstructor
     |NumberConstructor
-    |StringConstructor;
+    |StringConstructor
+    |Uint8ArrayConstructor; // TODO(uki001) This type is not fully tested yet.

src/platform/PlatformTools.ts

@@ -106,6 +106,14 @@ export class PlatformTools {
         return Deno.env()[name];
     }
 
+    static encodeToBase64(string: string): string {
+        return window.btoa(string);
+    }
+
+    static decodeFromBase64(base64: string): string {
+        return window.atob(base64);
+    }
+
     // TODO(uki00a) implement this method.
     /**
      * Highlights sql string to be print in the console.

test/deps/mocha.ts

@@ -3,11 +3,21 @@ import "https://unpkg.com/[email protected]/mocha.js";
 mocha.setup({ ui: 'bdd', reporter: 'spec' });
 
 export function runTests(): void {
-    mocha.run();
+    mocha.run(onCompleted);
 }
 
 export function runIfMain(meta: ImportMeta): void {
     if (meta.main) {
-        mocha.run();
+        mocha.run(onCompleted);
+    }
+}
+
+mocha.timeout(60000);
+
+function onCompleted(failures: number): void {
+    if (failures > 0) {
+        Deno.exit(1);
+    } else {
+        Deno.exit(0);
     }
 }

test/functional/cascades/cascade-insert-from-both-sides/cascade-insert-from-both-sides.ts

@@ -1,14 +1,17 @@
-import "reflect-metadata";
-import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils";
-import {Connection} from "../../../../src/connection/Connection";
-import {Post} from "./entity/Post";
-import {PostDetails} from "./entity/PostDetails";
+import {runIfMain} from "../../../deps/mocha.ts";
+import {expect} from "../../../deps/chai.ts";
+import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils.ts";
+import {Connection} from "../../../../src/connection/Connection.ts";
+import {Post} from "./entity/Post.ts";
+import {PostDetails} from "./entity/PostDetails.ts";
+import {join} from "../../../../vendor/https/deno.land/std/path/mod.ts"
 
 describe("cascades > should insert by cascades from both sides (#57)", () => {
 
     let connections: Connection[];
+    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [__dirname + "/entity/*{.js,.ts}"],
+        entities: [join(__dirname, "/entity/*.ts")]
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));
@@ -35,7 +38,7 @@ describe("cascades > should insert by cascades from both sides (#57)", () => {
             }
         });
 
-        posts.should.be.eql([{
+        expect(posts).to.eql([{
             key: post1.key,
             title: post1.title,
             details: {
@@ -46,3 +49,5 @@ describe("cascades > should insert by cascades from both sides (#57)", () => {
     })));
 
 });
+
+runIfMain(import.meta);

test/functional/cascades/cascade-insert-from-both-sides/entity/Post.ts

@@ -1,9 +1,9 @@
-import {Entity} from "../../../../../src/decorator/entity/Entity";
-import {Column} from "../../../../../src/decorator/columns/Column";
-import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
-import {PostDetails} from "./PostDetails";
-import {OneToOne} from "../../../../../src/decorator/relations/OneToOne";
-import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn";
+import {Entity} from "../../../../../src/decorator/entity/Entity.ts";
+import {Column} from "../../../../../src/decorator/columns/Column.ts";
+import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn.ts";
+import {PostDetails} from "./PostDetails.ts";
+import {OneToOne} from "../../../../../src/decorator/relations/OneToOne.ts";
+import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn.ts";
 
 @Entity()
 export class Post {
@@ -17,7 +17,7 @@ export class Post {
     @JoinColumn()
     details: PostDetails;
 
-    @Column()
+    @Column({ type: String })
     title: string;
 
-}
+}

test/functional/cascades/cascade-insert-from-both-sides/entity/PostDetails.ts

@@ -1,17 +1,17 @@
-import {Entity} from "../../../../../src/decorator/entity/Entity";
-import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn";
-import {Post} from "./Post";
-import {OneToOne} from "../../../../../src/decorator/relations/OneToOne";
+import {Entity} from "../../../../../src/decorator/entity/Entity.ts";
+import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn.ts";
+import {Post} from "./Post.ts";
+import {OneToOne} from "../../../../../src/decorator/relations/OneToOne.ts";
 
 @Entity()
 export class PostDetails {
 
-    @PrimaryColumn()
+    @PrimaryColumn({ type: String })
     keyword: string;
 
     @OneToOne(type => Post, post => post.details, {
         cascade: ["insert"]
     })
     post: Post;
 
-}
+}

test/functional/columns/embedded-columns/columns-embedded-columns.ts

@@ -1,17 +1,19 @@
-import "reflect-metadata";
-import {expect} from "chai";
-import {Connection} from "../../../../src/connection/Connection";
-import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils";
-import {SimplePost} from "./entity/SimplePost";
-import {SimpleCounters} from "./entity/SimpleCounters";
-import {Information} from "./entity/Information";
-import {Post} from "./entity/Post";
+import {expect} from "../../../deps/chai.ts";
+import {runIfMain} from "../../../deps/mocha.ts";
+import {Connection} from "../../../../src/connection/Connection.ts";
+import {getDirnameOfCurrentModule, closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils.ts";
+import {join as joinPaths} from "../../../../vendor/https/deno.land/std/path/mod.ts";
+import {SimplePost} from "./entity/SimplePost.ts";
+import {SimpleCounters} from "./entity/SimpleCounters.ts";
+import {Information} from "./entity/Information.ts";
+import {Post} from "./entity/Post.ts";
 
 describe("columns > embedded columns", () => {
 
     let connections: Connection[];
+    const __dirname = getDirnameOfCurrentModule(import.meta);
     before(async () => connections = await createTestingConnections({
-        entities: [__dirname + "/entity/*{.js,.ts}"],
+        entities: [joinPaths(__dirname, "/entity/*.ts")],
     }));
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));
@@ -132,3 +134,5 @@ describe("columns > embedded columns", () => {
         ]);
     })));
 });
+
+runIfMain(import.meta);

test/functional/columns/embedded-columns/entity/Counters.ts

@@ -1,14 +1,14 @@
-import { Column } from "../../../../../src/decorator/columns/Column";
-import { Information } from "./Information";
+import { Column } from "../../../../../src/decorator/columns/Column.ts";
+import { Information } from "./Information.ts";
 
 export class Counters {
-    @Column()
+    @Column({ type: Number })
     likes: number;
 
-    @Column()
+    @Column({ type: Number })
     comments: number;
 
-    @Column()
+    @Column({ type: Number })
     favorites: number;
 
     @Column(type => Information, { prefix: "info" })

test/functional/columns/embedded-columns/entity/Information.ts

@@ -1,7 +1,7 @@
-import { Column } from "../../../../../src/decorator/columns/Column";
+import { Column } from "../../../../../src/decorator/columns/Column.ts";
 
 export class Information {
 
-    @Column({ name: "descr" })
+    @Column({ name: "descr", type: String })
     description: string;
 }

test/functional/columns/embedded-columns/entity/Post.ts

@@ -1,18 +1,18 @@
-import { Entity } from "../../../../../src/decorator/entity/Entity";
-import { Column } from "../../../../../src/decorator/columns/Column";
-import { PrimaryGeneratedColumn } from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
-import { Counters } from "./Counters";
+import { Entity } from "../../../../../src/decorator/entity/Entity.ts";
+import { Column } from "../../../../../src/decorator/columns/Column.ts";
+import { PrimaryGeneratedColumn } from "../../../../../src/decorator/columns/PrimaryGeneratedColumn.ts";
+import { Counters } from "./Counters.ts";
 
 @Entity()
 export class Post {
 
     @PrimaryGeneratedColumn()
     id: number;
 
-    @Column()
+    @Column({ type: String })
     title: string;
 
-    @Column()
+    @Column({ type: String })
     text: string;
 
     @Column(type => Counters)

test/functional/columns/embedded-columns/entity/SimpleCounters.ts

@@ -1,15 +1,15 @@
-import { Column } from "../../../../../src/decorator/columns/Column";
-import { Information } from "./Information";
+import { Column } from "../../../../../src/decorator/columns/Column.ts";
+import { Information } from "./Information.ts";
 
 export class SimpleCounters {
 
-    @Column()
+    @Column({ type: Number })
     likes: number;
 
-    @Column()
+    @Column({ type: Number })
     comments: number;
 
-    @Column()
+    @Column({ type: Number })
     favorites: number;
 
     @Column(type => Information, { prefix: "info" })

test/functional/columns/embedded-columns/entity/SimplePost.ts

@@ -1,18 +1,18 @@
-import { Entity } from "../../../../../src/decorator/entity/Entity";
-import { Column } from "../../../../../src/decorator/columns/Column";
-import { PrimaryGeneratedColumn } from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
-import { SimpleCounters } from "./SimpleCounters";
+import { Entity } from "../../../../../src/decorator/entity/Entity.ts";
+import { Column } from "../../../../../src/decorator/columns/Column.ts";
+import { PrimaryGeneratedColumn } from "../../../../../src/decorator/columns/PrimaryGeneratedColumn.ts";
+import { SimpleCounters } from "./SimpleCounters.ts";
 
 @Entity()
 export class SimplePost {
 
     @PrimaryGeneratedColumn()
     id: number;
 
-    @Column()
+    @Column({ type: String })
     title: string;
 
-    @Column()
+    @Column({ type: String })
     text: string;
 
     @Column(type => SimpleCounters)

test/functional/columns/getters-setters/columns-getters-setters.ts

@@ -1,8 +1,8 @@
-import "reflect-metadata";
-import {expect} from "chai";
-import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils";
-import {Connection} from "../../../../src/connection/Connection";
-import {Post} from "./entity/Post";
+import {runIfMain} from "../../../deps/mocha.ts";
+import {expect} from "../../../deps/chai.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils.ts";
+import {Connection} from "../../../../src/connection/Connection.ts";
+import {Post} from "./entity/Post.ts";
 
 describe("columns > getters and setters", () => {
 
@@ -34,3 +34,5 @@ describe("columns > getters and setters", () => {
 
 
 });
+
+runIfMain(import.meta);

test/functional/columns/getters-setters/entity/Post.ts

@@ -1,6 +1,6 @@
-import {Entity} from "../../../../../src/decorator/entity/Entity";
-import {Column} from "../../../../../src/decorator/columns/Column";
-import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
+import {Entity} from "../../../../../src/decorator/entity/Entity.ts";
+import {Column} from "../../../../../src/decorator/columns/Column.ts";
+import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn.ts";
 
 @Entity()
 export class Post {
@@ -19,9 +19,9 @@ export class Post {
         }
     }
 
-    @Column()
+    @Column({ type: String })
     get title(): string {
         return this._title;
     }
 
-}
+}

test/functional/columns/no-select/columns-no-select.ts

@@ -1,8 +1,8 @@
-import "reflect-metadata";
-import {expect} from "chai";
-import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils";
-import {Connection} from "../../../../src/connection/Connection";
-import {Post} from "./entity/Post";
+import {runIfMain} from "../../../deps/mocha.ts";
+import {expect} from "../../../deps/chai.ts";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils.ts";
+import {Connection} from "../../../../src/connection/Connection.ts";
+import {Post} from "./entity/Post.ts";
 
 describe("columns > no-selection functionality", () => {
 
@@ -72,3 +72,5 @@ describe("columns > no-selection functionality", () => {
     })));
 
 });
+
+runIfMain(import.meta);