soporte para vistas de modelo en Postgres

jortilles · Apr 25, 2024 · bc8208b · bc8208b
1 parent f26c4cf
commit bc8208b
Showing 1 changed file with 26 additions and 9 deletions.
diff --git a/eda/eda_api/lib/services/query-builder/qb-systems/pg-builder-service.ts b/eda/eda_api/lib/services/query-builder/qb-systems/pg-builder-service.ts
@@ -145,27 +145,44 @@ export class PgBuilderService extends QueryBuilderService {
 
           /**T can be a table or a custom view, if custom view has a query  */
           let t = tables.filter(table => table.name === e[j]).map(table => { return table.query ? this.cleanViewString(table.query) : table.name })[0];
+          let view =  tables.filter(table => table.name === e[j]).map(table => { return table.query ? true : false})[0];
           if( valueListJoins.includes(e[j])   ){
             myJoin = 'left'; // Si es una tabla que ve del multivaluelist aleshores els joins son left per que la consulta tingui sentit.
           }else{
             myJoin = joinType; 
           }
           //Version compatibility string//array
           if (typeof joinColumns[0] === 'string') {
-            joinString.push(` ${myJoin} join "${schema}"."${t}" on "${schema}"."${e[j]}"."${joinColumns[1]}" = "${schema}"."${e[i]}"."${joinColumns[0]}"`);
+            if(!view){
+              //Si no es una vista
+              joinString.push(` ${myJoin} join "${schema}"."${t}" on "${schema}"."${e[j]}"."${joinColumns[1]}" = "${schema}"."${e[i]}"."${joinColumns[0]}"`);
+            }else{
+              //Si es una vista
+              joinString.push(` ${myJoin} join ${t} on  "${e[j]}"."${joinColumns[1]}" = "${schema}"."${e[i]}"."${joinColumns[0]}"`);
+            }
+
           }
           else {
 
-            let join = ` ${myJoin} join "${schema}"."${t}" on`;
-
-            joinColumns[0].forEach((_, x) => {
-
-              join += `  "${schema}"."${e[j]}"."${joinColumns[1][x]}" =  "${schema}"."${e[i]}"."${joinColumns[0][x]}" and`
+            if(!view){
+              //Si no es una vista
+              let join = ` ${myJoin} join "${schema}"."${t}" on`;
+              joinColumns[0].forEach((_, x) => {
+                join += `  "${schema}"."${e[j]}"."${joinColumns[1][x]}" =  "${schema}"."${e[i]}"."${joinColumns[0][x]}" and`
+              });
+              join = join.slice(0, join.length - 'and'.length);
+              joinString.push(join);
+            }else{
+              //Si es una vista
+              let join = ` ${myJoin} join  ${t}  on`;
+              joinColumns[0].forEach((_, x) => {
+                join += `  "${e[j]}"."${joinColumns[1][x]}" =  "${schema}"."${e[i]}"."${joinColumns[0][x]}" and`
+              });
+              join = join.slice(0, join.length - 'and'.length);
+              joinString.push(join);
+            }
 
-            });
 
-            join = join.slice(0, join.length - 'and'.length);
-            joinString.push(join);
 
           }
           joined.push(e[j]);