Skip to content

Commit

Permalink
Refactor whatif para limitar decimales
Browse files Browse the repository at this point in the history
  • Loading branch information
@jortilles
jortilles committed Jan 27, 2025
1 parent cf54e81 commit 6c34351
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions eda/eda_api/lib/services/query-builder/qb-systems/bigquery-builder.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ export class BigQueryBuilderService extends QueryBuilderService {
if(el.column_type=='text'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='numeric'){
columns.push(` ROUND( CAST( ${el.SQLexpression} as numeric) , ${el.minimumFractionDigits}) ${whatIfExpression} as "${el.display_name}"`);
columns.push(` ROUND( CAST( ${el.SQLexpression} as numeric) ${whatIfExpression} , ${el.minimumFractionDigits}) as "${el.display_name}"`);
}else if(el.column_type=='date'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='coordinate'){
Expand Down Expand Up @@ -340,13 +340,13 @@ export class BigQueryBuilderService extends QueryBuilderService {

if (el.aggregation_type !== 'none') {
if (el.aggregation_type === 'count_distinct') {
columns.push(`ROUND(count(distinct ${table_column}), ${el.minimumFractionDigits}) ${whatIfExpression} as \`${el.display_name}\``);
columns.push(`ROUND(count(distinct ${table_column}) ${whatIfExpression} , ${el.minimumFractionDigits}) as \`${el.display_name}\``);
} else {
columns.push(`ROUND(${el.aggregation_type}(${table_column}), ${el.minimumFractionDigits}) ${whatIfExpression} as \`${el.display_name}\``);
columns.push(`ROUND(${el.aggregation_type}(${table_column}) ${whatIfExpression} , ${el.minimumFractionDigits}) as \`${el.display_name}\``);
}
} else {
if (el.column_type === 'numeric') {
columns.push(`ROUND(${table_column}, ${el.minimumFractionDigits}) ${whatIfExpression} as \`${el.display_name}\``);
columns.push(`ROUND(${table_column} ${whatIfExpression}, ${el.minimumFractionDigits}) as \`${el.display_name}\``);
} else if (el.column_type === 'date') {
if (el.format) {
if (_.isEqual(el.format, 'year')) {
Expand Down
8 changes: 4 additions & 4 deletions eda/eda_api/lib/services/query-builder/qb-systems/mySql-builder.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ export class MySqlBuilderService extends QueryBuilderService {
if(el.column_type=='text'){
columns.push(` ${el.SQLexpression} as \`${el.display_name}\``);
}else if(el.column_type=='numeric'){
columns.push(`cast( ${el.SQLexpression} as decimal(32,${el.minimumFractionDigits})) ${whatIfExpression} as \`${el.display_name}\``);
columns.push(`cast( ${el.SQLexpression} ${whatIfExpression} as decimal(32,${el.minimumFractionDigits})) as \`${el.display_name}\``);
}else if(el.column_type=='date'){
columns.push(` ${el.SQLexpression} as \`${el.display_name}\``);
}else if(el.column_type=='coordinate'){
Expand Down Expand Up @@ -331,13 +331,13 @@ export class MySqlBuilderService extends QueryBuilderService {
} else {
if (el.aggregation_type !== 'none') {
if (el.aggregation_type === 'count_distinct') {
columns.push(`cast( count( distinct ${table_column}) as decimal(32,${el.minimumFractionDigits||0}) ) ${whatIfExpression} as \`${el.display_name}\``);
columns.push(`cast( count( distinct ${table_column}) ${whatIfExpression} as decimal(32,${el.minimumFractionDigits||0}) ) as \`${el.display_name}\``);
} else {
columns.push(`cast(${el.aggregation_type}(${table_column}) as decimal(32,${el.minimumFractionDigits||0}) ) ${whatIfExpression} as \`${el.display_name}\``);
columns.push(`cast(${el.aggregation_type}(${table_column}) ${whatIfExpression} as decimal(32,${el.minimumFractionDigits||0}) ) as \`${el.display_name}\``);
}
} else {
if (el.column_type === 'numeric') {
columns.push(`cast(${table_column} as decimal(32,${el.minimumFractionDigits})) ${whatIfExpression} as \`${el.display_name}\``);
columns.push(`cast(${table_column} ${whatIfExpression} as decimal(32,${el.minimumFractionDigits})) as \`${el.display_name}\``);
} else if (el.column_type === 'date') {
if (el.format) {
if (_.isEqual(el.format, 'year')) {
Expand Down
8 changes: 4 additions & 4 deletions eda/eda_api/lib/services/query-builder/qb-systems/oracle-builder.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ export class OracleBuilderService extends QueryBuilderService {
if(el.column_type=='text'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='numeric'){
columns.push(` ROUND( CAST( ${el.SQLexpression} as numeric) ,2) ${whatIfExpression} as "${el.display_name}"`);
columns.push(` ROUND( CAST( ${el.SQLexpression} ${whatIfExpression} as numeric) , ${el.minimumFractionDigits} ) as "${el.display_name}"`);
}else if(el.column_type=='date'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='coordinate'){
Expand Down Expand Up @@ -323,13 +323,13 @@ export class OracleBuilderService extends QueryBuilderService {

if (el.aggregation_type !== 'none') {
if (el.aggregation_type === 'count_distinct') {
columns.push(`ROUND(count(distinct ${table_column}) , ${el.minimumFractionDigits}) ${whatIfExpression} as "${el.display_name}"`);
columns.push(`ROUND(count(distinct ${table_column}) ${whatIfExpression} , ${el.minimumFractionDigits}) as "${el.display_name}"`);
} else {
columns.push(`ROUND(${el.aggregation_type}(${table_column}), ${el.minimumFractionDigits}) ${whatIfExpression} as "${el.display_name}"`);
columns.push(`ROUND(${el.aggregation_type}(${table_column}) ${whatIfExpression} , ${el.minimumFractionDigits}) as "${el.display_name}"`);
}
} else {
if (el.column_type === 'numeric') {
columns.push(`ROUND(${table_column}, ${el.minimumFractionDigits}) ${whatIfExpression} as "${el.display_name}"`);
columns.push(`ROUND(${table_column} ${whatIfExpression}, ${el.minimumFractionDigits}) as "${el.display_name}"`);
} else if (el.column_type === 'date') {
if (el.format) {
if (_.isEqual(el.format, 'year')) {
Expand Down
6 changes: 3 additions & 3 deletions eda/eda_api/lib/services/query-builder/qb-systems/pg-builder-service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ export class PgBuilderService extends QueryBuilderService {
if(el.column_type=='text'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='numeric'){
columns.push(` ROUND( CAST( ${el.SQLexpression} as numeric) , ${el.minimumFractionDigits}) ${whatIfExpression} as "${el.display_name}"`);
columns.push(` ROUND( CAST( ${el.SQLexpression} as numeric) ${whatIfExpression} , ${el.minimumFractionDigits}) as "${el.display_name}"`);
}else if(el.column_type=='date'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='coordinate'){
Expand Down Expand Up @@ -357,9 +357,9 @@ export class PgBuilderService extends QueryBuilderService {
if (el.aggregation_type !== 'none') {

if (el.aggregation_type === 'count_distinct') {
columns.push(`ROUND(count(distinct ${table_column})::numeric, ${el.minimumFractionDigits})::float ${whatIfExpression} as "${el.display_name}"`);
columns.push(`ROUND(count(distinct ${table_column})::numeric ${whatIfExpression} , ${el.minimumFractionDigits})::float as "${el.display_name}"`);
} else {
columns.push(`ROUND(${el.aggregation_type}(${table_column})::numeric, ${el.minimumFractionDigits})::float ${whatIfExpression} as "${el.display_name}"`);
columns.push(`ROUND(${el.aggregation_type}(${table_column})::numeric ${whatIfExpression} , ${el.minimumFractionDigits})::float as "${el.display_name}"`);
}


Expand Down
8 changes: 4 additions & 4 deletions eda/eda_api/lib/services/query-builder/qb-systems/snowflake-builder.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ export class SnowFlakeBuilderService extends QueryBuilderService {
if(el.column_type=='text'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='numeric'){
columns.push(` CAST( ${el.SQLexpression} AS DECIMAL(32, ${el.minimumFractionDigits})) ${whatIfExpression} as "${el.display_name}"`);
columns.push(` CAST( ${el.SQLexpression} ${whatIfExpression} AS DECIMAL(32, ${el.minimumFractionDigits})) as "${el.display_name}"`);
}else if(el.column_type=='date'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='coordinate'){
Expand Down Expand Up @@ -328,13 +328,13 @@ export class SnowFlakeBuilderService extends QueryBuilderService {
} else {
if (el.aggregation_type !== 'none') {
if (el.aggregation_type === 'count_distinct') {
columns.push(`CAST(count( distinct ${table_column}) AS DECIMAL(32, ${el.minimumFractionDigits})) ${whatIfExpression} as "${el.display_name}"`);
columns.push(`CAST(count( distinct ${table_column}) ${whatIfExpression} AS DECIMAL(32, ${el.minimumFractionDigits})) as "${el.display_name}"`);
} else {
columns.push(`CAST(${el.aggregation_type}(${table_column}) AS DECIMAL(32, ${el.minimumFractionDigits})) ${whatIfExpression} as "${el.display_name}"`);
columns.push(`CAST(${el.aggregation_type}(${table_column} ${whatIfExpression} ) AS DECIMAL(32, ${el.minimumFractionDigits})) as "${el.display_name}"`);
}
} else {
if (el.column_type === 'numeric') {
columns.push(`CAST(${table_column} AS DECIMAL(32, ${el.minimumFractionDigits})) ${whatIfExpression} as "${el.display_name}"`);
columns.push(`CAST(${table_column} ${whatIfExpression} AS DECIMAL(32, ${el.minimumFractionDigits})) as "${el.display_name}"`);
} else if (el.column_type === 'date') {
if (el.format) {
if (_.isEqual(el.format, 'year')) {
Expand Down
8 changes: 4 additions & 4 deletions eda/eda_api/lib/services/query-builder/qb-systems/sqlserver-builder-service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ export class SQLserviceBuilderService extends QueryBuilderService {
if(el.column_type=='text'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='numeric'){
columns.push(` CAST( ${el.SQLexpression} AS DECIMAL(32, ${el.minimumFractionDigits})) ${whatIfExpression} as "${el.display_name}"`);
columns.push(` CAST( ${el.SQLexpression} ${whatIfExpression} AS DECIMAL(32, ${el.minimumFractionDigits})) as "${el.display_name}"`);
}else if(el.column_type=='date'){
columns.push(` ${el.SQLexpression} as "${el.display_name}"`);
}else if(el.column_type=='coordinate'){
Expand Down Expand Up @@ -327,13 +327,13 @@ export class SQLserviceBuilderService extends QueryBuilderService {
} else {
if (el.aggregation_type !== 'none') {
if (el.aggregation_type === 'count_distinct') {
columns.push(`CAST(count( distinct ${table_column}) AS DECIMAL(32, ${el.minimumFractionDigits})) ${whatIfExpression} as "${el.display_name}"`);
columns.push(`CAST(count( distinct ${table_column}) ${whatIfExpression} AS DECIMAL(32, ${el.minimumFractionDigits})) as "${el.display_name}"`);
} else {
columns.push(`CAST(${el.aggregation_type}(${table_column}) AS DECIMAL(32, ${el.minimumFractionDigits})) ${whatIfExpression} as "${el.display_name}"`);
columns.push(`CAST(${el.aggregation_type}(${table_column}) ${whatIfExpression} AS DECIMAL(32, ${el.minimumFractionDigits})) as "${el.display_name}"`);
}
} else {
if (el.column_type === 'numeric') {
columns.push(`CAST(${table_column} AS DECIMAL(32, ${el.minimumFractionDigits})) ${whatIfExpression} "${el.display_name}"`);
columns.push(`CAST(${table_column} ${whatIfExpression} AS DECIMAL(32, ${el.minimumFractionDigits})) "${el.display_name}"`);
} else if (el.column_type === 'date') {
if (el.format) {
if (_.isEqual(el.format, 'year')) {
Expand Down

0 comments on commit 6c34351

Please sign in to comment.