@simplysm/orm-common 13.0.26 → 13.0.28
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/create-db-context.d.ts.map +1 -1
- package/dist/create-db-context.js +0 -2
- package/dist/create-db-context.js.map +1 -1
- package/dist/ddl/initialize.d.ts +3 -3
- package/dist/ddl/initialize.d.ts.map +1 -1
- package/dist/ddl/initialize.js +4 -4
- package/dist/ddl/initialize.js.map +1 -1
- package/dist/define-db-context.d.ts +4 -1
- package/dist/define-db-context.d.ts.map +1 -1
- package/dist/define-db-context.js +2 -1
- package/dist/define-db-context.js.map +1 -1
- package/dist/models/system-migration.d.ts +1 -1
- package/dist/models/system-migration.d.ts.map +1 -1
- package/dist/models/system-migration.js +2 -2
- package/dist/models/system-migration.js.map +1 -1
- package/dist/types/db-context-def.d.ts +1 -1
- package/dist/types/db-context-def.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/create-db-context.ts +0 -4
- package/src/ddl/initialize.ts +7 -7
- package/src/define-db-context.ts +3 -2
- package/src/models/system-migration.ts +1 -1
- package/src/types/db-context-def.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-db-context.d.ts","sourceRoot":"","sources":["../src/create-db-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAkC,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC9G,OAAO,KAAK,EAAc,iBAAiB,EAA8B,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"create-db-context.d.ts","sourceRoot":"","sources":["../src/create-db-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAkC,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC9G,OAAO,KAAK,EAAc,iBAAiB,EAA8B,MAAM,YAAY,CAAC;AAsB5F;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,eAAe,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EACtE,GAAG,EAAE,IAAI,EACT,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACzC,iBAAiB,CAAC,IAAI,CAAC,CAqTzB"}
|
|
@@ -5,7 +5,6 @@ import { ViewBuilder } from "./schema/view-builder.js";
|
|
|
5
5
|
import { queryable } from "./exec/queryable.js";
|
|
6
6
|
import { executable } from "./exec/executable.js";
|
|
7
7
|
import { objClearUndefined } from "@simplysm/core-common";
|
|
8
|
-
import { SystemMigration } from "./models/system-migration.js";
|
|
9
8
|
import * as tableDdl from "./ddl/table-ddl.js";
|
|
10
9
|
import * as columnDdl from "./ddl/column-ddl.js";
|
|
11
10
|
import * as relationDdl from "./ddl/relation-ddl.js";
|
|
@@ -274,7 +273,6 @@ function createDbContext(def, executor, opt) {
|
|
|
274
273
|
for (const [key, proc] of Object.entries(def.meta.procedures)) {
|
|
275
274
|
db[key] = executable(base, proc);
|
|
276
275
|
}
|
|
277
|
-
db.systemMigration = queryable(db, SystemMigration);
|
|
278
276
|
return db;
|
|
279
277
|
}
|
|
280
278
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/create-db-context.ts"],
|
|
4
|
-
"mappings": "AAGA,SAAS,iBAAiB;AAC1B,SAAS,aAAa,0BAA0B;AAChD,SAAS,oBAAoB;AAC7B,SAAS,mBAAmB;AAE5B,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAC3B,SAAS,yBAAyB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/ddl/initialize.d.ts
CHANGED
|
@@ -17,11 +17,11 @@ import type { Queryable } from "../exec/queryable";
|
|
|
17
17
|
* 동작 방식:
|
|
18
18
|
* - **force=true**: clearSchema → 전체 생성 → 모든 migration "적용됨" 등록
|
|
19
19
|
* - **force=false** (기본):
|
|
20
|
-
* -
|
|
21
|
-
* -
|
|
20
|
+
* - _Migration 테이블 없음: 전체 생성 + 모든 migration 등록
|
|
21
|
+
* - _Migration 테이블 있음: 미적용 migration만 실행
|
|
22
22
|
*/
|
|
23
23
|
export declare function initialize(db: DbContextBase & DbContextDdlMethods & {
|
|
24
|
-
|
|
24
|
+
_migration: () => Queryable<{
|
|
25
25
|
code: string;
|
|
26
26
|
}, any>;
|
|
27
27
|
}, def: DbContextDef<any, any, any>, options?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/ddl/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAenD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,aAAa,GAAG,mBAAmB,GAAG;IAAE,
|
|
1
|
+
{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/ddl/initialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAenD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,aAAa,GAAG,mBAAmB,GAAG;IAAE,UAAU,EAAE,MAAM,SAAS,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,CAAC,CAAA;CAAE,EAChG,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAChC,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5C,OAAO,CAAC,IAAI,CAAC,CA6Df;AA+ED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAyBxE"}
|
package/dist/ddl/initialize.js
CHANGED
|
@@ -31,12 +31,12 @@ async function initialize(db, def, options) {
|
|
|
31
31
|
}
|
|
32
32
|
await createAllObjects(db, def);
|
|
33
33
|
if (def.meta.migrations.length > 0) {
|
|
34
|
-
await db.
|
|
34
|
+
await db._migration().insert(def.meta.migrations.map((m) => ({ code: m.name })));
|
|
35
35
|
}
|
|
36
36
|
} else {
|
|
37
37
|
let appliedMigrations;
|
|
38
38
|
try {
|
|
39
|
-
appliedMigrations = await db.
|
|
39
|
+
appliedMigrations = await db._migration().result();
|
|
40
40
|
} catch (err) {
|
|
41
41
|
if (!isTableNotExistsError(err)) {
|
|
42
42
|
throw err;
|
|
@@ -45,14 +45,14 @@ async function initialize(db, def, options) {
|
|
|
45
45
|
if (appliedMigrations == null) {
|
|
46
46
|
await createAllObjects(db, def);
|
|
47
47
|
if (def.meta.migrations.length > 0) {
|
|
48
|
-
await db.
|
|
48
|
+
await db._migration().insert(def.meta.migrations.map((m) => ({ code: m.name })));
|
|
49
49
|
}
|
|
50
50
|
} else {
|
|
51
51
|
const appliedCodes = new Set(appliedMigrations.map((m) => m.code));
|
|
52
52
|
const pendingMigrations = def.meta.migrations.filter((m) => !appliedCodes.has(m.name));
|
|
53
53
|
for (const migration of pendingMigrations) {
|
|
54
54
|
await migration.up(db);
|
|
55
|
-
await db.
|
|
55
|
+
await db._migration().insert([{ code: migration.name }]);
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/ddl/initialize.ts"],
|
|
4
|
-
"mappings": "AAGA,SAAS,oBAAoB;AAC7B,SAAS,mBAAmB;AAC5B,SAAS,wBAAwB;AACjC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,+BAA+B;AACxC,SAAS,kBAAkB,yBAAyB;AACpD,SAAS,wBAAwB,+BAA+B;AAsBhE,eAAsB,WACpB,IACA,KACA,SACe;AACf,QAAM,WAAU,mCAAS,SAAQ,GAAG,aAAa,SAAY,CAAC,GAAG,QAAQ,IAAI,CAAC;AAC9E,MAAI,QAAQ,SAAS,GAAG;AACtB,UAAM,IAAI,MAAM,+FAAoB;AAAA,EACtC;AAEA,QAAM,SAAQ,mCAAS,UAAS;AAGhC,aAAW,UAAU,SAAS;AAC5B,UAAM,kBAAkB,wBAAwB,QAAQ,GAAG,MAAM;AACjE,UAAM,SAAS,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC;AACrD,UAAM,eAAe,OAAO,CAAC,EAAE,SAAS;AACxC,QAAI,CAAC,cAAc;AACjB,YAAM,IAAI,MAAM,yCAAW,MAAM,4DAAe;AAAA,IAClD;AAAA,EACF;AAEA,MAAI,OAAO;AAET,eAAW,UAAU,SAAS;AAC5B,YAAM,WAAW,uBAAuB,EAAE,UAAU,QAAQ,QAAQ,GAAG,OAAO,CAAC;AAC/E,YAAM,GAAG,YAAY,CAAC,QAAQ,CAAC;AAAA,IACjC;AACA,UAAM,iBAAiB,IAAI,GAAG;AAG9B,QAAI,IAAI,KAAK,WAAW,SAAS,GAAG;AAClC,YAAM,GAAG,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,10 +3,13 @@ import type { ViewBuilder } from "./schema/view-builder";
|
|
|
3
3
|
import type { ProcedureBuilder } from "./schema/procedure-builder";
|
|
4
4
|
import type { Migration } from "./types/db";
|
|
5
5
|
import type { DbContextDef } from "./types/db-context-def";
|
|
6
|
+
import { _Migration } from "./models/system-migration";
|
|
6
7
|
export declare function defineDbContext<TTables extends Record<string, TableBuilder<any, any>> = {}, TViews extends Record<string, ViewBuilder<any, any, any>> = {}, TProcedures extends Record<string, ProcedureBuilder<any, any>> = {}>(config: {
|
|
7
8
|
tables?: TTables;
|
|
8
9
|
views?: TViews;
|
|
9
10
|
procedures?: TProcedures;
|
|
10
11
|
migrations?: Migration[];
|
|
11
|
-
}): DbContextDef<TTables
|
|
12
|
+
}): DbContextDef<TTables & {
|
|
13
|
+
_migration: typeof _Migration;
|
|
14
|
+
}, TViews, TProcedures>;
|
|
12
15
|
//# sourceMappingURL=define-db-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define-db-context.d.ts","sourceRoot":"","sources":["../src/define-db-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"define-db-context.d.ts","sourceRoot":"","sources":["../src/define-db-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,wBAAgB,eAAe,CAC7B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAC3D,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAC9D,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EACnE,MAAM,EAAE;IACR,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;CAC1B,GAAG,YAAY,CAAC,OAAO,GAAG;IAAE,UAAU,EAAE,OAAO,UAAU,CAAA;CAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CASjF"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { _Migration } from "./models/system-migration.js";
|
|
1
2
|
function defineDbContext(config) {
|
|
2
3
|
return {
|
|
3
4
|
meta: {
|
|
4
|
-
tables: config.tables ?? {},
|
|
5
|
+
tables: { ...config.tables ?? {}, _migration: _Migration },
|
|
5
6
|
views: config.views ?? {},
|
|
6
7
|
procedures: config.procedures ?? {},
|
|
7
8
|
migrations: config.migrations ?? []
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/define-db-context.ts"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "AAKA,SAAS,kBAAkB;AAEpB,SAAS,gBAId,QAKiF;AACjF,SAAO;AAAA,IACL,MAAM;AAAA,MACJ,QAAQ,EAAE,GAAI,OAAO,UAAU,CAAC,GAAI,YAAY,WAAW;AAAA,MAC3D,OAAQ,OAAO,SAAS,CAAC;AAAA,MACzB,YAAa,OAAO,cAAc,CAAC;AAAA,MACnC,YAAY,OAAO,cAAc,CAAC;AAAA,IACpC;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-migration.d.ts","sourceRoot":"","sources":["../../src/models/system-migration.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"system-migration.d.ts","sourceRoot":"","sources":["../../src/models/system-migration.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU;;;;;;;;sCAKF,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Table } from "../schema/table-builder.js";
|
|
2
|
-
const
|
|
2
|
+
const _Migration = Table("_Migration").columns((c) => ({
|
|
3
3
|
code: c.varchar(255)
|
|
4
4
|
})).description("System Migration Table").primaryKey("code");
|
|
5
5
|
export {
|
|
6
|
-
|
|
6
|
+
_Migration
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=system-migration.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/models/system-migration.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa;AAEf,MAAM,
|
|
4
|
+
"mappings": "AAAA,SAAS,aAAa;AAEf,MAAM,aAAa,MAAM,YAAY,EACzC,QAAQ,CAAC,OAAO;AAAA,EACf,MAAM,EAAE,QAAQ,GAAG;AACrB,EAAE,EACD,YAAY,wBAAwB,EACpC,WAAW,MAAM;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -50,7 +50,7 @@ export type DbContextInstance<TDef extends DbContextDef<any, any, any>> = DbCont
|
|
|
50
50
|
} & {
|
|
51
51
|
[K in keyof TDef["meta"]["procedures"]]: () => import("../exec/executable").Executable<TDef["meta"]["procedures"][K]["$params"], TDef["meta"]["procedures"][K]["$returns"]>;
|
|
52
52
|
} & {
|
|
53
|
-
|
|
53
|
+
_migration: () => import("../exec/queryable").Queryable<{
|
|
54
54
|
code: string;
|
|
55
55
|
}, any>;
|
|
56
56
|
initialize(options?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-context-def.d.ts","sourceRoot":"","sources":["../../src/types/db-context-def.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEhE;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,IAAI,MAAM,CAAC;IACvB,iBAAiB,IAAI,IAAI,CAAC;IAC1B,WAAW,CAAC,CAAC,GAAG,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACxG,qBAAqB,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC;IAC5G,QAAQ,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,IAAI,GAAG,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;AAE/D;;;;GAIG;AACH,MAAM,WAAW,YAAY,CAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACtD,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EACzD,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE;IAEnE,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;QACjC,QAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC;KAClC,CAAC;CACH;AAED;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,aAAa,GACrF,0BAA0B,GAC1B,mBAAmB,GAAG;KAEnB,CAAC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,OAAO,mBAAmB,EAAE,SAAS,CAC9E,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EACnC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAC1B;CACF,GAAG;KAED,CAAC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,OAAO,mBAAmB,EAAE,SAAS,CAC7E,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAClC,KAAK,CACN;CACF,GAAG;KAED,CAAC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,GAAG,MAAM,OAAO,oBAAoB,EAAE,UAAU,CACpF,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EACxC,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAC1C;CACF,GAAG;IAEF,
|
|
1
|
+
{"version":3,"file":"db-context-def.d.ts","sourceRoot":"","sources":["../../src/types/db-context-def.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/orm-common",
|
|
3
|
-
"version": "13.0.
|
|
3
|
+
"version": "13.0.28",
|
|
4
4
|
"description": "심플리즘 패키지 - ORM 모듈 (common)",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -19,6 +19,6 @@
|
|
|
19
19
|
],
|
|
20
20
|
"sideEffects": false,
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@simplysm/core-common": "13.0.
|
|
22
|
+
"@simplysm/core-common": "13.0.28"
|
|
23
23
|
}
|
|
24
24
|
}
|
package/src/create-db-context.ts
CHANGED
|
@@ -9,7 +9,6 @@ import type { ProcedureBuilder } from "./schema/procedure-builder";
|
|
|
9
9
|
import { queryable } from "./exec/queryable";
|
|
10
10
|
import { executable } from "./exec/executable";
|
|
11
11
|
import { objClearUndefined } from "@simplysm/core-common";
|
|
12
|
-
import { SystemMigration } from "./models/system-migration";
|
|
13
12
|
|
|
14
13
|
// DDL imports
|
|
15
14
|
import * as tableDdl from "./ddl/table-ddl";
|
|
@@ -361,8 +360,5 @@ export function createDbContext<TDef extends DbContextDef<any, any, any>>(
|
|
|
361
360
|
(db as any)[key] = executable(base, proc as ProcedureBuilder<any, any>);
|
|
362
361
|
}
|
|
363
362
|
|
|
364
|
-
// ── Add System table ──
|
|
365
|
-
(db as any).systemMigration = queryable(db as any, SystemMigration);
|
|
366
|
-
|
|
367
363
|
return db as DbContextInstance<TDef>;
|
|
368
364
|
}
|
package/src/ddl/initialize.ts
CHANGED
|
@@ -31,11 +31,11 @@ import { getClearSchemaQueryDef, getSchemaExistsQueryDef } from "./schema-ddl";
|
|
|
31
31
|
* 동작 방식:
|
|
32
32
|
* - **force=true**: clearSchema → 전체 생성 → 모든 migration "적용됨" 등록
|
|
33
33
|
* - **force=false** (기본):
|
|
34
|
-
* -
|
|
35
|
-
* -
|
|
34
|
+
* - _Migration 테이블 없음: 전체 생성 + 모든 migration 등록
|
|
35
|
+
* - _Migration 테이블 있음: 미적용 migration만 실행
|
|
36
36
|
*/
|
|
37
37
|
export async function initialize(
|
|
38
|
-
db: DbContextBase & DbContextDdlMethods & {
|
|
38
|
+
db: DbContextBase & DbContextDdlMethods & { _migration: () => Queryable<{ code: string }, any> },
|
|
39
39
|
def: DbContextDef<any, any, any>,
|
|
40
40
|
options?: { dbs?: string[]; force?: boolean },
|
|
41
41
|
): Promise<void> {
|
|
@@ -66,13 +66,13 @@ export async function initialize(
|
|
|
66
66
|
|
|
67
67
|
// 모든 migration을 "적용됨"으로 등록
|
|
68
68
|
if (def.meta.migrations.length > 0) {
|
|
69
|
-
await db.
|
|
69
|
+
await db._migration().insert(def.meta.migrations.map((m) => ({ code: m.name })));
|
|
70
70
|
}
|
|
71
71
|
} else {
|
|
72
72
|
// 3. Migration 기반 초기화
|
|
73
73
|
let appliedMigrations: { code: string }[] | undefined;
|
|
74
74
|
try {
|
|
75
|
-
appliedMigrations = await db.
|
|
75
|
+
appliedMigrations = await db._migration().result();
|
|
76
76
|
} catch (err) {
|
|
77
77
|
// 테이블 없음 = 신규 환경
|
|
78
78
|
if (!isTableNotExistsError(err)) {
|
|
@@ -86,7 +86,7 @@ export async function initialize(
|
|
|
86
86
|
|
|
87
87
|
// 모든 migration을 "적용됨"으로 등록
|
|
88
88
|
if (def.meta.migrations.length > 0) {
|
|
89
|
-
await db.
|
|
89
|
+
await db._migration().insert(def.meta.migrations.map((m) => ({ code: m.name })));
|
|
90
90
|
}
|
|
91
91
|
} else {
|
|
92
92
|
// 기존 환경: 미적용 migration만 실행
|
|
@@ -95,7 +95,7 @@ export async function initialize(
|
|
|
95
95
|
|
|
96
96
|
for (const migration of pendingMigrations) {
|
|
97
97
|
await migration.up(db);
|
|
98
|
-
await db.
|
|
98
|
+
await db._migration().insert([{ code: migration.name }]);
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
}
|
package/src/define-db-context.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { ViewBuilder } from "./schema/view-builder";
|
|
|
3
3
|
import type { ProcedureBuilder } from "./schema/procedure-builder";
|
|
4
4
|
import type { Migration } from "./types/db";
|
|
5
5
|
import type { DbContextDef } from "./types/db-context-def";
|
|
6
|
+
import { _Migration } from "./models/system-migration";
|
|
6
7
|
|
|
7
8
|
export function defineDbContext<
|
|
8
9
|
TTables extends Record<string, TableBuilder<any, any>> = {},
|
|
@@ -13,10 +14,10 @@ export function defineDbContext<
|
|
|
13
14
|
views?: TViews;
|
|
14
15
|
procedures?: TProcedures;
|
|
15
16
|
migrations?: Migration[];
|
|
16
|
-
}): DbContextDef<TTables, TViews, TProcedures> {
|
|
17
|
+
}): DbContextDef<TTables & { _migration: typeof _Migration }, TViews, TProcedures> {
|
|
17
18
|
return {
|
|
18
19
|
meta: {
|
|
19
|
-
tables: (config.tables ?? {}) as TTables,
|
|
20
|
+
tables: { ...(config.tables ?? {}), _migration: _Migration } as TTables & { _migration: typeof _Migration },
|
|
20
21
|
views: (config.views ?? {}) as TViews,
|
|
21
22
|
procedures: (config.procedures ?? {}) as TProcedures,
|
|
22
23
|
migrations: config.migrations ?? [],
|
|
@@ -73,7 +73,7 @@ export type DbContextInstance<TDef extends DbContextDef<any, any, any>> = DbCont
|
|
|
73
73
|
>;
|
|
74
74
|
} & {
|
|
75
75
|
// System table
|
|
76
|
-
|
|
76
|
+
_migration: () => import("../exec/queryable").Queryable<{ code: string }, any>;
|
|
77
77
|
// Initialization
|
|
78
78
|
initialize(options?: { dbs?: string[]; force?: boolean }): Promise<void>;
|
|
79
79
|
};
|