fix migrate

loopbackio · Dec 13, 2019 · 1f11568 · 1f11568
1 parent 0628b2e
commit 1f11568
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/lib/migration.js b/lib/migration.js
@@ -299,21 +299,20 @@ function mixinMigration(PostgreSQL) {
     let result = self.columnDataType(model, propName);
     // checks if dataType is set to uuid
     let postgreType = modelDef.properties[propName];
-    if(postgreType.postgresql && postgreType.postgresql.dataType){
+    if (postgreType.postgresql && postgreType.postgresql.dataType) {
       postgreType = postgreType.postgresql.dataType.toUpperCase();
     }
 
     if (prop.generated) {
       if (result === 'INTEGER') {
         return 'SERIAL';
-      }
-      else if (postgreType === 'UUID') {
+      } else if (postgreType === 'UUID') {
         result = result + ' NOT NULL' + ' DEFAULT uuid_generate_v4()';
         return result;
       } else {
         console.log(chalk.red('>>> WARNING: ') +
-            `auto-generattion is not supported for type "${chalk.yellow(prop.type)}". Please add your own function to the table "${chalk.yellow(model)}".`
-        );
+            `auto-generattion is not supported for type "${chalk.yellow(prop.type)}". \
+            Please add your own function to the table "${chalk.yellow(model)}".`);
       }
     }
 
@@ -336,28 +335,29 @@ function mixinMigration(PostgreSQL) {
       'CREATE EXTENSION IF NOT EXISTS "uuid-ossp";' +
       'CREATE SCHEMA ' +
       self.escapeName(self.schema(model)),
-    function(err) {
-      if (err && err.code !== '42P06') {
-        return cb && cb(err);
-      }
-      self.execute('CREATE TABLE ' + name + ' (\n  ' +
-          self.propertiesSQL(model) + '\n)',
-      function(err, info) {
-        if (err) {
-          return cb(err, info);
+      function(err) {
+        if (err && err.code !== '42P06') {
+          return cb && cb(err);
         }
-        self.addIndexes(model, undefined, function(err) {
+        self.execute('CREATE TABLE ' + name + ' (\n  ' +
+          self.propertiesSQL(model) + '\n)',
+        function(err, info) {
           if (err) {
-            return cb(err);
+            return cb(err, info);
           }
-          const fkSQL = self.getForeignKeySQL(model,
-            self.getModelDefinition(model).settings.foreignKeys);
-          self.addForeignKeys(model, fkSQL, function(err, result) {
-            cb(err);
+          self.addIndexes(model, undefined, function(err) {
+            if (err) {
+              return cb(err);
+            }
+            const fkSQL = self.getForeignKeySQL(model,
+              self.getModelDefinition(model).settings.foreignKeys);
+            self.addForeignKeys(model, fkSQL, function(err, result) {
+              cb(err);
+            });
           });
         });
-      });
-    });
+      },
+    );
   };
 
   PostgreSQL.prototype.buildIndex = function(model, property) {