Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@themost/sqlite",
"version": "2.10.0",
"version": "2.10.1",
"description": "MOST Web Framework SQLite Adapter",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
20 changes: 20 additions & 0 deletions spec/SqliteAdapter.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,26 @@ describe('SqliteAdapter', () => {
});
});

it('should get tables', async () => {
await app.executeInTestTranscaction(async (context) => {
const tables = await context.db.tables().listAsync();
expect(Array.isArray(tables)).toBeTruthy();
expect(tables.length).toBeGreaterThan(0);
const table1 = tables.find((table) => table.name === 'UserBase');
expect(table1).toBeTruthy();
});
});

it('should get views', async () => {
await app.executeInTestTranscaction(async (context) => {
const views = await context.db.views().listAsync();
expect(Array.isArray(views)).toBeTruthy();
expect(views.length).toBeGreaterThan(0);
const view1 = views.find((table) => table.name === 'UserData');
expect(view1).toBeTruthy();
});
});

it('should create table', async () => {
await app.executeInTestTranscaction(async (context) => {
const db = context.db;
Expand Down
12 changes: 12 additions & 0 deletions src/SqliteAdapter.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ import { DataAdapterBase, DataAdapterIndexes, DataAdapterMigration, DataAdapterT
import { QueryExpression, SqlFormatter } from '@themost/query';
import {AsyncSeriesEventEmitter} from '@themost/events';

export declare interface DataAdapterTables {
list(callback: (err: Error, result: { name: string }[]) => void): void;
listAsync(): Promise<{ name: string }[]>;
}

export declare interface DataAdapterViews {
list(callback: (err: Error, result: { name: string }[]) => void): void;
listAsync(): Promise<{ name: string }[]>;
}

export declare class SqliteAdapter implements DataAdapterBase {
executing: AsyncSeriesEventEmitter<{target: SqliteAdapter, query: (string|QueryExpression), params?: unknown[]}>;
executed: AsyncSeriesEventEmitter<{target: SqliteAdapter, query: (string|QueryExpression), params?: unknown[], results: uknown[]}>;
Expand Down Expand Up @@ -32,7 +42,9 @@ export declare class SqliteAdapter implements DataAdapterBase {
lastIdentity(callback: (err: Error, value: any) => void): void;
lastIdentityAsync(): Promise<any>;
table(table: string): DataAdapterTable;
tables(): DataAdapterTables;
view(view: string): DataAdapterView;
views(): DataAdapterViews;
indexes(table: string): DataAdapterIndexes;
getFormatter(): SqlFormatter;
}
64 changes: 64 additions & 0 deletions src/SqliteAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,70 @@ class SqliteAdapter {
};
}

/**
*
* @returns {import('./SqliteAdapter').DataAdapterTables}
*/
tables() {
const self = this;
return {
/**
* @param {function} callback
* @returns void
*/
list: function(callback) {
void self.execute('SELECT name FROM sqlite_master WHERE type=\'table\'', null, (err, results) => {
if (err) {
return callback(err);
}
return callback(null, results);
});
},
listAsync: function() {
return new Promise((resolve, reject) => {
this.list((err, value) => {
if (err) {
return reject(err);
}
return resolve(value);
});
});
}
}
}

/**
*
* @returns {import('./SqliteAdapter').DataAdapterViews}
*/
views() {
const self = this;
return {
/**
* @param {function} callback
* @returns void
*/
list: function(callback) {
void self.execute('SELECT name FROM sqlite_master WHERE type=\'view\'', null, (err, results) => {
if (err) {
return callback(err);
}
return callback(null, results);
});
},
listAsync: function() {
return new Promise((resolve, reject) => {
this.list((err, value) => {
if (err) {
return reject(err);
}
return resolve(value);
});
});
}
}
}

@before(({target, args}, callback) => {
const [query, params] = args;
void target.executing.emit({
Expand Down