SQL gen bugfix
This commit is contained in:
parent
9c5d39edfb
commit
df195412ac
18
dist/utils/sql-generator-gen-query-str.js
vendored
18
dist/utils/sql-generator-gen-query-str.js
vendored
@ -98,22 +98,19 @@ export default function sqlGenGenQueryStr(params) {
|
|||||||
if (selectField.count) {
|
if (selectField.count) {
|
||||||
aliasSelectField = `COUNT(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `COUNT(${joinTableName}.${selectField.field})`;
|
||||||
}
|
}
|
||||||
if (selectField.sum) {
|
else if (selectField.sum) {
|
||||||
aliasSelectField = `SUM(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `SUM(${selectField.distinct ? "DISTINCT " : ""}${joinTableName}.${selectField.field})`;
|
||||||
}
|
}
|
||||||
if (selectField.average) {
|
else if (selectField.average) {
|
||||||
aliasSelectField = `AVERAGE(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `AVERAGE(${joinTableName}.${selectField.field})`;
|
||||||
}
|
}
|
||||||
if (selectField.max) {
|
else if (selectField.max) {
|
||||||
aliasSelectField = `MAX(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `MAX(${joinTableName}.${selectField.field})`;
|
||||||
}
|
}
|
||||||
if (selectField.min) {
|
else if (selectField.min) {
|
||||||
aliasSelectField = `MIN(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `MIN(${joinTableName}.${selectField.field})`;
|
||||||
}
|
}
|
||||||
if (selectField.distinct) {
|
else if (selectField.group_concat &&
|
||||||
aliasSelectField = `DISTINCT ${joinTableName}.${selectField.field}`;
|
|
||||||
}
|
|
||||||
if (selectField.group_concat &&
|
|
||||||
selectField.alias) {
|
selectField.alias) {
|
||||||
return sqlGenGrabConcatStr({
|
return sqlGenGrabConcatStr({
|
||||||
field: `${joinTableName}.${selectField.field}`,
|
field: `${joinTableName}.${selectField.field}`,
|
||||||
@ -124,6 +121,9 @@ export default function sqlGenGenQueryStr(params) {
|
|||||||
.distinct,
|
.distinct,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
else if (selectField.distinct) {
|
||||||
|
aliasSelectField = `DISTINCT ${joinTableName}.${selectField.field}`;
|
||||||
|
}
|
||||||
if (selectField.alias)
|
if (selectField.alias)
|
||||||
aliasSelectField += ` AS ${selectField.alias}`;
|
aliasSelectField += ` AS ${selectField.alias}`;
|
||||||
return aliasSelectField;
|
return aliasSelectField;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@moduletrace/bun-sqlite",
|
"name": "@moduletrace/bun-sqlite",
|
||||||
"version": "1.1.1",
|
"version": "1.1.2",
|
||||||
"description": "SQLite manager for Bun",
|
"description": "SQLite manager for Bun",
|
||||||
"author": "Benjamin Toby",
|
"author": "Benjamin Toby",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
|
|||||||
@ -125,29 +125,15 @@ export default function sqlGenGenQueryStr<
|
|||||||
|
|
||||||
if (selectField.count) {
|
if (selectField.count) {
|
||||||
aliasSelectField = `COUNT(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `COUNT(${joinTableName}.${selectField.field})`;
|
||||||
}
|
} else if (selectField.sum) {
|
||||||
|
aliasSelectField = `SUM(${selectField.distinct ? "DISTINCT " : ""}${joinTableName}.${selectField.field})`;
|
||||||
if (selectField.sum) {
|
} else if (selectField.average) {
|
||||||
aliasSelectField = `SUM(${joinTableName}.${selectField.field})`;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selectField.average) {
|
|
||||||
aliasSelectField = `AVERAGE(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `AVERAGE(${joinTableName}.${selectField.field})`;
|
||||||
}
|
} else if (selectField.max) {
|
||||||
|
|
||||||
if (selectField.max) {
|
|
||||||
aliasSelectField = `MAX(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `MAX(${joinTableName}.${selectField.field})`;
|
||||||
}
|
} else if (selectField.min) {
|
||||||
|
|
||||||
if (selectField.min) {
|
|
||||||
aliasSelectField = `MIN(${joinTableName}.${selectField.field})`;
|
aliasSelectField = `MIN(${joinTableName}.${selectField.field})`;
|
||||||
}
|
} else if (
|
||||||
|
|
||||||
if (selectField.distinct) {
|
|
||||||
aliasSelectField = `DISTINCT ${joinTableName}.${selectField.field}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
selectField.group_concat &&
|
selectField.group_concat &&
|
||||||
selectField.alias
|
selectField.alias
|
||||||
) {
|
) {
|
||||||
@ -161,6 +147,8 @@ export default function sqlGenGenQueryStr<
|
|||||||
selectField.group_concat
|
selectField.group_concat
|
||||||
.distinct,
|
.distinct,
|
||||||
});
|
});
|
||||||
|
} else if (selectField.distinct) {
|
||||||
|
aliasSelectField = `DISTINCT ${joinTableName}.${selectField.field}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (selectField.alias)
|
if (selectField.alias)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user