chore: fix rebase

mikro-orm · Apr 26, 2023 · 188ba57 · 188ba57
1 parent 254042d
commit 188ba57
Show file tree

Hide file tree

Showing 6 changed files with 1,243 additions and 1,405 deletions.
diff --git a/packages/cli/src/commands/CreateSeederCommand.ts b/packages/cli/src/commands/CreateSeederCommand.ts
@@ -17,8 +17,8 @@ export class CreateSeederCommand<T> implements CommandModule<T, { seeder: string
   /**
    * @inheritDoc
    */
-  async handler(args: ArgumentsCamelCase<{ seeder: string }>) {
-    const className = CreateSeederCommand.getSeederClassName(args.seeder);
+  async handler(args: ArgumentsCamelCase<{ seeder?: string }>) {
+    const className = CreateSeederCommand.getSeederClassName(args.seeder!);
     const orm = await CLIHelper.getORM();
     const seeder = orm.getSeeder();
     const path = await seeder.createSeeder(className);

diff --git a/packages/knex/src/AbstractSqlPlatform.ts b/packages/knex/src/AbstractSqlPlatform.ts
@@ -103,10 +103,10 @@ export abstract class AbstractSqlPlatform extends Platform {
       return raw(alias => `json_extract(${this.quoteIdentifier(`${alias}.${a}`)}, '$.${b.map(quoteKey).join('.')}')`);
     }
 
-    return `json_extract(${this.quoteIdentifier(a)}, '$.${b.map(quoteKey).join('.')}')`;
+    return raw(`json_extract(${this.quoteIdentifier(a)}, '$.${b.map(quoteKey).join('.')}')`);
   }
 
-  overrideisRaw(value: any): boolean {
+  override isRaw(value: any): boolean {
     return super.isRaw(value) || (typeof value === 'object' && value !== null && value.client && ['Ref', 'Raw'].includes(value.constructor.name));
   }
 

diff --git a/packages/postgresql/src/PostgreSqlPlatform.ts b/packages/postgresql/src/PostgreSqlPlatform.ts
@@ -273,7 +273,6 @@ export class PostgreSqlPlatform extends AbstractSqlPlatform {
     switch (prop?.columnTypes?.[0]) {
       case this.getUuidTypeDeclarationSQL({}): return '::text';
       case this.getBooleanTypeDeclarationSQL(): return '::int';
-      case 'json': return '::jsonb';
       default: return '';
     }
   }

diff --git a/tests/features/serialization/GH4263.test.ts b/tests/features/serialization/GH4263.test.ts
@@ -42,6 +42,6 @@ test('serialization with nulls', async () => {
   const expDto = { id: '1', details: { code: 2 } };
   await orm.em.insert(ListEntity2Test, expDto);
   const entity = await orm.em.findOneOrFail(ListEntity2Test, { id: '1' });
-  const dto = serialize(entity, { skipNull: true });
+  const [dto] = serialize(entity, { skipNull: true });
   expect(dto).toEqual(expDto);
 });
diff --git a/tests/features/unit-of-work/GH4266.test.ts b/tests/features/unit-of-work/GH4266.test.ts
@@ -76,11 +76,11 @@ test('update triggered after insert (GH #4266)', async () => {
 
   expect(mock.mock.calls).toEqual([
     ['[query] begin'],
-    ['[query] insert into `a` (`id`, `name`) values (1, \'a\') returning `id`'],
+    ['[query] insert into `a` (`id`, `name`) values (1, \'a\')'],
     ['[query] commit'],
     ['[query] select `a0`.* from `a` as `a0` where `a0`.`name` = \'a\' limit 1'],
     ['[query] begin'],
-    ['[query] insert into `b` (`id`, `name`, `a_id`) values (2, \'b\', 1) returning `id`'],
+    ['[query] insert into `b` (`id`, `name`, `a_id`) values (2, \'b\', 1)'],
     ['[query] commit'],
   ]);
 });