Skip to content

implement getFormatter() method #109

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

Merged
kbarbounakis merged 2 commits into from
Mar 9, 2025
Merged

implement getFormatter() method #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3848870
implement getFormatter() method
kbarbounakis Mar 9, 2025
0451803
2.9.3
kbarbounakis Mar 9, 2025
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@themost/sqlite",
"version": "2.9.2",
"version": "2.9.3",
"description": "MOST Web Framework SQLite Adapter",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
3 changes: 2 additions & 1 deletion src/SqliteAdapter.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// MOST Web Framework Codename Zero Gravity Copyright (c) 2017-2022, THEMOST LP
import { DataAdapterBase, DataAdapterIndexes, DataAdapterMigration, DataAdapterTable, DataAdapterView } from '@themost/common';
import { QueryExpression } from '@themost/query';
import { QueryExpression, SqlFormatter } from '@themost/query';
import {AsyncSeriesEventEmitter} from '@themost/events';

export declare class SqliteAdapter implements DataAdapterBase {
Expand Down Expand Up @@ -32,4 +32,5 @@ export declare class SqliteAdapter implements DataAdapterBase {
table(table: string): DataAdapterTable;
view(view: string): DataAdapterView;
indexes(table: string): DataAdapterIndexes;
getFormatter(): SqlFormatter;
}
20 changes: 12 additions & 8 deletions src/SqliteAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ class SqliteAdapter {
return (async function() {
// prepare to rename existing table and create a new one
const renamed = '__' + migration.appliesTo + '_' + new Date().getTime().toString() + '__';
const formatter = new SqliteFormatter();
const formatter = self.getFormatter();
const renameTable = formatter.escapeName(renamed);
const table = formatter.escapeName(migration.appliesTo);
const existingFields = await self.table(migration.appliesTo).columnsAsync();
Expand Down Expand Up @@ -613,7 +613,7 @@ class SqliteAdapter {
});
}
else {
const formatter = new SqliteFormatter();
const formatter = self.getFormatter();
migration.add.forEach(function (x) {
//search for columns
expressions.push(sprintf('ALTER TABLE %s ADD COLUMN %s %s', formatter.escapeName(migration.appliesTo), formatter.escapeName(x.name), self.formatType(x)));
Expand Down Expand Up @@ -956,8 +956,8 @@ class SqliteAdapter {
return callback();
}
// generate SQL statement
const formatter = new SqliteFormatter();
const escapedTable = new SqliteFormatter().escapeName(name);
const formatter = self.getFormatter();
const escapedTable = formatter.escapeName(name);
const sql = fields.map((field) => {
const escapedField = formatter.escapeName(field.name);
return sprintf('ALTER TABLE %s ADD COLUMN %s %s', escapedTable, escapedField, self.formatType(field));
Expand Down Expand Up @@ -1065,7 +1065,7 @@ class SqliteAdapter {
}
try {
let sql = sprintf('CREATE VIEW `%s` AS ', name);
const formatter = new SqliteFormatter();
const formatter = self.getFormatter();
sql += formatter.format(q);
self.execute(sql, undefined, tr);
}
Expand Down Expand Up @@ -1138,7 +1138,7 @@ class SqliteAdapter {
}
else {
//format query expression or any object that may act as query expression
const formatter = new SqliteFormatter();
const formatter = this.getFormatter();
sql = formatter.format(query);
}
//validate sql statement
Expand Down Expand Up @@ -1305,7 +1305,7 @@ class SqliteAdapter {
}

indexes(table) {
const self = this, formatter = new SqliteFormatter();
const self = this, formatter = this.getFormatter();
return {
list: function (callback) {
const this1 = this;
Expand Down Expand Up @@ -1432,7 +1432,7 @@ class SqliteAdapter {
if (!exists) {
return callback();
}
const formatter = new SqliteFormatter();
const formatter = self.getFormatter();
self.execute(sprintf('DROP INDEX %s', formatter.escapeName(name)), [], callback);
});
},
Expand All @@ -1448,6 +1448,10 @@ class SqliteAdapter {
}
};
}

getFormatter() {
return new SqliteFormatter();
}
}

export {
Expand Down