Allow for composite primary keys

* [FIXED] Tables with composite primary keys are not quoted properly.
doug-martin · Apr 3, 2020 · 6b80bea · 6b80bea
1 parent 182bd41
commit 6b80bea
Show file tree

Hide file tree

Showing 25 changed files with 112 additions and 168 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,12 @@
+# v0.7.5
+
+* [FIXED] Tables with composite primary keys are not quoted properly.
+
+# v0.7.4
+
+* Fix code formatting
+* Update root package.json with common dependencies
+
 # v0.7.3
 
 * [DOCS] Update docs to include a complete example of custom methods [#64](https://github.com/doug-martin/nestjs-query/issues/64)

diff --git a/examples/nest-graphql-typeorm/README.md b/examples/nest-graphql-typeorm/README.md
@@ -13,7 +13,7 @@ docker-compose up -d
 From the root of the repo run the following commands.
 
 ```sh
-npm install & npm run bootstrap && npm run build && npx lerna run migrate:up && npx lerna run seed
+npm install & npm run bootstrap && npm run build && npx lerna run reset
 ```
 
 In this directory `nestjs-query/examples/nest-graphql-typeorm`

diff --git a/examples/nest-graphql-typeorm/e2e/fixtures.ts b/examples/nest-graphql-typeorm/e2e/fixtures.ts
@@ -3,7 +3,7 @@ import { SubTaskEntity } from '../src/sub-task/sub-task.entity';
 import { TagEntity } from '../src/tag/tag.entity';
 import { TodoItemEntity } from '../src/todo-item/todo-item.entity';
 
-const tables = ['todo_item_entity', 'sub_task_entity', 'tag_entity'];
+const tables = ['todo_item', 'sub_task', 'tag'];
 export const truncate = async (connection: Connection): Promise<void> => {
   await tables.reduce(async (prev, table) => {
     await prev;

diff --git a/examples/nest-graphql-typeorm/migrations/1572928650276-create-tables.ts b/examples/nest-graphql-typeorm/migrations/1572928650276-create-tables.ts
diff --git a/examples/nest-graphql-typeorm/migrations/1580281677570-add-sub-tasks.ts b/examples/nest-graphql-typeorm/migrations/1580281677570-add-sub-tasks.ts
diff --git a/examples/nest-graphql-typeorm/migrations/1580614646448-add-cascade-to-subtask.ts b/examples/nest-graphql-typeorm/migrations/1580614646448-add-cascade-to-subtask.ts
diff --git a/examples/nest-graphql-typeorm/migrations/1582064970069-add-description.ts b/examples/nest-graphql-typeorm/migrations/1582064970069-add-description.ts
diff --git a/examples/nest-graphql-typeorm/migrations/1582247882223-add-tags.ts b/examples/nest-graphql-typeorm/migrations/1582247882223-add-tags.ts
diff --git a/examples/nest-graphql-typeorm/ormconfig.json b/examples/nest-graphql-typeorm/ormconfig.json
@@ -5,9 +5,9 @@
   "username": "graphqltypeorm",
   "database": "graphql_typeorm",
   "autoLoadEntities": true,
-  "migrations": ["dist/migrations/**.js"],
-  "seeds": ["./seeds.ts"],
-  "synchronize": false,
+  "entities": ["**/*.entity.js"],
+  "seeds": ["./dist/seeds.js"],
+  "synchronize": true,
   "logging": true,
   "cli": {
     "migrationsDir": "./migrations"

diff --git a/examples/nest-graphql-typeorm/package.json b/examples/nest-graphql-typeorm/package.json
@@ -12,10 +12,9 @@
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "APP_ROOT_PATH=. nest start --watch",
     "start:prod": "node dist/main",
-    "reset": "typeorm schema:drop && npm run migrate:up && npm run seed",
-    "migrate:up": "typeorm migration:run",
-    "migrate:generate": "npm run build && typeorm migration:generate -d ./migrations ",
-    "seed": "ts-node ../../node_modules/typeorm-seeding/dist/cli.js --config ./ormconfig.json seed"
+    "reset": "npm run build && typeorm schema:drop && npm run schema:sync && npm run seed",
+    "schema:sync": "typeorm schema:sync",
+    "seed": "../../node_modules/typeorm-seeding/dist/cli.js --config ./ormconfig.json seed"
   },
   "dependencies": {
     "@nestjs-query/core": "^0.7.4",

diff --git a/examples/nest-graphql-typeorm/src/sub-task/dto/sub-task.dto.ts b/examples/nest-graphql-typeorm/src/sub-task/dto/sub-task.dto.ts
@@ -4,7 +4,7 @@ import { ObjectType, ID, GraphQLISODateTime } from '@nestjs/graphql';
 @ObjectType('SubTask')
 export class SubTaskDTO {
   @FilterableField(() => ID)
-  id!: string;
+  id!: number;
 
   @FilterableField()
   title!: string;

diff --git a/examples/nest-graphql-typeorm/src/sub-task/sub-task.entity.ts b/examples/nest-graphql-typeorm/src/sub-task/sub-task.entity.ts
@@ -10,10 +10,10 @@ import {
 } from 'typeorm';
 import { TodoItemEntity } from '../todo-item/todo-item.entity';
 
-@Entity()
+@Entity({ name: 'sub_task' })
 export class SubTaskEntity {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: number;
 
   @Column()
   title!: string;
@@ -24,14 +24,14 @@ export class SubTaskEntity {
   @Column()
   completed!: boolean;
 
-  @Column({ nullable: false })
+  @Column({ nullable: false, name: 'todo_item_id' })
   todoItemId!: string;
 
   @ManyToOne((): ObjectType<TodoItemEntity> => TodoItemEntity, (td) => td.subTasks, {
     onDelete: 'CASCADE',
     nullable: false,
   })
-  @JoinColumn()
+  @JoinColumn({ name: 'todo_item_id' })
   todoItem!: TodoItemEntity;
 
   @CreateDateColumn()

diff --git a/examples/nest-graphql-typeorm/src/tag/dto/tag.dto.ts b/examples/nest-graphql-typeorm/src/tag/dto/tag.dto.ts
@@ -4,7 +4,7 @@ import { ObjectType, ID, GraphQLISODateTime } from '@nestjs/graphql';
 @ObjectType('Tag')
 export class TagDTO {
   @FilterableField(() => ID)
-  id!: string;
+  id!: number;
 
   @FilterableField()
   name!: string;

diff --git a/examples/nest-graphql-typeorm/src/tag/tag.entity.ts b/examples/nest-graphql-typeorm/src/tag/tag.entity.ts
@@ -9,10 +9,10 @@ import {
 } from 'typeorm';
 import { TodoItemEntity } from '../todo-item/todo-item.entity';
 
-@Entity()
+@Entity({ name: 'tag' })
 export class TagEntity {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: number;
 
   @Column()
   name!: string;

diff --git a/examples/nest-graphql-typeorm/src/todo-item/dto/todo-item.dto.ts b/examples/nest-graphql-typeorm/src/todo-item/dto/todo-item.dto.ts
@@ -4,7 +4,7 @@ import { ObjectType, ID, GraphQLISODateTime, Field } from '@nestjs/graphql';
 @ObjectType('TodoItem')
 export class TodoItemDTO {
   @FilterableField(() => ID)
-  id!: string;
+  id!: number;
 
   @FilterableField()
   title!: string;

diff --git a/examples/nest-graphql-typeorm/src/todo-item/todo-item.entity.ts b/examples/nest-graphql-typeorm/src/todo-item/todo-item.entity.ts
@@ -11,10 +11,10 @@ import {
 import { SubTaskEntity } from '../sub-task/sub-task.entity';
 import { TagEntity } from '../tag/tag.entity';
 
-@Entity()
+@Entity({ name: 'todo_item' })
 export class TodoItemEntity {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: number;
 
   @Column()
   title!: string;

diff --git a/examples/nest-graphql-typeorm/tsconfig.build.json b/examples/nest-graphql-typeorm/tsconfig.build.json
@@ -8,6 +8,7 @@
     "include": [
         "src",
         "migrations",
+        "seeds.ts",
         "ormconfig.json"
     ],
     "exclude": [

diff --git a/examples/nest-graphql-typeorm/tsconfig.json b/examples/nest-graphql-typeorm/tsconfig.json
@@ -4,6 +4,6 @@
     "outDir": "./dist",
     "rootDir": "."
   },
-  "include": ["src", "test", "migrations", "ormconfig.json"],
+  "include": ["src", "test", "migrations", "seeds.ts", "ormconfig.json"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/packages/query-typeorm/__tests__/__fixtures__/connection.fixture.ts b/packages/query-typeorm/__tests__/__fixtures__/connection.fixture.ts
@@ -1,5 +1,6 @@
 // this is needed to create a query builder in typeorm :(
 import { Connection, createConnection, getConnection } from 'typeorm';
+import { TestEntityRelationEntity } from './test-entity-relation.entity';
 import { TestRelation } from './test-relation.entity';
 import { TestEntity } from './test.entity';
 
@@ -8,7 +9,7 @@ export function createTestConnection(): Promise<Connection> {
     type: 'sqlite',
     database: ':memory:',
     dropSchema: true,
-    entities: [TestEntity, TestRelation],
+    entities: [TestEntity, TestRelation, TestEntityRelationEntity],
     synchronize: true,
     logging: false,
   });

diff --git a/packages/query-typeorm/__tests__/__fixtures__/test-entity-relation.entity.ts b/packages/query-typeorm/__tests__/__fixtures__/test-entity-relation.entity.ts
@@ -0,0 +1,20 @@
+import { Entity, JoinColumn, PrimaryColumn, ManyToOne } from 'typeorm';
+import { TestRelation } from './test-relation.entity';
+import { TestEntity } from './test.entity';
+
+@Entity()
+export class TestEntityRelationEntity {
+  @PrimaryColumn({ name: 'test_relation_id' })
+  testRelationId!: string;
+
+  @PrimaryColumn({ name: 'test_entity_id' })
+  testEntityId!: string;
+
+  @ManyToOne(() => TestRelation, (tr) => tr.testEntityRelation)
+  @JoinColumn({ name: 'test_relation_id' })
+  testRelation?: TestRelation;
+
+  @ManyToOne(() => TestEntity, (te) => te.testEntityRelation)
+  @JoinColumn({ name: 'test_entity_id' })
+  testEntity?: TestEntity;
+}
diff --git a/packages/query-typeorm/__tests__/__fixtures__/test-relation.entity.ts b/packages/query-typeorm/__tests__/__fixtures__/test-relation.entity.ts
@@ -1,4 +1,14 @@
-import { ManyToOne, Column, PrimaryGeneratedColumn, Entity, JoinColumn, ManyToMany, OneToOne } from 'typeorm';
+import {
+  ManyToOne,
+  Column,
+  PrimaryGeneratedColumn,
+  Entity,
+  JoinColumn,
+  ManyToMany,
+  OneToOne,
+  OneToMany,
+} from 'typeorm';
+import { TestEntityRelationEntity } from './test-entity-relation.entity';
 import { TestEntity } from './test.entity';
 
 @Entity()
@@ -21,4 +31,7 @@ export class TestRelation {
 
   @OneToOne(() => TestEntity, (entity) => entity.oneTestRelation)
   oneTestEntity?: TestEntity;
+
+  @OneToMany(() => TestEntityRelationEntity, (ter) => ter.testRelation)
+  testEntityRelation?: TestEntityRelationEntity;
 }
diff --git a/packages/query-typeorm/__tests__/__fixtures__/test.entity.ts b/packages/query-typeorm/__tests__/__fixtures__/test.entity.ts
@@ -8,6 +8,7 @@ import {
   OneToOne,
   JoinColumn,
 } from 'typeorm';
+import { TestEntityRelationEntity } from './test-entity-relation.entity';
 import { TestRelation } from './test-relation.entity';
 
 @Entity()
@@ -37,4 +38,7 @@ export class TestEntity {
   @OneToOne(() => TestRelation, (relation) => relation.oneTestEntity)
   @JoinColumn()
   oneTestRelation?: TestRelation;
+
+  @OneToMany(() => TestEntityRelationEntity, (ter) => ter.testEntity)
+  testEntityRelation?: TestEntityRelationEntity;
 }