fix(entity-generator): fix boolean default values

Closes #1917
mikro-orm · Jun 19, 2021 · 908a638 · 908a638
1 parent 3cdc786
commit 908a638
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/entity-generator/src/SourceFile.ts b/packages/entity-generator/src/SourceFile.ts
@@ -63,7 +63,7 @@ export class SourceFile {
 
   private getPropertyDefinition(prop: EntityProperty, padLeft: number): string {
     // string defaults are usually things like SQL functions
-    const useDefault = prop.default && typeof prop.default !== 'string';
+    const useDefault = prop.default != null && typeof prop.default !== 'string';
     const optional = prop.nullable ? '?' : (useDefault ? '' : '!');
     const ret = `${prop.name}${optional}: ${prop.type}`;
     const padding = ' '.repeat(padLeft);

diff --git a/packages/knex/src/schema/DatabaseTable.ts b/packages/knex/src/schema/DatabaseTable.ts
@@ -292,8 +292,8 @@ export class DatabaseTable {
       return empty;
     }
 
-    if (propType === 'boolean') {
-      return !!column.default;
+    if (propType === 'boolean' && !raw) {
+      return !['0', 'false', 'f', 'n', 'no', 'off'].includes('' + column.default);
     }
 
     if (propType === 'number') {

diff --git a/tests/features/entity-generator/__snapshots__/EntityGenerator.test.ts.snap b/tests/features/entity-generator/__snapshots__/EntityGenerator.test.ts.snap
@@ -47,7 +47,7 @@ export class Author2 {
 
   @Index({ name: 'author2_terms_accepted_index' })
   @Property()
-  termsAccepted: boolean = true;
+  termsAccepted: boolean = false;
 
   @Property({ nullable: true })
   optional?: boolean;
@@ -566,7 +566,7 @@ export class Author2 {
 
   @Index({ name: 'author2_terms_accepted_index' })
   @Property()
-  termsAccepted: boolean = true;
+  termsAccepted: boolean = false;
 
   @Property({ nullable: true })
   optional?: boolean;
@@ -930,7 +930,7 @@ export class Author3 {
   age?: number;
 
   @Property()
-  termsAccepted!: number;
+  termsAccepted: number = 0;
 
   @Property({ nullable: true })
   identities?: string;