fix: fix serial type error, console log errors

SoftwareBrothers · Mar 15, 2022 · d604c61 · d604c61
1 parent 5fb695d
commit d604c61
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/Property.ts b/src/Property.ts
@@ -26,6 +26,12 @@ export class Property extends BaseProperty {
     return !!this.column.primary;
   }
 
+  public isRequired(): boolean {
+    if (this.column.nullable === false) return true;
+
+    return false;
+  }
+
   public isSortable(): boolean {
     return this.type() !== 'reference';
   }
@@ -53,12 +59,15 @@ export class Property extends BaseProperty {
   }
 
   public type(): PropertyType {
-    let type: PropertyType = DATA_TYPES[this.column.columnTypes[0]];
+    let type: PropertyType = DATA_TYPES[this.column.columnTypes[0]]
+      || DATA_TYPES[this.column.type];
 
     if (this.reference()) { type = 'reference'; }
 
     // eslint-disable-next-line no-console
-    if (!type) { console.warn(`Unhandled type: ${this.column.type}`); }
+    if (!type) {
+      console.warn(`Unhandled type: ${this.column.type}`);
+    }
 
     return type;
   }

diff --git a/src/Resource.ts b/src/Resource.ts
@@ -181,7 +181,10 @@ export class Resource extends BaseResource {
     try {
       await this.orm.em.persistAndFlush(instance);
     } catch (error) {
-      if (error.name === 'QueryFailedError') {
+      // TODO: figure out how to get column name from MikroORM's error metadata
+      // It currently seems to return only whole Entity
+      console.log(error);
+      if (error.name === 'QueryFailedError' || error.name === 'ValidationError') {
         throw new ValidationError({
           [error.column]: {
             type: 'QueryFailedError',

diff --git a/src/utils/data-types.ts b/src/utils/data-types.ts
@@ -26,6 +26,7 @@ const NUMBER = [
   'fixed',
   'numeric',
   'number',
+  'serial',
 
   // WithWidthColumnType:
   'tinyint',