Merge branch 'master' of https://github.com/jortilles/EDA

jortilles · Dec 21, 2023 · f940621 · f940621
2 parents ccc933e + 477d0da
commit f940621
Show file tree

Hide file tree

Showing 20 changed files with 1,262 additions and 636 deletions.
diff --git a/eda/eda_api/lib/module/dashboard/dashboard.controller.ts b/eda/eda_api/lib/module/dashboard/dashboard.controller.ts
@@ -622,7 +622,6 @@ export class DashboardController {
    */
   static async execQuery(req: Request, res: Response, next: NextFunction) {
 
-
     try {
       const connection = await ManagerConnectionService.getConnection(req.body.model_id);
       const dataModel = await connection.getDataSource(req.body.model_id)
@@ -692,6 +691,11 @@ export class DashboardController {
         console.log('you cannot see any data');
         return res.status(200).json([['noDataAllowed'], [[]]]);
       }
+      if( req.body.query.hasOwnProperty('forSelector') && req.body.query.forSelector===true ){
+          myQuery.forSelector = true;
+      }else{
+          myQuery.forSelector = false;
+      }
 
       const query = await connection.getQueryBuilded(
         myQuery,

diff --git a/eda/eda_api/lib/services/connection/db-systems/bigquery-connection.ts b/eda/eda_api/lib/services/connection/db-systems/bigquery-connection.ts
@@ -132,7 +132,7 @@ export class BigQueryConnection extends AbstractConnection {
         column.aggregation_type = AggregationTypes.getValuesForOthers();
     }
 
-    column.computed_column == 'no'   // las posibilidades son no, computed_numeric, computed_string
+    column.computed_column == 'no'   // las posibilidades son no, computed, 
 
     column.column_granted_roles = [];
     column.row_granted_roles = [];

diff --git a/eda/eda_api/lib/services/connection/db-systems/oracle-connection.ts b/eda/eda_api/lib/services/connection/db-systems/oracle-connection.ts
@@ -428,7 +428,7 @@ export class OracleConnection extends AbstractConnection {
             column.aggregation_type = AggregationTypes.getValuesForOthers();
         }
 
-        column.computed_column == 'no'   // las posibilidades son no, computed_numeric, computed_string
+        column.computed_column == 'no'   // las posibilidades son no, computed, 
 
         column.column_granted_roles = [];
         column.row_granted_roles = [];

diff --git a/eda/eda_api/lib/services/connection/db-systems/pg-connection.ts b/eda/eda_api/lib/services/connection/db-systems/pg-connection.ts
@@ -227,7 +227,7 @@ export class PgConnection extends AbstractConnection {
             column.aggregation_type = AggregationTypes.getValuesForOthers();
         }
 
-        column.computed_column == 'no'   // las posibilidades son no, computed_numeric, computed_string
+        column.computed_column == 'no'   // las posibilidades son no, computed, 
 
         column.column_granted_roles = [];
         column.row_granted_roles = [];

diff --git a/eda/eda_api/lib/services/connection/db-systems/snowflake-connection.ts b/eda/eda_api/lib/services/connection/db-systems/snowflake-connection.ts
@@ -175,7 +175,7 @@ export class SnowflakeConnection extends AbstractConnection {
         column.aggregation_type = AggregationTypes.getValuesForOthers();
     }
 
-    column.computed_column == 'no'   // las posibilidades son no, computed_numeric, computed_string
+    column.computed_column == 'no'   // las posibilidades son no, computed, 
 
     column.column_granted_roles = [];
     column.row_granted_roles = [];