@orchestr-sh/orchestr 1.5.0 → 1.5.1
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/Database/Adapters/DrizzleAdapter.d.ts +1 -0
- package/dist/Database/Adapters/DrizzleAdapter.d.ts.map +1 -1
- package/dist/Database/Adapters/DrizzleAdapter.js +66 -13
- package/dist/Database/Adapters/DrizzleAdapter.js.map +1 -1
- package/dist/Database/DatabaseServiceProvider.js +1 -1
- package/dist/Database/DatabaseServiceProvider.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,7 @@ import { DatabaseAdapter, DatabaseConfig, QueryResult } from '../Contracts/Datab
|
|
|
7
7
|
export declare class DrizzleAdapter implements DatabaseAdapter {
|
|
8
8
|
protected config: DatabaseConfig;
|
|
9
9
|
protected client: any;
|
|
10
|
+
protected rawClient: any;
|
|
10
11
|
protected connected: boolean;
|
|
11
12
|
protected inTransaction: boolean;
|
|
12
13
|
protected transactionClient: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrizzleAdapter.d.ts","sourceRoot":"","sources":["../../../src/Database/Adapters/DrizzleAdapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE5F,qBAAa,cAAe,YAAW,eAAe;
|
|
1
|
+
{"version":3,"file":"DrizzleAdapter.d.ts","sourceRoot":"","sources":["../../../src/Database/Adapters/DrizzleAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,6 +42,7 @@ exports.DrizzleAdapter = void 0;
|
|
|
42
42
|
class DrizzleAdapter {
|
|
43
43
|
config;
|
|
44
44
|
client;
|
|
45
|
+
rawClient;
|
|
45
46
|
connected = false;
|
|
46
47
|
inTransaction = false;
|
|
47
48
|
transactionClient;
|
|
@@ -84,7 +85,7 @@ class DrizzleAdapter {
|
|
|
84
85
|
async connectPostgres() {
|
|
85
86
|
const { drizzle } = await Promise.resolve().then(() => __importStar(require('drizzle-orm/postgres-js')));
|
|
86
87
|
const postgres = await Promise.resolve().then(() => __importStar(require('postgres')));
|
|
87
|
-
const
|
|
88
|
+
const rawClient = postgres.default({
|
|
88
89
|
host: this.config.host,
|
|
89
90
|
port: this.config.port,
|
|
90
91
|
database: this.config.database,
|
|
@@ -92,7 +93,8 @@ class DrizzleAdapter {
|
|
|
92
93
|
password: this.config.password,
|
|
93
94
|
max: this.config.poolMax || 10,
|
|
94
95
|
});
|
|
95
|
-
this.
|
|
96
|
+
this.rawClient = rawClient;
|
|
97
|
+
this.client = drizzle(rawClient);
|
|
96
98
|
}
|
|
97
99
|
/**
|
|
98
100
|
* Connect to MySQL
|
|
@@ -100,7 +102,7 @@ class DrizzleAdapter {
|
|
|
100
102
|
async connectMySQL() {
|
|
101
103
|
const { drizzle } = await Promise.resolve().then(() => __importStar(require('drizzle-orm/mysql2')));
|
|
102
104
|
const mysql = await Promise.resolve().then(() => __importStar(require('mysql2/promise')));
|
|
103
|
-
const
|
|
105
|
+
const rawClient = await mysql.createPool({
|
|
104
106
|
host: this.config.host,
|
|
105
107
|
port: this.config.port,
|
|
106
108
|
database: this.config.database,
|
|
@@ -108,7 +110,8 @@ class DrizzleAdapter {
|
|
|
108
110
|
password: this.config.password,
|
|
109
111
|
connectionLimit: this.config.poolMax || 10,
|
|
110
112
|
});
|
|
111
|
-
this.
|
|
113
|
+
this.rawClient = rawClient;
|
|
114
|
+
this.client = drizzle(rawClient);
|
|
112
115
|
}
|
|
113
116
|
/**
|
|
114
117
|
* Connect to SQLite
|
|
@@ -116,8 +119,9 @@ class DrizzleAdapter {
|
|
|
116
119
|
async connectSQLite() {
|
|
117
120
|
const { drizzle } = await Promise.resolve().then(() => __importStar(require('drizzle-orm/better-sqlite3')));
|
|
118
121
|
const Database = await Promise.resolve().then(() => __importStar(require('better-sqlite3')));
|
|
119
|
-
const
|
|
120
|
-
this.
|
|
122
|
+
const rawClient = new Database.default(this.config.database);
|
|
123
|
+
this.rawClient = rawClient;
|
|
124
|
+
this.client = drizzle(rawClient);
|
|
121
125
|
}
|
|
122
126
|
/**
|
|
123
127
|
* Disconnect from the database
|
|
@@ -126,10 +130,25 @@ class DrizzleAdapter {
|
|
|
126
130
|
if (!this.connected) {
|
|
127
131
|
return;
|
|
128
132
|
}
|
|
129
|
-
//
|
|
130
|
-
|
|
133
|
+
// Close the raw client connection if possible
|
|
134
|
+
if (this.rawClient) {
|
|
135
|
+
switch (this.config.driver) {
|
|
136
|
+
case 'postgres':
|
|
137
|
+
await this.rawClient.end?.();
|
|
138
|
+
break;
|
|
139
|
+
case 'mysql':
|
|
140
|
+
case 'mysql2':
|
|
141
|
+
await this.rawClient.end?.();
|
|
142
|
+
break;
|
|
143
|
+
case 'better-sqlite3':
|
|
144
|
+
case 'sqlite':
|
|
145
|
+
this.rawClient.close?.();
|
|
146
|
+
break;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
131
149
|
this.connected = false;
|
|
132
150
|
this.client = null;
|
|
151
|
+
this.rawClient = null;
|
|
133
152
|
}
|
|
134
153
|
/**
|
|
135
154
|
* Execute a raw SQL query
|
|
@@ -137,9 +156,26 @@ class DrizzleAdapter {
|
|
|
137
156
|
async query(sql, bindings = []) {
|
|
138
157
|
this.ensureConnected();
|
|
139
158
|
try {
|
|
140
|
-
const client = this.inTransaction ? this.transactionClient : this.
|
|
141
|
-
|
|
142
|
-
|
|
159
|
+
const client = this.inTransaction ? this.transactionClient : this.rawClient;
|
|
160
|
+
const boundSql = this.bindParameters(sql, bindings);
|
|
161
|
+
let result;
|
|
162
|
+
// Execute based on driver type
|
|
163
|
+
switch (this.config.driver) {
|
|
164
|
+
case 'postgres':
|
|
165
|
+
result = await client.unsafe(boundSql);
|
|
166
|
+
break;
|
|
167
|
+
case 'mysql':
|
|
168
|
+
case 'mysql2':
|
|
169
|
+
const [rows] = await client.execute(boundSql);
|
|
170
|
+
result = rows;
|
|
171
|
+
break;
|
|
172
|
+
case 'better-sqlite3':
|
|
173
|
+
case 'sqlite':
|
|
174
|
+
result = client.prepare(boundSql).all();
|
|
175
|
+
break;
|
|
176
|
+
default:
|
|
177
|
+
throw new Error(`Unsupported database driver: ${this.config.driver}`);
|
|
178
|
+
}
|
|
143
179
|
return {
|
|
144
180
|
rows: Array.isArray(result) ? result : result.rows || [],
|
|
145
181
|
rowCount: Array.isArray(result) ? result.length : result.rowCount || 0,
|
|
@@ -162,8 +198,25 @@ class DrizzleAdapter {
|
|
|
162
198
|
async insert(sql, bindings = []) {
|
|
163
199
|
this.ensureConnected();
|
|
164
200
|
try {
|
|
165
|
-
const client = this.inTransaction ? this.transactionClient : this.
|
|
166
|
-
const
|
|
201
|
+
const client = this.inTransaction ? this.transactionClient : this.rawClient;
|
|
202
|
+
const boundSql = this.bindParameters(sql, bindings);
|
|
203
|
+
let result;
|
|
204
|
+
// Execute based on driver type
|
|
205
|
+
switch (this.config.driver) {
|
|
206
|
+
case 'postgres':
|
|
207
|
+
result = await client.unsafe(boundSql);
|
|
208
|
+
break;
|
|
209
|
+
case 'mysql':
|
|
210
|
+
case 'mysql2':
|
|
211
|
+
[result] = await client.execute(boundSql);
|
|
212
|
+
break;
|
|
213
|
+
case 'better-sqlite3':
|
|
214
|
+
case 'sqlite':
|
|
215
|
+
result = client.prepare(boundSql).run();
|
|
216
|
+
break;
|
|
217
|
+
default:
|
|
218
|
+
throw new Error(`Unsupported database driver: ${this.config.driver}`);
|
|
219
|
+
}
|
|
167
220
|
// Return the inserted ID
|
|
168
221
|
return result.insertId || result.lastInsertRowid || result.rows?.[0]?.id;
|
|
169
222
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrizzleAdapter.js","sourceRoot":"","sources":["../../../src/Database/Adapters/DrizzleAdapter.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIH,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"DrizzleAdapter.js","sourceRoot":"","sources":["../../../src/Database/Adapters/DrizzleAdapter.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIH,MAAa,cAAc;IAOH;IANZ,MAAM,CAAM;IACZ,SAAS,CAAM;IACf,SAAS,GAAY,KAAK,CAAC;IAC3B,aAAa,GAAY,KAAK,CAAC;IAC/B,iBAAiB,CAAM;IAEjC,YAAsB,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAG,CAAC;IAEhD;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,oDAAoD;YACpD,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC3B,KAAK,UAAU;oBACb,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC7B,MAAM;gBACR,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ;oBACX,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;oBAC1B,MAAM;gBACR,KAAK,gBAAgB,CAAC;gBACtB,KAAK,QAAQ;oBACX,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;oBAC3B,MAAM;gBACR;oBACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1E,CAAC;YAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,kCAAkC,KAAK,EAAE,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,eAAe;QAC7B,MAAM,EAAE,OAAO,EAAE,GAAG,wDAAa,yBAAyB,GAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,wDAAa,UAAU,GAAC,CAAC;QAE1C,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC;YACjC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,YAAY;QAC1B,MAAM,EAAE,OAAO,EAAE,GAAG,wDAAa,oBAAoB,GAAC,CAAC;QACvD,MAAM,KAAK,GAAG,wDAAa,gBAAgB,GAAC,CAAC;QAE7C,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;YACvC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC1B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE;SAC3C,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,aAAa;QAC3B,MAAM,EAAE,OAAO,EAAE,GAAG,wDAAa,4BAA4B,GAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,wDAAa,gBAAgB,GAAC,CAAC;QAEhD,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,8CAA8C;QAC9C,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC3B,KAAK,UAAU;oBACb,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC;oBAC7B,MAAM;gBACR,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ;oBACX,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC;oBAC7B,MAAM;gBACR,KAAK,gBAAgB,CAAC;gBACtB,KAAK,QAAQ;oBACX,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC;oBACzB,MAAM;YACV,CAAC;QACH,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAU,GAAW,EAAE,WAAkB,EAAE;QACpD,IAAI,CAAC,eAAe,EAAE,CAAC;QAEvB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;YAC5E,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAEpD,IAAI,MAAW,CAAC;YAEhB,+BAA+B;YAC/B,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC3B,KAAK,UAAU;oBACb,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ;oBACX,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAC9C,MAAM,GAAG,IAAI,CAAC;oBACd,MAAM;gBACR,KAAK,gBAAgB,CAAC;gBACtB,KAAK,QAAQ;oBACX,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;oBACxC,MAAM;gBACR;oBACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1E,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE;gBACxD,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC;aACvE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,EAAE,OAAO,IAAI,KAAK,UAAU,GAAG,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAU,GAAW,EAAE,WAAkB,EAAE;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAI,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,WAAkB,EAAE;QAC5C,IAAI,CAAC,eAAe,EAAE,CAAC;QAEvB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;YAC5E,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAEpD,IAAI,MAAW,CAAC;YAEhB,+BAA+B;YAC/B,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC3B,KAAK,UAAU;oBACb,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ;oBACX,CAAC,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,gBAAgB,CAAC;gBACtB,KAAK,QAAQ;oBACX,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;oBACxC,MAAM;gBACR;oBACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1E,CAAC;YAED,yBAAyB;YACzB,OAAO,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC3E,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,OAAO,IAAI,KAAK,UAAU,GAAG,EAAE,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,WAAkB,EAAE;QAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,WAAkB,EAAE;QAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,eAAe,EAAE,CAAC;QAEvB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAE1B,kDAAkD;QAClD,6EAA6E;QAC7E,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM;QACV,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAI,QAAkD;QACrE,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;YACpC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,SAAiB;QAClC,IAAI,CAAC,eAAe,EAAE,CAAC;QAEvB,kCAAkC;QAClC,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC3B,KAAK,UAAU;gBACb,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAC9C,KAAK,OAAO,CAAC;YACb,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAC3C,KAAK,gBAAgB,CAAC;YACtB,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC5C;gBACE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,oBAAoB,CAAC,SAAiB;QACpD,MAAM,GAAG,GAAG;;;;;KAKX,CAAC;QACF,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,iBAAiB,CAAC,SAAiB;QACjD,MAAM,GAAG,GAAG,YAAY,SAAS,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,kBAAkB,CAAC,SAAiB;QAClD,MAAM,GAAG,GAAG,qBAAqB,SAAS,GAAG,CAAC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,IAAI,CAAC,eAAe,EAAE,CAAC;QAEvB,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC3B,KAAK,UAAU;gBACb,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAClC,KAAK,OAAO,CAAC;YACb,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;YAC/B,KAAK,gBAAgB,CAAC;YACtB,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;YAChC;gBACE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,iBAAiB;QAC/B,MAAM,GAAG,GAAG;;;;;KAKX,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAM,GAAG,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,cAAc;QAC5B,MAAM,GAAG,GAAG,aAAa,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAM,GAAG,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAW,CAAC,CAAC;IAC9D,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,eAAe;QAC7B,MAAM,GAAG,GAAG;;;;;KAKX,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAM,GAAG,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACO,cAAc,CAAC,GAAW,EAAE,WAAkB,EAAE;QACxD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC;QACb,CAAC;QAED,4CAA4C;QAC5C,kFAAkF;QAClF,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE;YAC7B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YAEhC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1C,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC;YAC1C,CAAC;YAED,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAC3B,CAAC;YAED,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBAC1B,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;YACpC,CAAC;YAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACO,eAAe;QACvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;CACF;AA5bD,wCA4bC"}
|
|
@@ -15,7 +15,7 @@ class DatabaseServiceProvider extends ServiceProvider_1.ServiceProvider {
|
|
|
15
15
|
*/
|
|
16
16
|
register() {
|
|
17
17
|
this.app.singleton('db', () => {
|
|
18
|
-
const config = this.app.make('config')?.database || {
|
|
18
|
+
const config = this.app.make('config').items?.database || {
|
|
19
19
|
default: 'sqlite',
|
|
20
20
|
connections: {
|
|
21
21
|
sqlite: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseServiceProvider.js","sourceRoot":"","sources":["../../src/Database/DatabaseServiceProvider.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,mEAAgE;AAChE,uDAAoD;AACpD,8DAA2D;AAE3D,MAAa,uBAAwB,SAAQ,iCAAe;IAC1D;;OAEG;IACH,QAAQ;QACN,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE;YAC5B,MAAM,MAAM,GAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAS,EAAE,QAAQ,IAAI;
|
|
1
|
+
{"version":3,"file":"DatabaseServiceProvider.js","sourceRoot":"","sources":["../../src/Database/DatabaseServiceProvider.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,mEAAgE;AAChE,uDAAoD;AACpD,8DAA2D;AAE3D,MAAa,uBAAwB,SAAQ,iCAAe;IAC1D;;OAEG;IACH,QAAQ;QACN,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE;YAC5B,MAAM,MAAM,GAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAS,CAAC,KAAK,EAAE,QAAQ,IAAI;gBACjE,OAAO,EAAE,QAAQ;gBACjB,WAAW,EAAE;oBACX,MAAM,EAAE;wBACN,OAAO,EAAE,SAAS;wBAClB,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,UAAU;qBACrB;iBACF;aACF,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAC;YAE5C,2BAA2B;YAC3B,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC,CAAC;YAE3E,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,oDAAoD;QACpD,mDAAmD;QACnD,mCAAmC;IACrC,CAAC;CACF;AAlCD,0DAkCC"}
|
package/package.json
CHANGED