This commit is contained in:
Jan Prochazka
2021-01-23 07:24:46 +01:00
parent 451af5d09f
commit b9cb8c3a45
22 changed files with 127 additions and 129 deletions

View File

@@ -18,7 +18,7 @@ export function dumpSqlSelect(dmp: SqlDumper, cmd: Select) {
if (cmd.columns) {
if (cmd.selectAll) dmp.put('&n,');
dmp.put('&>&n');
dmp.putCollection(',&n', cmd.columns, (fld) => {
dmp.putCollection(',&n', cmd.columns, fld => {
dumpSqlExpression(dmp, fld);
if (fld.alias) dmp.put(' ^as %i', fld.alias);
});
@@ -33,7 +33,7 @@ export function dumpSqlSelect(dmp: SqlDumper, cmd: Select) {
}
if (cmd.groupBy) {
dmp.put('&n^group ^by ');
dmp.putCollection(', ', cmd.groupBy, (expr) => dumpSqlExpression(dmp, expr));
dmp.putCollection(', ', cmd.groupBy, expr => dumpSqlExpression(dmp, expr));
dmp.put('&n');
}
if (cmd.having) {
@@ -43,7 +43,7 @@ export function dumpSqlSelect(dmp: SqlDumper, cmd: Select) {
}
if (cmd.orderBy) {
dmp.put('&n^order ^by ');
dmp.putCollection(', ', cmd.orderBy, (expr) => {
dmp.putCollection(', ', cmd.orderBy, expr => {
dumpSqlExpression(dmp, expr);
dmp.put(' %k', expr.direction);
});
@@ -67,7 +67,7 @@ export function dumpSqlUpdate(dmp: SqlDumper, cmd: Update) {
dmp.put('&n^set ');
dmp.put('&>');
dmp.putCollection(', ', cmd.fields, (col) => {
dmp.putCollection(', ', cmd.fields, col => {
dmp.put('%i=', col.targetColumn);
dumpSqlExpression(dmp, col);
});
@@ -95,9 +95,9 @@ export function dumpSqlInsert(dmp: SqlDumper, cmd: Insert) {
dmp.put(
'^insert ^into %f (%,i) ^values (',
cmd.targetTable,
cmd.fields.map((x) => x.targetColumn)
cmd.fields.map(x => x.targetColumn)
);
dmp.putCollection(',', cmd.fields, (x) => dumpSqlExpression(dmp, x));
dmp.putCollection(',', cmd.fields, x => dumpSqlExpression(dmp, x));
dmp.put(')');
}

View File

@@ -31,7 +31,7 @@ export function dumpSqlCondition(dmp: SqlDumper, condition: Condition) {
break;
case 'and':
case 'or':
dmp.putCollection(` ^${condition.conditionType} `, condition.conditions, (cond) => {
dmp.putCollection(` ^${condition.conditionType} `, condition.conditions, cond => {
dmp.putRaw('(');
dumpSqlCondition(dmp, cond);
dmp.putRaw(')');

View File

@@ -31,7 +31,7 @@ export function dumpSqlExpression(dmp: SqlDumper, expr: Expression) {
case 'call':
dmp.put('%s(', expr.func);
if (expr.argsPrefix) dmp.put('%s ', expr.argsPrefix);
dmp.putCollection(',', expr.args, (x) => dumpSqlExpression(dmp, x));
dmp.putCollection(',', expr.args, x => dumpSqlExpression(dmp, x));
dmp.put(')');
break;

View File

@@ -44,12 +44,12 @@ export function dumpSqlRelation(dmp: SqlDumper, from: Relation) {
dumpSqlSourceDef(dmp, from);
if (from.conditions && from.conditions.length > 0) {
dmp.put(' ^on ');
dmp.putCollection(' ^and ', from.conditions, (cond) => dumpSqlCondition(dmp, cond));
dmp.putCollection(' ^and ', from.conditions, cond => dumpSqlCondition(dmp, cond));
}
}
export function dumpSqlFromDefinition(dmp: SqlDumper, from: FromDefinition) {
dumpSqlSourceDef(dmp, from);
dmp.put(' ');
if (from.relations) from.relations.forEach((rel) => dumpSqlRelation(dmp, rel));
if (from.relations) from.relations.forEach(rel => dumpSqlRelation(dmp, rel));
}

View File

@@ -48,9 +48,9 @@ export function evaluateCondition(condition: Condition, values) {
case 'isNotEmpty':
return !isEmpty(evaluateExpression(condition.expr, values));
case 'and':
return condition.conditions.every((cond) => evaluateCondition(cond, values));
return condition.conditions.every(cond => evaluateCondition(cond, values));
case 'or':
return condition.conditions.some((cond) => evaluateCondition(cond, values));
return condition.conditions.some(cond => evaluateCondition(cond, values));
case 'like':
return isLike(evaluateExpression(condition.left, values), evaluateExpression(condition.right, values));
break;