Skip to content

fix(models): Prevent trailing newlines in generated SQL queries #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(models): Prevent trailing newlines in generated SQL queries #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/models/modelsRestApiClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ export default class ModelsRestApiClient extends ModelsApiClient {
if (where.length === 0) {
return whereClause;
}
whereClause = `WHERE ${where[0]}\n`;
whereClause = `WHERE ${where[0]}`;
if (where.length === 1) {
return whereClause;
}
whereClause += where
whereClause += '\n' + where
.slice(1)
.map(
(o) =>
Expand All @@ -104,7 +104,7 @@ export default class ModelsRestApiClient extends ModelsApiClient {
`AND ${o}`,
)
.join('\n');
} else {
} else if (where) {
whereClause = `WHERE ${where}`;
}
return whereClause;
Expand Down Expand Up @@ -272,7 +272,9 @@ export default class ModelsRestApiClient extends ModelsApiClient {
)}.${mysql.escapeId(name)}.${version}`;
const whereClause = this.makeWhereClause(options['where'] || []);
const usingClause = this.makeUsingClause(options['using'] || []);
const selectQuery = [selectClause, whereClause, usingClause].join('\n');
const selectQuery = [selectClause, whereClause, usingClause]
.filter(Boolean)
.join('\n');
const sqlQueryResult = await this.sqlClient.runQuery(selectQuery);
if (sqlQueryResult.error_message) {
throw new MindsDbError(sqlQueryResult.error_message);
Expand Down Expand Up @@ -320,7 +322,9 @@ export default class ModelsRestApiClient extends ModelsApiClient {
joinClause,
whereClause,
limitClause,
].join('\n');
]
.filter(Boolean)
.join('\n');
const sqlQueryResult = await this.sqlClient.runQuery(selectQuery);
if (sqlQueryResult.error_message) {
throw new MindsDbError(sqlQueryResult.error_message);
Expand Down Expand Up @@ -448,7 +452,9 @@ export default class ModelsRestApiClient extends ModelsApiClient {
)} FROM ${mysql.escapeId(finetuneOptions['integration'])}`;
const selectClause = this.makeTrainingSelectClause(finetuneOptions);
const usingClause = this.makeTrainingUsingClause(finetuneOptions);
const query = [finetuneClause, selectClause, usingClause].join('\n');
const query = [finetuneClause, selectClause, usingClause]
.filter(Boolean)
.join('\n');
const sqlQueryResult = await this.sqlClient.runQuery(query);
if (sqlQueryResult.error_message) {
throw new MindsDbError(sqlQueryResult.error_message);
Expand Down
Loading