@dimah-s3/db 2.0.0-beta.0 → 2.0.0-beta.2

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.
Files changed (81) hide show
  1. package/README.md +3 -3
  2. package/dist/adapters/drizzle.d.ts +2 -1
  3. package/dist/adapters/drizzle.d.ts.map +1 -1
  4. package/dist/cli.d.ts +8 -9
  5. package/dist/cli.d.ts.map +1 -1
  6. package/dist/cli.js +42 -103
  7. package/dist/cli.js.map +1 -1
  8. package/dist/client/db-client.d.ts +1 -1
  9. package/dist/client/db-client.d.ts.map +1 -1
  10. package/dist/client/db-object-source.d.ts +5 -4
  11. package/dist/client/db-object-source.d.ts.map +1 -1
  12. package/dist/client/index.d.ts +1 -1
  13. package/dist/client/index.d.ts.map +1 -1
  14. package/dist/client/index.js +27 -12
  15. package/dist/client/index.js.map +1 -1
  16. package/dist/drizzle/mysql.d.ts +46 -13
  17. package/dist/drizzle/mysql.d.ts.map +1 -1
  18. package/dist/drizzle/mysql.js +15 -18
  19. package/dist/drizzle/mysql.js.map +1 -1
  20. package/dist/drizzle/pg.d.ts +44 -13
  21. package/dist/drizzle/pg.d.ts.map +1 -1
  22. package/dist/drizzle/pg.js +17 -17
  23. package/dist/drizzle/pg.js.map +1 -1
  24. package/dist/drizzle/shared.d.ts +4 -13
  25. package/dist/drizzle/shared.d.ts.map +1 -1
  26. package/dist/drizzle/sqlite.d.ts +46 -13
  27. package/dist/drizzle/sqlite.d.ts.map +1 -1
  28. package/dist/drizzle/sqlite.js +17 -17
  29. package/dist/drizzle/sqlite.js.map +1 -1
  30. package/dist/folder-path.d.ts +9 -2
  31. package/dist/folder-path.d.ts.map +1 -1
  32. package/dist/fuma-db.d.ts +10 -30
  33. package/dist/fuma-db.d.ts.map +1 -1
  34. package/dist/index.d.ts +1 -1
  35. package/dist/index.d.ts.map +1 -1
  36. package/dist/index.js +372 -231
  37. package/dist/index.js.map +1 -1
  38. package/dist/plugin/create-database-endpoints.d.ts +38 -18
  39. package/dist/plugin/create-database-endpoints.d.ts.map +1 -1
  40. package/dist/plugin/create-database-lifecycle-hooks.d.ts +1 -1
  41. package/dist/plugin/create-database-lifecycle-hooks.d.ts.map +1 -1
  42. package/dist/plugin/db.d.ts.map +1 -1
  43. package/dist/plugin/object-access.d.ts +1 -1
  44. package/dist/plugin/object-access.d.ts.map +1 -1
  45. package/dist/plugin/public-stores.d.ts +4 -7
  46. package/dist/plugin/public-stores.d.ts.map +1 -1
  47. package/dist/plugin/schemas.d.ts +21 -12
  48. package/dist/plugin/schemas.d.ts.map +1 -1
  49. package/dist/plugin/to-db-client-object.d.ts.map +1 -1
  50. package/dist/schema/{v2.d.ts → schema.d.ts} +23 -13
  51. package/dist/schema/schema.d.ts.map +1 -0
  52. package/dist/store/create-db-store.d.ts +2 -2
  53. package/dist/store/folder-store.d.ts +41 -14
  54. package/dist/store/folder-store.d.ts.map +1 -1
  55. package/dist/store/list-cursor.d.ts +1 -1
  56. package/dist/store/list-cursor.d.ts.map +1 -1
  57. package/dist/store/map-row.d.ts +2 -2
  58. package/dist/store/map-row.d.ts.map +1 -1
  59. package/dist/store/object-store.d.ts +9 -9
  60. package/dist/store/object-store.d.ts.map +1 -1
  61. package/dist/store/schema-version.d.ts +1 -1
  62. package/dist/types/client.d.ts +47 -18
  63. package/dist/types/client.d.ts.map +1 -1
  64. package/dist/types/plugin.d.ts +6 -1
  65. package/dist/types/plugin.d.ts.map +1 -1
  66. package/dist/types/storage-object.d.ts +8 -7
  67. package/dist/types/storage-object.d.ts.map +1 -1
  68. package/package.json +9 -6
  69. package/prisma/dimah-s3.prisma +14 -13
  70. package/sql/mysql.sql +12 -11
  71. package/sql/pg.sql +10 -10
  72. package/sql/sqlite.sql +10 -9
  73. package/src/drizzle/mysql.ts +175 -0
  74. package/src/drizzle/pg.ts +146 -0
  75. package/src/drizzle/sqlite.ts +150 -0
  76. package/dist/schema/v1.d.ts +0 -24
  77. package/dist/schema/v1.d.ts.map +0 -1
  78. package/dist/schema/v2.d.ts.map +0 -1
  79. package/sql/upgrade/1.0.0-2.0.0/mysql.sql +0 -71
  80. package/sql/upgrade/1.0.0-2.0.0/pg.sql +0 -47
  81. package/sql/upgrade/1.0.0-2.0.0/sqlite.sql +0 -119
@@ -12,8 +12,8 @@ export type DbClientObject<TClientAttributes = never> = {
12
12
  bucket: string;
13
13
  key: string;
14
14
  route: string;
15
- /** Logical folder path. `null` is the root. */
16
- folder: string | null;
15
+ /** Folder that holds the object. `null` is the root. */
16
+ folderId: string | null;
17
17
  filename: string;
18
18
  contentType: string | null;
19
19
  /** Verified size. `null` while the object is pending. */
@@ -28,12 +28,16 @@ export type DbClientObject<TClientAttributes = never> = {
28
28
  };
29
29
  /** Browser-facing folder row. */
30
30
  export type DbClientFolder = {
31
- path: string;
31
+ id: string;
32
32
  name: string;
33
- /** Path of the containing folder. `null` is the root. */
34
- parent: string | null;
33
+ /** Containing folder. `null` is the root. */
34
+ parentId: string | null;
35
+ /** Full path, from the root. It changes when an ancestor is renamed. */
36
+ path: string;
35
37
  /** ISO 8601 timestamp. */
36
38
  createdAt: string;
39
+ /** ISO 8601 timestamp. */
40
+ updatedAt: string;
37
41
  };
38
42
  /** Column a listing can be ordered by. */
39
43
  export type DbListSortField = "createdAt" | "updatedAt" | "size" | "filename";
@@ -64,7 +68,7 @@ export type DbClientListInput = {
64
68
  * Folder to list. `null` (or `""`) is the root. Omit for a flat list of
65
69
  * every folder.
66
70
  */
67
- folder?: string | null;
71
+ folderId?: string | null;
68
72
  route?: S3RouteName;
69
73
  /** @default "active" */
70
74
  status?: DbClientObjectStatus;
@@ -92,10 +96,15 @@ export type DbClientListResponse<TClientAttributes = never> = {
92
96
  /** `null` on the last page. */
93
97
  nextCursor: string | null;
94
98
  /**
95
- * Direct child folders of `folder`, at most 1000, and only those whose
99
+ * Direct child folders of `folderId`, at most 1000, and only those whose
96
100
  * name contains `search` when it is set. First page only.
97
101
  */
98
102
  folders?: DbClientFolder[];
103
+ /**
104
+ * Folders from the root down to the open folder. Empty at the root.
105
+ * First page only, and only when `folderId` is set.
106
+ */
107
+ trail?: DbClientFolder[];
99
108
  /** First page only. */
100
109
  usage?: DbUsage;
101
110
  /** Caps for the scope, `null` when there are none. First page only. */
@@ -109,17 +118,29 @@ export type DbClientGetInput = {
109
118
  /** Body of `PATCH /db/object`. Omitted fields stay as they are. */
110
119
  export type DbClientUpdateInput = DbClientGetInput & {
111
120
  filename?: string;
112
- /** Folder path. `null` moves the object to the root. */
113
- folder?: string | null;
121
+ /** Folder id. `null` moves the object to the root. */
122
+ folderId?: string | null;
114
123
  /**
115
124
  * Replaces the attributes, checked by the plugin's `attributes.schema`.
116
125
  * `null` clears them.
117
126
  */
118
127
  attributes?: Record<string, unknown> | null;
119
128
  };
120
- /** Body of `POST /db/folder` and query of `DELETE /db/folder`. */
121
- export type DbClientFolderInput = {
122
- path: string;
129
+ /** Body of `POST /db/folder`. `parentId` omitted or `null` is the root. */
130
+ export type DbClientCreateFolderInput = {
131
+ parentId?: string | null;
132
+ name: string;
133
+ };
134
+ /** Body of `PATCH /db/folder`. An omitted field stays as it is. */
135
+ export type DbClientUpdateFolderInput = {
136
+ id: string;
137
+ name?: string;
138
+ /** `null` moves the folder to the root. */
139
+ parentId?: string | null;
140
+ };
141
+ /** Query of `DELETE /db/folder`. */
142
+ export type DbClientDeleteFolderInput = {
143
+ id: string;
123
144
  };
124
145
  /**
125
146
  * The db endpoints as client actions (`api.db`). Each takes the same
@@ -133,11 +154,14 @@ export type DbClientActions<TClientAttributes = never> = {
133
154
  updateObject(input: DbClientUpdateInput, options?: S3RequestOptions): Promise<{
134
155
  object: DbClientObject<TClientAttributes>;
135
156
  }>;
136
- createFolder(input: DbClientFolderInput, options?: S3RequestOptions): Promise<{
157
+ createFolder(input: DbClientCreateFolderInput, options?: S3RequestOptions): Promise<{
137
158
  folder: DbClientFolder;
138
159
  }>;
139
- deleteFolder(input: DbClientFolderInput, options?: S3RequestOptions): Promise<{
140
- path: string;
160
+ updateFolder(input: DbClientUpdateFolderInput, options?: S3RequestOptions): Promise<{
161
+ folder: DbClientFolder;
162
+ }>;
163
+ deleteFolder(input: DbClientDeleteFolderInput, options?: S3RequestOptions): Promise<{
164
+ id: string;
141
165
  }>;
142
166
  };
143
167
  /** Filters `dbObjectSource` sends with every page. */
@@ -152,14 +176,14 @@ export type DbObjectSourceOptions = {
152
176
  /** List one folder at a time, with folder rows. @default true */
153
177
  folders?: boolean;
154
178
  };
155
- /** A folder row of {@link DbObjectSource}. `id` is the folder path. */
179
+ /** A folder row of {@link DbObjectSource}. `id` is the folder id. */
156
180
  export type DbObjectSourceFolder = {
157
181
  id: string;
158
182
  name: string;
159
183
  };
160
184
  /** The `useObjectList` query input. Mirrors react's `ObjectListQueryInput`. */
161
185
  export type DbObjectSourceQueryInput = {
162
- /** Folder path. `null` is the root. */
186
+ /** Folder id. `null` is the root. */
163
187
  parent: string | null;
164
188
  cursor: string | null;
165
189
  /** `name`, `size`, or `updatedAt`. Other fields keep the default order. */
@@ -175,6 +199,11 @@ export type DbObjectSourcePage<TClientAttributes = never> = {
175
199
  items: DbClientObject<TClientAttributes>[];
176
200
  /** First page only. */
177
201
  folders?: DbObjectSourceFolder[];
202
+ /**
203
+ * Folders from the root down to `parent`. First page only.
204
+ * `useObjectList` shows these names in the breadcrumb.
205
+ */
206
+ trail?: DbObjectSourceFolder[];
178
207
  nextCursor: string | null;
179
208
  /** Scope usage with its caps. First page only. */
180
209
  usage?: DbUsage & DbQuota;
@@ -196,7 +225,7 @@ export type DbObjectSource<TClientAttributes = never> = {
196
225
  query: (input: DbObjectSourceQueryInput) => Promise<DbObjectSourcePage<TClientAttributes>>;
197
226
  getKey: (item: DbClientObject<TClientAttributes>) => string;
198
227
  getFile: (item: DbClientObject<TClientAttributes>) => DbObjectSourceFile;
199
- /** Upload options for files dropped into `parent`. Root is `""`. */
228
+ /** Upload options for files dropped into `parent`. The root sends `""`. */
200
229
  uploadOptions?: (parent: string | null) => {
201
230
  metadata: Record<string, string>;
202
231
  };
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/types/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/types/client.ts"],"names":[],"mappings":"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"}
@@ -41,8 +41,13 @@ export type AuthorizeContext<TSession = undefined, TAttributes = never> = ScopeC
41
41
  scope: string;
42
42
  /** Object key. Absent on `list` and the folder endpoints. */
43
43
  key?: string;
44
- /** Target folder of an upload, move, or folder endpoint. `null` is the root. */
44
+ /**
45
+ * Path of the target folder. `null` is the root. Absent when the call is
46
+ * not aimed at one folder. A rename or move reports the destination.
47
+ */
45
48
  folder?: string | null;
49
+ /** Id of the target folder. `null` is the root. */
50
+ folderId?: string | null;
46
51
  /** Client extras of the upload. Set on `upload` only. */
47
52
  clientMetadata?: Record<string, string>;
48
53
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/types/plugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/types/plugin.ts"],"names":[],"mappings":"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"}
@@ -18,8 +18,8 @@ export type StorageObject<TAttributes = never> = {
18
18
  key: string;
19
19
  /** Named dimah-s3 route that created the object. */
20
20
  route: string;
21
- /** Logical folder path. `null` is the root. */
22
- folder: string | null;
21
+ /** Folder that holds the object. `null` is the root. */
22
+ folderId: string | null;
23
23
  filename: string;
24
24
  contentType: string | null;
25
25
  /** Verified size in bytes, set on confirm. */
@@ -47,16 +47,17 @@ export type StorageObject<TAttributes = never> = {
47
47
  updatedAt: Date;
48
48
  deletedAt: Date | null;
49
49
  };
50
- /** A `storage_folder` row. A folder exists once per scope and path. */
50
+ /** A `storage_folder` row. A folder exists once per scope and id. */
51
51
  export type StorageFolder = {
52
52
  id: string;
53
53
  scope: string;
54
- /** Full folder path. */
55
- path: string;
56
- /** Path of the containing folder. `null` is the root. */
57
- parent: string | null;
54
+ /** Containing folder. `null` is the root. */
55
+ parentId: string | null;
58
56
  /** Last segment of `path`. */
59
57
  name: string;
58
+ /** Full folder path, kept in step with `name` and the parents. */
59
+ path: string;
60
60
  createdAt: Date;
61
+ updatedAt: Date;
61
62
  };
62
63
  //# sourceMappingURL=storage-object.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"storage-object.d.ts","sourceRoot":"","sources":["../../src/types/storage-object.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAE/E;;;GAGG;AACH,MAAM,MAAM,aAAa,CAAC,WAAW,GAAG,KAAK,IAAI;IAC/C,EAAE,EAAE,MAAM,CAAC;IACX,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,oDAAoD;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,8CAA8C;IAC9C,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,8EAA8E;IAC9E,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAC1C,qEAAqE;IACrE,UAAU,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,oDAAoD;IACpD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;OAGG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,sEAAsE;IACtE,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF,uEAAuE;AACvE,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,wBAAwB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC"}
1
+ {"version":3,"file":"storage-object.d.ts","sourceRoot":"","sources":["../../src/types/storage-object.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAE/E;;;GAGG;AACH,MAAM,MAAM,aAAa,CAAC,WAAW,GAAG,KAAK,IAAI;IAC/C,EAAE,EAAE,MAAM,CAAC;IACX,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,oDAAoD;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,wDAAwD;IACxD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,8CAA8C;IAC9C,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,8EAA8E;IAC9E,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAC1C,qEAAqE;IACrE,UAAU,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,oDAAoD;IACpD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;OAGG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,sEAAsE;IACtE,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF,qEAAqE;AACrE,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,kEAAkE;IAClE,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dimah-s3/db",
3
- "version": "2.0.0-beta.0",
3
+ "version": "2.0.0-beta.2",
4
4
  "description": "Optional database plugin for dimah-s3 — track S3 object ownership, listings, and resumable uploads",
5
5
  "keywords": [
6
6
  "s3",
@@ -72,18 +72,21 @@
72
72
  "files": [
73
73
  "dist",
74
74
  "sql",
75
- "prisma"
75
+ "prisma",
76
+ "src/drizzle/sqlite.ts",
77
+ "src/drizzle/pg.ts",
78
+ "src/drizzle/mysql.ts"
76
79
  ],
77
80
  "dependencies": {
78
- "@dimah-s3/core": "2.0.0-beta.0",
81
+ "@dimah-s3/core": "2.0.0-beta.2",
79
82
  "@paralleldrive/cuid2": "^3.3.0",
80
83
  "fumadb": "~0.6.0",
81
84
  "zod": "^4.6.7"
82
85
  },
83
86
  "devDependencies": {
84
87
  "@aws-sdk/client-s3": "^3.1161.0",
85
- "@dimah-s3/react": "2.0.0-beta.0",
86
- "@dimah-s3/server": "2.0.0-beta.0",
88
+ "@dimah-s3/react": "2.0.0-beta.2",
89
+ "@dimah-s3/server": "2.0.0-beta.2",
87
90
  "@electric-sql/pglite": "^0.5.14",
88
91
  "@types/better-sqlite3": "^9.6.0",
89
92
  "@types/node": "^26.6.6",
@@ -103,7 +106,7 @@
103
106
  },
104
107
  "peerDependencies": {
105
108
  "@aws-sdk/client-s3": ">=3",
106
- "@dimah-s3/server": "2.0.0-beta.0",
109
+ "@dimah-s3/server": "2.0.0-beta.2",
107
110
  "@prisma/client": "^6.0.0 || ^7.0.0",
108
111
  "drizzle-orm": ">=1.0.0-rc.5 <2.0.0",
109
112
  "kysely": "^0.29.5"
@@ -1,4 +1,4 @@
1
- // Prisma models for @dimah-s3/db schema 2.0.0.
1
+ // Prisma models for @dimah-s3/db schema 2.1.0.
2
2
  //
3
3
  // Copy this file next to your schema (Prisma reads every .prisma file in the
4
4
  // schema folder) or paste the models into schema.prisma, then create the
@@ -7,9 +7,9 @@
7
7
  // `prisma.private_dimah_s3_settings`.
8
8
  //
9
9
  // The models work as they are on PostgreSQL and SQLite. On MySQL, match
10
- // `sql/mysql.sql`: add `@db.VarChar(1024)` to `key`, `folder`, `path` and
11
- // `parent`, `@db.DateTime(3)` to the timestamps, and index prefixes such as
12
- // `@@unique([bucket, key(length: 512)])`.
10
+ // `sql/mysql.sql`: add `@db.VarChar(1024)` to `key` and `path`,
11
+ // `@db.DateTime(3)` to the timestamps, and index prefixes such as
12
+ // `@@unique([bucket, key(length: 512)])`. `parentId` is `""` at the root.
13
13
 
14
14
  /// One row per tracked object: pending (presigned), active (confirmed),
15
15
  /// deleted (soft delete), or purging (a stale pending row purge has claimed).
@@ -21,8 +21,8 @@ model StorageObject {
21
21
  key String
22
22
  /// Named dimah-s3 route that created the object.
23
23
  route String
24
- /// Logical folder path. `null` is the root.
25
- folder String?
24
+ /// Folder that holds the object. `null` is the root.
25
+ folderId String? @map("folder_id")
26
26
  filename String
27
27
  contentType String? @map("content_type")
28
28
  /// Verified size from HeadObject, set on confirm.
@@ -48,7 +48,7 @@ model StorageObject {
48
48
  deletedAt DateTime? @map("deleted_at")
49
49
 
50
50
  @@unique([bucket, key], map: "storage_object_bucket_key_uk")
51
- @@index([scope, status, folder, createdAt], map: "storage_object_scope_folder_idx")
51
+ @@index([scope, status, folderId, createdAt], map: "storage_object_scope_folder_idx")
52
52
  @@index([scope, status, updatedAt], map: "storage_object_scope_updated_idx")
53
53
  @@index([scope, status, filename], map: "storage_object_scope_filename_idx")
54
54
  @@index([scope, status, size], map: "storage_object_scope_size_idx")
@@ -60,21 +60,22 @@ model StorageObject {
60
60
  model StorageFolder {
61
61
  id String @id @default(cuid())
62
62
  scope String
63
- /// Full folder path.
64
- path String
65
- /// Path of the containing folder. `null` is the root.
66
- parent String?
63
+ /// Id of the containing folder. `""` is the root.
64
+ parentId String @map("parent_id")
67
65
  /// Last segment of `path`.
68
66
  name String
67
+ /// Full folder path.
68
+ path String
69
69
  createdAt DateTime @default(now()) @map("created_at")
70
+ updatedAt DateTime @default(now()) @map("updated_at")
70
71
 
71
72
  @@unique([scope, path], map: "storage_folder_scope_path_uk")
72
- @@index([scope, parent], map: "storage_folder_scope_parent_idx")
73
+ @@unique([scope, parentId, name], map: "storage_folder_scope_parent_name_uk")
73
74
  @@map("storage_folder")
74
75
  }
75
76
 
76
77
  /// FumaDB settings. The adapter reads the schema version from the `version` row.
77
78
  model private_dimah_s3_settings {
78
79
  key String @id
79
- value String @default("2.0.0")
80
+ value String @default("2.1.0")
80
81
  }
package/sql/mysql.sql CHANGED
@@ -1,9 +1,9 @@
1
- -- @dimah-s3/db schema 2.0.0 for MySQL 8.
1
+ -- @dimah-s3/db schema 2.1.0 for MySQL 8.
2
2
  -- Keys, folders, and scopes compare byte for byte (utf8mb4_bin); file names
3
3
  -- use a case-insensitive collation for search. An InnoDB index holds at most
4
- -- 3072 bytes, so `key`, `folder`, `path`, and `parent` are indexed by prefix:
5
- -- two values that share their first 512 characters (255 for `folder`) share
6
- -- an index entry, and the unique keys treat them as equal.
4
+ -- 3072 bytes, so `key` and `path` are indexed by prefix: two values that
5
+ -- share their first 512 characters share an index entry, and the unique
6
+ -- keys treat them as equal. `parent_id` is `''` at the root.
7
7
 
8
8
  CREATE TABLE `storage_object` (
9
9
  `id` varchar(255) NOT NULL,
@@ -11,7 +11,7 @@ CREATE TABLE `storage_object` (
11
11
  `bucket` varchar(255) NOT NULL,
12
12
  `key` varchar(1024) NOT NULL,
13
13
  `route` varchar(255) NOT NULL,
14
- `folder` varchar(1024),
14
+ `folder_id` varchar(255),
15
15
  `filename` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
16
16
  `content_type` varchar(255),
17
17
  `size` bigint,
@@ -30,7 +30,7 @@ CREATE TABLE `storage_object` (
30
30
  `deleted_at` datetime(3),
31
31
  PRIMARY KEY (`id`),
32
32
  UNIQUE KEY `storage_object_bucket_key_uk` (`bucket`, `key`(512)),
33
- KEY `storage_object_scope_folder_idx` (`scope`, `status`, `folder`(255), `created_at`),
33
+ KEY `storage_object_scope_folder_idx` (`scope`, `status`, `folder_id`, `created_at`),
34
34
  KEY `storage_object_scope_updated_idx` (`scope`, `status`, `updated_at`),
35
35
  KEY `storage_object_scope_filename_idx` (`scope`, `status`, `filename`),
36
36
  KEY `storage_object_scope_size_idx` (`scope`, `status`, `size`),
@@ -40,20 +40,21 @@ CREATE TABLE `storage_object` (
40
40
  CREATE TABLE `storage_folder` (
41
41
  `id` varchar(255) NOT NULL,
42
42
  `scope` varchar(255) NOT NULL,
43
- `path` varchar(1024) NOT NULL,
44
- `parent` varchar(1024),
43
+ `parent_id` varchar(255) NOT NULL DEFAULT '',
45
44
  `name` varchar(255) NOT NULL,
45
+ `path` varchar(1024) NOT NULL,
46
46
  `created_at` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
47
+ `updated_at` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
47
48
  PRIMARY KEY (`id`),
48
49
  UNIQUE KEY `storage_folder_scope_path_uk` (`scope`, `path`(512)),
49
- KEY `storage_folder_scope_parent_idx` (`scope`, `parent`(512))
50
+ UNIQUE KEY `storage_folder_scope_parent_name_uk` (`scope`, `parent_id`, `name`)
50
51
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
51
52
 
52
53
  -- Schema version for the Kysely and Prisma adapters.
53
54
  CREATE TABLE `private_dimah_s3_settings` (
54
55
  `key` varchar(255) NOT NULL,
55
- `value` text NOT NULL DEFAULT ('2.0.0'),
56
+ `value` text NOT NULL DEFAULT ('2.1.0'),
56
57
  PRIMARY KEY (`key`)
57
58
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
58
59
 
59
- INSERT INTO `private_dimah_s3_settings` (`key`, `value`) VALUES ('version', '2.0.0');
60
+ INSERT INTO `private_dimah_s3_settings` (`key`, `value`) VALUES ('version', '2.1.0');
package/sql/pg.sql CHANGED
@@ -1,4 +1,4 @@
1
- -- @dimah-s3/db schema 2.0.0 for PostgreSQL.
1
+ -- @dimah-s3/db schema 2.1.0 for PostgreSQL.
2
2
 
3
3
  CREATE TABLE "storage_object" (
4
4
  "id" varchar(255) PRIMARY KEY NOT NULL,
@@ -6,7 +6,7 @@ CREATE TABLE "storage_object" (
6
6
  "bucket" text NOT NULL,
7
7
  "key" text NOT NULL,
8
8
  "route" text NOT NULL,
9
- "folder" text,
9
+ "folder_id" text,
10
10
  "filename" text NOT NULL,
11
11
  "content_type" text,
12
12
  "size" bigint,
@@ -26,7 +26,7 @@ CREATE TABLE "storage_object" (
26
26
  CONSTRAINT "storage_object_bucket_key_uk" UNIQUE ("bucket", "key")
27
27
  );
28
28
 
29
- CREATE INDEX "storage_object_scope_folder_idx" ON "storage_object" ("scope", "status", "folder", "created_at");
29
+ CREATE INDEX "storage_object_scope_folder_idx" ON "storage_object" ("scope", "status", "folder_id", "created_at");
30
30
  CREATE INDEX "storage_object_scope_updated_idx" ON "storage_object" ("scope", "status", "updated_at");
31
31
  CREATE INDEX "storage_object_scope_filename_idx" ON "storage_object" ("scope", "status", "filename");
32
32
  CREATE INDEX "storage_object_scope_size_idx" ON "storage_object" ("scope", "status", "size");
@@ -35,19 +35,19 @@ CREATE INDEX "storage_object_status_expires_idx" ON "storage_object" ("status",
35
35
  CREATE TABLE "storage_folder" (
36
36
  "id" varchar(255) PRIMARY KEY NOT NULL,
37
37
  "scope" text NOT NULL,
38
- "path" text NOT NULL,
39
- "parent" text,
38
+ "parent_id" text NOT NULL DEFAULT '',
40
39
  "name" text NOT NULL,
40
+ "path" text NOT NULL,
41
41
  "created_at" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
42
- CONSTRAINT "storage_folder_scope_path_uk" UNIQUE ("scope", "path")
42
+ "updated_at" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
43
+ CONSTRAINT "storage_folder_scope_path_uk" UNIQUE ("scope", "path"),
44
+ CONSTRAINT "storage_folder_scope_parent_name_uk" UNIQUE ("scope", "parent_id", "name")
43
45
  );
44
46
 
45
- CREATE INDEX "storage_folder_scope_parent_idx" ON "storage_folder" ("scope", "parent");
46
-
47
47
  -- Schema version for the Kysely and Prisma adapters.
48
48
  CREATE TABLE "private_dimah_s3_settings" (
49
49
  "key" varchar(255) PRIMARY KEY NOT NULL,
50
- "value" text NOT NULL DEFAULT '2.0.0'
50
+ "value" text NOT NULL DEFAULT '2.1.0'
51
51
  );
52
52
 
53
- INSERT INTO "private_dimah_s3_settings" ("key", "value") VALUES ('version', '2.0.0');
53
+ INSERT INTO "private_dimah_s3_settings" ("key", "value") VALUES ('version', '2.1.0');
package/sql/sqlite.sql CHANGED
@@ -1,4 +1,4 @@
1
- -- @dimah-s3/db schema 2.0.0 for SQLite.
1
+ -- @dimah-s3/db schema 2.1.0 for SQLite.
2
2
  -- Timestamps are epoch milliseconds. Sizes are INTEGER.
3
3
 
4
4
  CREATE TABLE "storage_object" (
@@ -7,7 +7,7 @@ CREATE TABLE "storage_object" (
7
7
  "bucket" text NOT NULL,
8
8
  "key" text NOT NULL,
9
9
  "route" text NOT NULL,
10
- "folder" text,
10
+ "folder_id" text,
11
11
  "filename" text NOT NULL,
12
12
  "content_type" text,
13
13
  "size" integer,
@@ -27,7 +27,7 @@ CREATE TABLE "storage_object" (
27
27
  );
28
28
 
29
29
  CREATE UNIQUE INDEX "storage_object_bucket_key_uk" ON "storage_object" ("bucket", "key");
30
- CREATE INDEX "storage_object_scope_folder_idx" ON "storage_object" ("scope", "status", "folder", "created_at");
30
+ CREATE INDEX "storage_object_scope_folder_idx" ON "storage_object" ("scope", "status", "folder_id", "created_at");
31
31
  CREATE INDEX "storage_object_scope_updated_idx" ON "storage_object" ("scope", "status", "updated_at");
32
32
  CREATE INDEX "storage_object_scope_filename_idx" ON "storage_object" ("scope", "status", "filename");
33
33
  CREATE INDEX "storage_object_scope_size_idx" ON "storage_object" ("scope", "status", "size");
@@ -36,19 +36,20 @@ CREATE INDEX "storage_object_status_expires_idx" ON "storage_object" ("status",
36
36
  CREATE TABLE "storage_folder" (
37
37
  "id" text PRIMARY KEY NOT NULL,
38
38
  "scope" text NOT NULL,
39
- "path" text NOT NULL,
40
- "parent" text,
39
+ "parent_id" text NOT NULL DEFAULT '',
41
40
  "name" text NOT NULL,
42
- "created_at" integer NOT NULL DEFAULT (strftime('%s', 'now') * 1000)
41
+ "path" text NOT NULL,
42
+ "created_at" integer NOT NULL DEFAULT (strftime('%s', 'now') * 1000),
43
+ "updated_at" integer NOT NULL DEFAULT (strftime('%s', 'now') * 1000)
43
44
  );
44
45
 
45
46
  CREATE UNIQUE INDEX "storage_folder_scope_path_uk" ON "storage_folder" ("scope", "path");
46
- CREATE INDEX "storage_folder_scope_parent_idx" ON "storage_folder" ("scope", "parent");
47
+ CREATE UNIQUE INDEX "storage_folder_scope_parent_name_uk" ON "storage_folder" ("scope", "parent_id", "name");
47
48
 
48
49
  -- Schema version for the Kysely and Prisma adapters.
49
50
  CREATE TABLE "private_dimah_s3_settings" (
50
51
  "key" text PRIMARY KEY NOT NULL,
51
- "value" text NOT NULL DEFAULT '2.0.0'
52
+ "value" text NOT NULL DEFAULT '2.1.0'
52
53
  );
53
54
 
54
- INSERT INTO "private_dimah_s3_settings" ("key", "value") VALUES ('version', '2.0.0');
55
+ INSERT INTO "private_dimah_s3_settings" ("key", "value") VALUES ('version', '2.1.0');