fix: remove redundant hacks: primaryKey filter for method dimensionCo…

…lumns (#161)
cube-js · Jul 16, 2019 · f910a56 · f910a56
1 parent 1ecdacd
commit f910a56
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/packages/cubejs-oracle-driver/driver/OracleDriver.js b/packages/cubejs-oracle-driver/driver/OracleDriver.js
@@ -19,13 +19,6 @@ const reduceCb = (result, i) => {
 
   if (i.key_type === "P" || i.key_type === "U") {
     attributes.push(["primaryKey"]);
-    /**
-     * ScaffoldingSchema.js line 139
-     * seems like a bug
-     * TODO: remove this after method
-     * dimensionColumns change
-     */
-    attributes.primaryKey = true;
   }
 
   tables.push({

diff --git a/packages/cubejs-schema-compiler/scaffolding/ScaffoldingSchema.js b/packages/cubejs-schema-compiler/scaffolding/ScaffoldingSchema.js
@@ -136,7 +136,7 @@ class ScaffoldingSchema {
     const dimensionColumns = tableDefinition.filter(
       column =>
         !column.name.startsWith('_') && this.columnType(column) === 'string' ||
-        column.attributes && column.attributes.primaryKey ||
+        column.attributes && column.attributes.indexOf('primaryKey') !== -1 ||
         column.name.toLowerCase() === 'id'
     );