From 1e364febc00998cb31f9398011dfb06ac738beff Mon Sep 17 00:00:00 2001 From: uki00a Date: Tue, 11 Feb 2020 18:48:23 +0900 Subject: [PATCH] fix: test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality --- test.ts | 1 + .../entity/Answer.ts | 12 +++--- .../entity/Category.ts | 14 +++---- .../entity/Person.ts | 10 ++--- .../entity/Post.ts | 10 ++--- .../entity/Question.ts | 10 ++--- .../entity/User.ts | 10 ++--- ...schema-and-database-basic-functionality.ts | 37 ++++++++++--------- 8 files changed, 54 insertions(+), 50 deletions(-) diff --git a/test.ts b/test.ts index 29f2e8cc8..97c9d4634 100644 --- a/test.ts +++ b/test.ts @@ -97,5 +97,6 @@ import "./test/functional/mongodb/basic/repository-actions/mongodb-repository-ac import "./test/functional/mongodb/basic/timestampable-columns/timestampable-columns.ts"; import "./test/functional/multi-schema-and-database/custom-junction-database/custom-junction-database.ts"; import "./test/functional/multi-schema-and-database/custom-junction-schema/custom-junction-schema.ts"; +import "./test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/multi-schema-and-database-basic-functionality.ts"; runTests(); diff --git a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Answer.ts b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Answer.ts index ee73042b8..3ebf086a5 100644 --- a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Answer.ts +++ b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Answer.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({ database: "secondDB", schema: "answers" }) export class Answer { @@ -8,10 +8,10 @@ export class Answer { @PrimaryGeneratedColumn() id: number; - @Column() + @Column({ type: String }) text: string; - @Column() + @Column({ type: Number }) questionId: number; -} \ No newline at end of file +} diff --git a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Category.ts b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Category.ts index 06f9e6958..06be499fc 100644 --- a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Category.ts +++ b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Category.ts @@ -1,8 +1,8 @@ -import {Entity} from "../../../../../src/decorator/entity/Entity"; -import {Column} from "../../../../../src/decorator/columns/Column"; -import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; -import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; -import {Post} from "./Post"; +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 {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne.ts"; +import {Post} from "./Post.ts"; @Entity({schema: "guest"}) export class Category { @@ -10,10 +10,10 @@ export class Category { @PrimaryGeneratedColumn() id: number; - @Column() + @Column({ type: String }) name: string; @ManyToOne(type => Post) post: Post; -} \ No newline at end of file +} diff --git a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Person.ts b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Person.ts index 1a6d24f0b..18a531371 100644 --- a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Person.ts +++ b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Person.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({ database: "secondDB" }) export class Person { @@ -8,7 +8,7 @@ export class Person { @PrimaryGeneratedColumn() id: number; - @Column() + @Column({ type: String }) name: string; -} \ No newline at end of file +} diff --git a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Post.ts b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Post.ts index 3cb8638bf..0c6953b95 100644 --- a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Post.ts +++ b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/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 { @@ -8,7 +8,7 @@ export class Post { @PrimaryGeneratedColumn() id: number; - @Column() + @Column({ type: String }) name: string; -} \ No newline at end of file +} diff --git a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Question.ts b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Question.ts index ac583ff9d..2518ac3bc 100644 --- a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Question.ts +++ b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/Question.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({ database: "testDB", schema: "questions" }) export class Question { @@ -8,7 +8,7 @@ export class Question { @PrimaryGeneratedColumn() id: number; - @Column() + @Column({ type: String }) name: string; -} \ No newline at end of file +} diff --git a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/User.ts b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/User.ts index cf0f09597..83c40b1c9 100644 --- a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/User.ts +++ b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/entity/User.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({ schema: "userSchema" }) export class User { @@ -8,7 +8,7 @@ export class User { @PrimaryGeneratedColumn() id: number; - @Column() + @Column({ type: String }) name: string; -} \ No newline at end of file +} diff --git a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/multi-schema-and-database-basic-functionality.ts b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/multi-schema-and-database-basic-functionality.ts index c6fbdd915..599f34d94 100644 --- a/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/multi-schema-and-database-basic-functionality.ts +++ b/test/functional/multi-schema-and-database/multi-schema-and-database-basic-functionality/multi-schema-and-database-basic-functionality.ts @@ -1,16 +1,17 @@ -import "reflect-metadata"; -import {Connection} from "../../../../src/connection/Connection"; -import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils"; -import {expect} from "chai"; -import {Post} from "./entity/Post"; -import {PostgresDriver} from "../../../../src/driver/postgres/PostgresDriver"; -import {SqlServerDriver} from "../../../../src/driver/sqlserver/SqlServerDriver"; -import {User} from "./entity/User"; -import {Category} from "./entity/Category"; -import {Person} from "./entity/Person"; -import {Question} from "./entity/Question"; -import {Answer} from "./entity/Answer"; -import {MysqlDriver} from "../../../../src/driver/mysql/MysqlDriver"; +import {Connection} from "../../../../src/connection/Connection.ts"; +import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils.ts"; +import {expect} from "../../../deps/chai.ts"; +import {runIfMain} from "../../../deps/mocha.ts"; +import {Post} from "./entity/Post.ts"; +// TODO(uki00a) uncomment this when PostgresDriver is implemented. +// import {PostgresDriver} from "../../../../src/driver/postgres/PostgresDriver.ts"; +import {SqlServerDriver} from "../../../../src/driver/sqlserver/SqlServerDriver.ts"; +import {User} from "./entity/User.ts"; +import {Category} from "./entity/Category.ts"; +import {Person} from "./entity/Person.ts"; +import {Question} from "./entity/Question.ts"; +import {Answer} from "./entity/Answer.ts"; +import {MysqlDriver} from "../../../../src/driver/mysql/MysqlDriver.ts"; describe("multi-schema-and-database > basic-functionality", () => { @@ -41,7 +42,7 @@ describe("multi-schema-and-database > basic-functionality", () => { .where("post.id = :id", {id: 1}) .getSql(); - if (connection.driver instanceof PostgresDriver) + if (false/* connection.driver instanceof PostgresDriver */) // TDOO(uki00a) uncomment this when PostgresDriver is implemented. sql.should.be.equal(`SELECT "post"."id" AS "post_id", "post"."name" AS "post_name" FROM "custom"."post" "post" WHERE "post"."id" = $1`); if (connection.driver instanceof SqlServerDriver) @@ -64,7 +65,7 @@ describe("multi-schema-and-database > basic-functionality", () => { .where("user.id = :id", {id: 1}) .getSql(); - if (connection.driver instanceof PostgresDriver) + if (false/* connection.driver instanceof PostgresDriver */) // TODO(uki00a) uncomment this when PostgresDriver is implemented. sql.should.be.equal(`SELECT "user"."id" AS "user_id", "user"."name" AS "user_name" FROM "userSchema"."user" "user" WHERE "user"."id" = $1`); if (connection.driver instanceof SqlServerDriver) @@ -102,7 +103,7 @@ describe("multi-schema-and-database > basic-functionality", () => { .where("category.id = :id", {id: 1}) .getSql(); - if (connection.driver instanceof PostgresDriver) + if (false/* connection.driver instanceof PostgresDriver */) // TODO(uki00a) uncomment this when PostgresDriver is implemeneted. sql.should.be.equal(`SELECT "category"."id" AS "category_id", "category"."name" AS "category_name",` + ` "category"."postId" AS "category_postId", "post"."id" AS "post_id", "post"."name" AS "post_name"` + ` FROM "guest"."category" "category" INNER JOIN "custom"."post" "post" ON "post"."id"="category"."postId" WHERE "category"."id" = $1`); @@ -140,7 +141,7 @@ describe("multi-schema-and-database > basic-functionality", () => { (await query.getRawOne())!.should.be.not.empty; - if (connection.driver instanceof PostgresDriver) + if (false/* connection.driver instanceof PostgresDriver */) // TODO(uki00a) uncomment this when PostgresDriver is implemented. query.getSql().should.be.equal(`SELECT * FROM "guest"."category" "category", "userSchema"."user" "user",` + ` "custom"."post" "post" WHERE "category"."id" = $1 AND "post"."id" = "category"."postId"`); @@ -257,3 +258,5 @@ describe("multi-schema-and-database > basic-functionality", () => { }); }); + +runIfMain(import.meta);