feat: add enum values to db specific configs

Signed-off-by: Muhammad Aaqil <[email protected]>

Author: aaqilniz

lib/datasource.js

@@ -1733,7 +1733,7 @@ DataSource.prototype.discoverSchemas = function(tableName, options, cb) {
       if (uniqueKeys.includes(propName)) {
         schema.properties[propName]['index'] = {unique: true};
       }
-      const dbSpecific = schema.properties[propName][dbType] = {
+      const dbSpecific = {
         columnName: item.columnName,
         dataType: item.dataType,
         dataLength: item.dataLength,
@@ -1742,6 +1742,18 @@ DataSource.prototype.discoverSchemas = function(tableName, options, cb) {
         nullable: item.nullable,
         generated: item.generated || false,
       };
+      if (
+        item.dataType &&
+        item.dataType.toLowerCase().includes('enum')
+      ) {
+        let enumItems = '';
+        const enumRemoved = item.dataType.toLowerCase().split('enum')[1];
+        const enumValues = enumRemoved.slice(1, -1).replaceAll('\'', '');
+        const enumValuesArray = enumValues.split(',');
+        enumValuesArray.forEach(item => { enumItems += `'${item}',`; });
+        dbSpecific.value = enumItems.toString();
+      }
+      schema.properties[propName][dbType] = dbSpecific;
       // merge connector-specific properties
       if (item[dbType]) {
         for (const k in item[dbType]) {

test/discovery.test.js

@@ -36,6 +36,14 @@ describe('Memory connector with mocked discovery', function() {
       nullable: 0,
       generated: true,
     },
+    {
+      owner: 'STRONGLOOP',
+      tableName: 'INVENTORY',
+      columnName: 'PRODUCT_TYPE',
+      dataType: "ENUM('IMPORTED', 'LOCAL')",
+      nullable: 1,
+      generated: false,
+    },
     {
       owner: 'STRONGLOOP',
       tableName: 'INVENTORY',
@@ -84,7 +92,7 @@ describe('Memory connector with mocked discovery', function() {
       const s = schemas['STRONGLOOP.INVENTORY'];
       s.name.should.be.eql('Inventory');
       Object.keys(s.properties).should.be.eql(
-        ['productId', 'locationId', 'available', 'total'],
+        ['productId', 'productType', 'locationId', 'available', 'total'],
       );
       done();
     });
@@ -110,7 +118,7 @@ describe('Memory connector with mocked discovery', function() {
       const s = schemas['STRONGLOOP.INVENTORY'];
       s.name.should.be.eql('Inventory');
       Object.keys(s.properties).should.be.eql(
-        ['PRODUCT_ID', 'LOCATION_ID', 'AVAILABLE', 'TOTAL'],
+        ['PRODUCT_ID', 'PRODUCT_TYPE', 'LOCATION_ID', 'AVAILABLE', 'TOTAL'],
       );
       done();
     });
@@ -128,7 +136,7 @@ describe('Memory connector with mocked discovery', function() {
       const s = schemas['STRONGLOOP.INVENTORY'];
       s.name.should.be.eql('inventory');
       Object.keys(s.properties).should.be.eql(
-        ['product_id', 'location_id', 'available', 'total'],
+        ['product_id', 'product_type', 'location_id', 'available', 'total'],
       );
       done();
     });
@@ -142,7 +150,7 @@ describe('Memory connector with mocked discovery', function() {
         const s = schemas['STRONGLOOP.INVENTORY'];
         s.name.should.be.eql('INVENTORY');
         Object.keys(s.properties).should.be.eql(
-          ['PRODUCT_ID', 'LOCATION_ID', 'AVAILABLE', 'TOTAL'],
+          ['PRODUCT_ID', 'PRODUCT_TYPE', 'LOCATION_ID', 'AVAILABLE', 'TOTAL'],
         );
         done();
       });
@@ -202,7 +210,7 @@ describe('Memory connector with mocked discovery', function() {
           s.name.should.be.eql('Inventory');
 
           Object.keys(s.properties).should.be.eql(
-            ['productId', 'locationId', 'available', 'total'],
+            ['productId', 'productType', 'locationId', 'available', 'total'],
           );
           done();
         })
@@ -235,13 +243,32 @@ describe('Memory connector with mocked discovery', function() {
               dataType: 'int',
               nullable: 1,
               generated: false,
+              value: '\'imported\',\' local\','
             },
             precision: 10,
             required: false,
             scale: 0,
             type: undefined,
             generated: false,
           },
+          productType: {
+            type: undefined,
+            required: false,
+            jsonSchema: {nullable: true},
+            length: undefined,
+            precision: undefined,
+            scale: undefined,
+            generated: false,
+            memory: {
+              columnName: 'PRODUCT_TYPE',
+              dataType: 'ENUM(\'IMPORTED\', \'LOCAL\')',
+              dataLength: undefined,
+              dataPrecision: undefined,
+              dataScale: undefined,
+              nullable: 1,
+              generated: false,
+            },
+          },
           locationId: {
             length: 20,
             jsonSchema: {