namirasoft-node-sequelize 1.4.1 → 1.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/BaseFilterItemBuilderSequelize.d.ts +1 -0
- package/dist/BaseFilterItemBuilderSequelize.js +3 -0
- package/dist/BaseFilterItemBuilderSequelize.js.map +1 -1
- package/dist/BaseSequelizeDatabase.d.ts +10 -1
- package/dist/BaseSequelizeDatabase.js +13 -0
- package/dist/BaseSequelizeDatabase.js.map +1 -1
- package/dist/BaseSequelizeTable.js +5 -13
- package/dist/BaseSequelizeTable.js.map +1 -1
- package/package.json +4 -4
- package/src/BaseDB2Database.ts +8 -8
- package/src/BaseFilterItemBuilderSequelize.ts +123 -119
- package/src/BaseMSSQLDatabase.ts +8 -8
- package/src/BaseMariaDBDatabase.ts +8 -8
- package/src/BaseMySqlDatabase.ts +8 -8
- package/src/BaseOracleDatabase.ts +8 -8
- package/src/BasePostgreSQLDatabase.ts +8 -8
- package/src/BaseSQLiteDatabase.ts +8 -8
- package/src/BaseSequelizeDatabase.ts +135 -114
- package/src/BaseSequelizeModel.ts +4 -4
- package/src/BaseSequelizeModelAttributeColumnOptions.ts +10 -10
- package/src/BaseSequelizeModelAttributes.ts +5 -5
- package/src/BaseSequelizeTable.ts +274 -284
- package/src/BaseSnowFlakeDatabase.ts +8 -8
- package/src/index.ts +13 -13
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import sequelize, { WhereOptions } from "sequelize";
|
|
2
2
|
import { BaseFilterItemBuilder_JoinTable, BaseFilterItemBuilderDatabase } from "namirasoft-node";
|
|
3
3
|
export declare class BaseFilterItemBuilderSequelize extends BaseFilterItemBuilderDatabase<WhereOptions> {
|
|
4
|
+
escapeValue(value: string): string;
|
|
4
5
|
getAdvancedSearchConditions(columns: string[], search: string): Promise<sequelize.WhereOptions[]>;
|
|
5
6
|
getIn(column_name: string, not: boolean, values: string[]): {
|
|
6
7
|
condition: sequelize.WhereAttributeHash<any>;
|
|
@@ -46,6 +46,9 @@ exports.BaseFilterItemBuilderSequelize = void 0;
|
|
|
46
46
|
const sequelize_1 = __importStar(require("sequelize"));
|
|
47
47
|
const namirasoft_node_1 = require("namirasoft-node");
|
|
48
48
|
class BaseFilterItemBuilderSequelize extends namirasoft_node_1.BaseFilterItemBuilderDatabase {
|
|
49
|
+
escapeValue(value) {
|
|
50
|
+
return value;
|
|
51
|
+
}
|
|
49
52
|
getAdvancedSearchConditions(columns, search) {
|
|
50
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
51
54
|
let database = this.database;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseFilterItemBuilderSequelize.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderSequelize.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAwD;AACxD,qDAAiG;AAIjG,MAAa,8BAA+B,SAAQ,+CAA2C;
|
|
1
|
+
{"version":3,"file":"BaseFilterItemBuilderSequelize.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderSequelize.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
|
-
import { Transaction } from 'sequelize';
|
|
2
1
|
import { Sequelize, Dialect, WhereOptions, Order } from "sequelize";
|
|
3
2
|
import { BaseDatabase, BaseFilterItemBuilder_JoinTable } from "namirasoft-node";
|
|
4
3
|
import { FilterItem, SortItem } from "namirasoft-core";
|
|
5
4
|
import { BaseSequelizeTable } from "./BaseSequelizeTable";
|
|
5
|
+
import { BaseApplication } from "namirasoft-node";
|
|
6
|
+
import { Transaction } from "sequelize";
|
|
7
|
+
export interface BaseSequelizeDatabaseSeedable<Model> {
|
|
8
|
+
getOrNull(id: string | undefined, trx: Transaction | null): Promise<Model | null>;
|
|
9
|
+
create(product: Model, trx: Transaction | null): Promise<Model>;
|
|
10
|
+
update(product: Model, trx: Transaction | null): Promise<number[]>;
|
|
11
|
+
}
|
|
6
12
|
export declare abstract class BaseSequelizeDatabase extends BaseDatabase {
|
|
7
13
|
sequelize: Sequelize;
|
|
8
14
|
private dialect;
|
|
@@ -16,4 +22,7 @@ export declare abstract class BaseSequelizeDatabase extends BaseDatabase {
|
|
|
16
22
|
}, filters?: FilterItem[] | undefined): Promise<WhereOptions[]>;
|
|
17
23
|
getAdvancedSearchConditions(columns: string[], search: string): WhereOptions[];
|
|
18
24
|
getSortOptions(sorts?: SortItem[] | undefined): Order;
|
|
25
|
+
protected sead<Model extends {
|
|
26
|
+
id: string;
|
|
27
|
+
}>(app: BaseApplication<any>, file_path: string, seedable_table: BaseSequelizeDatabaseSeedable<Model>): Promise<void>;
|
|
19
28
|
}
|
|
@@ -98,6 +98,19 @@ class BaseSequelizeDatabase extends namirasoft_node_1.BaseDatabase {
|
|
|
98
98
|
});
|
|
99
99
|
return ans;
|
|
100
100
|
}
|
|
101
|
+
sead(app, file_path, seedable_table) {
|
|
102
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
103
|
+
let items = app.read(file_path);
|
|
104
|
+
for (let i = 0; i < items.length; i++) {
|
|
105
|
+
const item = items[i];
|
|
106
|
+
let product = yield seedable_table.getOrNull(item.id, null);
|
|
107
|
+
if (product === null)
|
|
108
|
+
yield seedable_table.create(item, null);
|
|
109
|
+
else
|
|
110
|
+
yield seedable_table.update(item, null);
|
|
111
|
+
}
|
|
112
|
+
});
|
|
113
|
+
}
|
|
101
114
|
}
|
|
102
115
|
exports.BaseSequelizeDatabase = BaseSequelizeDatabase;
|
|
103
116
|
//# sourceMappingURL=BaseSequelizeDatabase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseSequelizeDatabase.js","sourceRoot":"","sources":["../src/BaseSequelizeDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"BaseSequelizeDatabase.js","sourceRoot":"","sources":["../src/BaseSequelizeDatabase.ts"],"names":[],"mappings":"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"}
|
|
@@ -232,22 +232,14 @@ class BaseSequelizeTable extends namirasoft_node_1.BaseTable {
|
|
|
232
232
|
}
|
|
233
233
|
_list(where, pagination, sorts, options, trx) {
|
|
234
234
|
return __awaiter(this, void 0, void 0, function* () {
|
|
235
|
-
let offset = undefined;
|
|
236
|
-
let limit = undefined;
|
|
237
235
|
if (!('dont' in pagination)) {
|
|
238
236
|
let p = this.database.paginate(pagination.page, pagination.size);
|
|
239
|
-
offset = p.offset;
|
|
240
|
-
limit = p.limit;
|
|
237
|
+
options.offset = p.offset;
|
|
238
|
+
options.limit = p.limit;
|
|
241
239
|
}
|
|
242
|
-
if (!('dont' in sorts))
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
throw new Error("options.order and sorts must not be provided together.");
|
|
246
|
-
}
|
|
247
|
-
else
|
|
248
|
-
options.order = this.database.getSortOptions(sorts);
|
|
249
|
-
}
|
|
250
|
-
return yield this.model.findAndCountAll(Object.assign(Object.assign({ where, offset, limit }, options), { distinct: true, subQuery: false, transaction: trx }));
|
|
240
|
+
if (!('dont' in sorts))
|
|
241
|
+
options.order = this.database.getSortOptions(sorts);
|
|
242
|
+
return yield this.model.findAndCountAll(Object.assign(Object.assign({}, options), { where, distinct: true, subQuery: false, transaction: trx }));
|
|
251
243
|
});
|
|
252
244
|
}
|
|
253
245
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseSequelizeTable.js","sourceRoot":"","sources":["../src/BaseSequelizeTable.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BaseSequelizeTable.js","sourceRoot":"","sources":["../src/BaseSequelizeTable.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.4.
|
|
11
|
+
"version": "1.4.3",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/index.js",
|
|
@@ -17,9 +17,9 @@
|
|
|
17
17
|
"build": ""
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@types/node": "^24.0
|
|
21
|
-
"namirasoft-core": "^1.4.
|
|
22
|
-
"namirasoft-node": "^1.4.
|
|
20
|
+
"@types/node": "^24.1.0",
|
|
21
|
+
"namirasoft-core": "^1.4.79",
|
|
22
|
+
"namirasoft-node": "^1.4.106",
|
|
23
23
|
"sequelize": "^6.37.7"
|
|
24
24
|
}
|
|
25
25
|
}
|
package/src/BaseDB2Database.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
-
|
|
3
|
-
export abstract class BaseDB2Database extends BaseSequelizeDatabase
|
|
4
|
-
{
|
|
5
|
-
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
-
{
|
|
7
|
-
super('db2', host, port, name, user, pass, logging);
|
|
8
|
-
}
|
|
1
|
+
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
+
|
|
3
|
+
export abstract class BaseDB2Database extends BaseSequelizeDatabase
|
|
4
|
+
{
|
|
5
|
+
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
+
{
|
|
7
|
+
super('db2', host, port, name, user, pass, logging);
|
|
8
|
+
}
|
|
9
9
|
}
|
|
@@ -1,120 +1,124 @@
|
|
|
1
|
-
import sequelize, { Op, WhereOptions } from "sequelize";
|
|
2
|
-
import { BaseFilterItemBuilder_JoinTable, BaseFilterItemBuilderDatabase } from "namirasoft-node";
|
|
3
|
-
import { BaseSequelizeTable } from "./BaseSequelizeTable";
|
|
4
|
-
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
5
|
-
|
|
6
|
-
export class BaseFilterItemBuilderSequelize extends BaseFilterItemBuilderDatabase<WhereOptions>
|
|
7
|
-
{
|
|
8
|
-
override
|
|
9
|
-
{
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
1
|
+
import sequelize, { Op, WhereOptions } from "sequelize";
|
|
2
|
+
import { BaseFilterItemBuilder_JoinTable, BaseFilterItemBuilderDatabase } from "namirasoft-node";
|
|
3
|
+
import { BaseSequelizeTable } from "./BaseSequelizeTable";
|
|
4
|
+
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
5
|
+
|
|
6
|
+
export class BaseFilterItemBuilderSequelize extends BaseFilterItemBuilderDatabase<WhereOptions>
|
|
7
|
+
{
|
|
8
|
+
override escapeValue(value: string)
|
|
9
|
+
{
|
|
10
|
+
return value;
|
|
11
|
+
}
|
|
12
|
+
override async getAdvancedSearchConditions(columns: string[], search: string)
|
|
13
|
+
{
|
|
14
|
+
let database = this.database as BaseSequelizeDatabase;
|
|
15
|
+
return database.getAdvancedSearchConditions(columns, search);
|
|
16
|
+
}
|
|
17
|
+
override getIn(column_name: string, not: boolean, values: string[])
|
|
18
|
+
{
|
|
19
|
+
let condition: WhereOptions = {};
|
|
20
|
+
condition[column_name] = not ? { [Op.notIn]: values } : { [Op.in]: values };
|
|
21
|
+
return { condition };
|
|
22
|
+
}
|
|
23
|
+
override getLike(column_name: string, not: boolean, value: string)
|
|
24
|
+
{
|
|
25
|
+
let condition: WhereOptions = {};
|
|
26
|
+
condition[column_name] = not ? { [Op.notLike]: `%${value}%` } : { [Op.like]: `%${value}%` };
|
|
27
|
+
return { condition };
|
|
28
|
+
}
|
|
29
|
+
override getRegex(column_name: string, not: boolean, value: string)
|
|
30
|
+
{
|
|
31
|
+
let condition: WhereOptions = {};
|
|
32
|
+
condition[column_name] = not ? { [Op.notRegexp]: value } : { [Op.regexp]: value };
|
|
33
|
+
return { condition };
|
|
34
|
+
}
|
|
35
|
+
override getEmpty(column_name: string, not: boolean)
|
|
36
|
+
{
|
|
37
|
+
let condition: WhereOptions = {};
|
|
38
|
+
if (!not)
|
|
39
|
+
{
|
|
40
|
+
condition = {
|
|
41
|
+
[Op.or]: [
|
|
42
|
+
{ [column_name]: { [Op.is]: null } },
|
|
43
|
+
{ [column_name]: '' }
|
|
44
|
+
]
|
|
45
|
+
} as WhereOptions;
|
|
46
|
+
}
|
|
47
|
+
else
|
|
48
|
+
condition[column_name] = { [Op.and]: [{ [Op.ne]: null }, { [Op.ne]: '' }] };
|
|
49
|
+
return { condition };
|
|
50
|
+
}
|
|
51
|
+
override getExists(column_name: string, not: boolean)
|
|
52
|
+
{
|
|
53
|
+
let condition: WhereOptions = {};
|
|
54
|
+
condition[column_name] = { [Op.and]: [{ [Op.ne]: null }, { [Op.ne]: '' }] };
|
|
55
|
+
if (!not)
|
|
56
|
+
return { condition };
|
|
57
|
+
return { condition, independant: { not } };
|
|
58
|
+
}
|
|
59
|
+
override getIncludes(column_name: string, not: boolean, values: string[])
|
|
60
|
+
{
|
|
61
|
+
let condition: WhereOptions = {};
|
|
62
|
+
condition[column_name] = { [Op.in]: values };
|
|
63
|
+
if (!not)
|
|
64
|
+
return { condition };
|
|
65
|
+
return { condition, independant: { not } };
|
|
66
|
+
}
|
|
67
|
+
override getStartsWith(column_name: string, not: boolean, value: string)
|
|
68
|
+
{
|
|
69
|
+
let condition: WhereOptions = {};
|
|
70
|
+
condition[column_name] = not ? { [Op.notLike]: `${value}%` } : { [Op.like]: `${value}%` };
|
|
71
|
+
return { condition };
|
|
72
|
+
}
|
|
73
|
+
override getEndsWith(column_name: string, not: boolean, value: string)
|
|
74
|
+
{
|
|
75
|
+
let condition: WhereOptions = {};
|
|
76
|
+
condition[column_name] = not ? { [Op.notLike]: `%${value}` } : { [Op.like]: `%${value}` };
|
|
77
|
+
return { condition };
|
|
78
|
+
}
|
|
79
|
+
override getLT(column_name: string, value: any)
|
|
80
|
+
{
|
|
81
|
+
let condition: WhereOptions = {};
|
|
82
|
+
condition[column_name] = { [Op.lt]: value };
|
|
83
|
+
return { condition };
|
|
84
|
+
}
|
|
85
|
+
override getLTE(column_name: string, value: any)
|
|
86
|
+
{
|
|
87
|
+
let condition: WhereOptions = {};
|
|
88
|
+
condition[column_name] = { [Op.lte]: value };
|
|
89
|
+
return { condition };
|
|
90
|
+
}
|
|
91
|
+
override getGT(column_name: string, value: any)
|
|
92
|
+
{
|
|
93
|
+
let condition: WhereOptions = {};
|
|
94
|
+
condition[column_name] = { [Op.gt]: value };
|
|
95
|
+
return { condition };
|
|
96
|
+
}
|
|
97
|
+
override getGTE(column_name: string, value: any)
|
|
98
|
+
{
|
|
99
|
+
let condition: WhereOptions = {};
|
|
100
|
+
condition[column_name] = { [Op.gte]: value };
|
|
101
|
+
return { condition };
|
|
102
|
+
}
|
|
103
|
+
override async getInSelect(table_name: string, not: boolean, join: BaseFilterItemBuilder_JoinTable<WhereOptions>, conditions: WhereOptions[])
|
|
104
|
+
{
|
|
105
|
+
let select = await new Promise<string>(resolve =>
|
|
106
|
+
{
|
|
107
|
+
let t = this.database.getTable(table_name);
|
|
108
|
+
let table = t as BaseSequelizeTable<BaseSequelizeDatabase, any>;
|
|
109
|
+
table.model.findAll({
|
|
110
|
+
where: { [Op.and]: conditions },
|
|
111
|
+
attributes: [join.secondary.column],
|
|
112
|
+
logging(sql)
|
|
113
|
+
{
|
|
114
|
+
let q = sql.substring(sql.indexOf("SELECT"));
|
|
115
|
+
if (q.endsWith(";"))
|
|
116
|
+
q = q.slice(0, -1);
|
|
117
|
+
resolve(q);
|
|
118
|
+
},
|
|
119
|
+
});
|
|
120
|
+
});
|
|
121
|
+
let query = `${join.main.column} ${not ? "NOT" : ""} IN (${select})`;
|
|
122
|
+
return sequelize.literal(query);
|
|
123
|
+
}
|
|
120
124
|
}
|
package/src/BaseMSSQLDatabase.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
-
|
|
3
|
-
export abstract class BaseMSSQLDatabase extends BaseSequelizeDatabase
|
|
4
|
-
{
|
|
5
|
-
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
-
{
|
|
7
|
-
super('mssql', host, port, name, user, pass, logging);
|
|
8
|
-
}
|
|
1
|
+
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
+
|
|
3
|
+
export abstract class BaseMSSQLDatabase extends BaseSequelizeDatabase
|
|
4
|
+
{
|
|
5
|
+
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
+
{
|
|
7
|
+
super('mssql', host, port, name, user, pass, logging);
|
|
8
|
+
}
|
|
9
9
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
-
|
|
3
|
-
export abstract class BaseMariaDBDatabase extends BaseSequelizeDatabase
|
|
4
|
-
{
|
|
5
|
-
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
-
{
|
|
7
|
-
super('mariadb', host, port, name, user, pass, logging);
|
|
8
|
-
}
|
|
1
|
+
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
+
|
|
3
|
+
export abstract class BaseMariaDBDatabase extends BaseSequelizeDatabase
|
|
4
|
+
{
|
|
5
|
+
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
+
{
|
|
7
|
+
super('mariadb', host, port, name, user, pass, logging);
|
|
8
|
+
}
|
|
9
9
|
}
|
package/src/BaseMySqlDatabase.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
-
|
|
3
|
-
export abstract class BaseMySqlDatabase extends BaseSequelizeDatabase
|
|
4
|
-
{
|
|
5
|
-
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
-
{
|
|
7
|
-
super('mysql', host, port, name, user, pass, logging);
|
|
8
|
-
}
|
|
1
|
+
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
+
|
|
3
|
+
export abstract class BaseMySqlDatabase extends BaseSequelizeDatabase
|
|
4
|
+
{
|
|
5
|
+
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
+
{
|
|
7
|
+
super('mysql', host, port, name, user, pass, logging);
|
|
8
|
+
}
|
|
9
9
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
-
|
|
3
|
-
export abstract class BaseOracleDatabase extends BaseSequelizeDatabase
|
|
4
|
-
{
|
|
5
|
-
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
-
{
|
|
7
|
-
super('oracle', host, port, name, user, pass, logging);
|
|
8
|
-
}
|
|
1
|
+
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
+
|
|
3
|
+
export abstract class BaseOracleDatabase extends BaseSequelizeDatabase
|
|
4
|
+
{
|
|
5
|
+
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
+
{
|
|
7
|
+
super('oracle', host, port, name, user, pass, logging);
|
|
8
|
+
}
|
|
9
9
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
-
|
|
3
|
-
export abstract class BasePostgreSQLDatabase extends BaseSequelizeDatabase
|
|
4
|
-
{
|
|
5
|
-
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
-
{
|
|
7
|
-
super('postgres', host, port, name, user, pass, logging);
|
|
8
|
-
}
|
|
1
|
+
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
+
|
|
3
|
+
export abstract class BasePostgreSQLDatabase extends BaseSequelizeDatabase
|
|
4
|
+
{
|
|
5
|
+
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
+
{
|
|
7
|
+
super('postgres', host, port, name, user, pass, logging);
|
|
8
|
+
}
|
|
9
9
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
-
|
|
3
|
-
export abstract class BaseSQLiteDatabase extends BaseSequelizeDatabase
|
|
4
|
-
{
|
|
5
|
-
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
-
{
|
|
7
|
-
super('sqlite', host, port, name, user, pass, logging);
|
|
8
|
-
}
|
|
1
|
+
import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
|
|
2
|
+
|
|
3
|
+
export abstract class BaseSQLiteDatabase extends BaseSequelizeDatabase
|
|
4
|
+
{
|
|
5
|
+
constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
|
|
6
|
+
{
|
|
7
|
+
super('sqlite', host, port, name, user, pass, logging);
|
|
8
|
+
}
|
|
9
9
|
}
|