@dimah-s3/db 2.0.0-beta.0 → 2.0.0-beta.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/README.md +3 -3
- package/dist/adapters/drizzle.d.ts +2 -1
- package/dist/adapters/drizzle.d.ts.map +1 -1
- package/dist/cli.d.ts +8 -9
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +31 -88
- package/dist/cli.js.map +1 -1
- package/dist/drizzle/mysql.d.ts +2 -1
- package/dist/drizzle/mysql.d.ts.map +1 -1
- package/dist/drizzle/mysql.js +5 -11
- package/dist/drizzle/mysql.js.map +1 -1
- package/dist/drizzle/pg.d.ts +2 -1
- package/dist/drizzle/pg.d.ts.map +1 -1
- package/dist/drizzle/pg.js +5 -11
- package/dist/drizzle/pg.js.map +1 -1
- package/dist/drizzle/shared.d.ts +3 -12
- package/dist/drizzle/shared.d.ts.map +1 -1
- package/dist/drizzle/sqlite.d.ts +2 -1
- package/dist/drizzle/sqlite.d.ts.map +1 -1
- package/dist/drizzle/sqlite.js +5 -11
- package/dist/drizzle/sqlite.js.map +1 -1
- package/dist/fuma-db.d.ts +5 -26
- package/dist/fuma-db.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +25 -61
- package/dist/index.js.map +1 -1
- package/dist/schema/{v2.d.ts → schema.d.ts} +16 -7
- package/dist/schema/schema.d.ts.map +1 -0
- package/dist/store/create-db-store.d.ts +2 -2
- package/dist/store/map-row.d.ts +1 -1
- package/dist/store/object-store.d.ts +4 -4
- package/dist/store/object-store.d.ts.map +1 -1
- package/dist/store/schema-version.d.ts +1 -1
- package/package.json +9 -6
- package/src/drizzle/mysql.ts +172 -0
- package/src/drizzle/pg.ts +140 -0
- package/src/drizzle/sqlite.ts +144 -0
- package/dist/schema/v1.d.ts +0 -24
- package/dist/schema/v1.d.ts.map +0 -1
- package/dist/schema/v2.d.ts.map +0 -1
- package/sql/upgrade/1.0.0-2.0.0/mysql.sql +0 -71
- package/sql/upgrade/1.0.0-2.0.0/pg.sql +0 -47
- package/sql/upgrade/1.0.0-2.0.0/sqlite.sql +0 -119
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
-- @dimah-s3/db schema 1.0.0 → 2.0.0 for MySQL 8.
|
|
2
|
-
-- Back up the database first. MySQL commits each ALTER TABLE on its own, so
|
|
3
|
-
-- a failed step leaves the earlier ones applied.
|
|
4
|
-
-- - `metadata` moves to `s3_metadata`; `attributes`, `folder`, and
|
|
5
|
-
-- `upload_token` start empty (`folder` NULL is the root).
|
|
6
|
-
-- - A missing `filename` becomes the last segment of the key.
|
|
7
|
-
-- - Columns take the 2.0.0 types (see ../../mysql.sql). Timestamps become
|
|
8
|
-
-- datetime(3), converted in the session time zone: run this with the time
|
|
9
|
-
-- zone your app connects with.
|
|
10
|
-
--
|
|
11
|
-
-- If you added the 1.x recommended indexes, drop them first:
|
|
12
|
-
-- DROP INDEX `storage_object_scope_status_created_idx` ON `storage_object`;
|
|
13
|
-
-- DROP INDEX `storage_object_scope_route_idx` ON `storage_object`;
|
|
14
|
-
-- DROP INDEX `storage_object_status_created_idx` ON `storage_object`;
|
|
15
|
-
-- DROP INDEX `storage_object_status_expires_idx` ON `storage_object`;
|
|
16
|
-
|
|
17
|
-
UPDATE `storage_object`
|
|
18
|
-
SET `filename` = COALESCE(NULLIF(SUBSTRING_INDEX(`key`, '/', -1), ''), `key`)
|
|
19
|
-
WHERE `filename` IS NULL;
|
|
20
|
-
UPDATE `storage_object` SET `filename` = LEFT(`filename`, 255);
|
|
21
|
-
|
|
22
|
-
DROP INDEX `storage_object_bucket_key_uk` ON `storage_object`;
|
|
23
|
-
|
|
24
|
-
ALTER TABLE `storage_object`
|
|
25
|
-
CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
|
|
26
|
-
|
|
27
|
-
ALTER TABLE `storage_object`
|
|
28
|
-
CHANGE `metadata` `s3_metadata` json,
|
|
29
|
-
ADD COLUMN `folder` varchar(1024),
|
|
30
|
-
ADD COLUMN `attributes` json,
|
|
31
|
-
ADD COLUMN `upload_token` varchar(64),
|
|
32
|
-
MODIFY `id` varchar(255) NOT NULL,
|
|
33
|
-
MODIFY `scope` varchar(255) NOT NULL,
|
|
34
|
-
MODIFY `bucket` varchar(255) NOT NULL,
|
|
35
|
-
MODIFY `key` varchar(1024) NOT NULL,
|
|
36
|
-
MODIFY `route` varchar(255) NOT NULL,
|
|
37
|
-
MODIFY `filename` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
|
|
38
|
-
MODIFY `content_type` varchar(255),
|
|
39
|
-
MODIFY `size` bigint,
|
|
40
|
-
MODIFY `declared_size` bigint,
|
|
41
|
-
MODIFY `e_tag` varchar(255),
|
|
42
|
-
MODIFY `status` varchar(16) NOT NULL,
|
|
43
|
-
MODIFY `acl` varchar(255),
|
|
44
|
-
MODIFY `upload_id` text,
|
|
45
|
-
MODIFY `expires_at` datetime(3),
|
|
46
|
-
MODIFY `confirmed_at` datetime(3),
|
|
47
|
-
MODIFY `created_at` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
|
48
|
-
MODIFY `updated_at` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
|
49
|
-
MODIFY `deleted_at` datetime(3),
|
|
50
|
-
ADD UNIQUE KEY `storage_object_bucket_key_uk` (`bucket`, `key`(512)),
|
|
51
|
-
ADD KEY `storage_object_scope_folder_idx` (`scope`, `status`, `folder`(255), `created_at`),
|
|
52
|
-
ADD KEY `storage_object_scope_updated_idx` (`scope`, `status`, `updated_at`),
|
|
53
|
-
ADD KEY `storage_object_scope_filename_idx` (`scope`, `status`, `filename`),
|
|
54
|
-
ADD KEY `storage_object_scope_size_idx` (`scope`, `status`, `size`),
|
|
55
|
-
ADD KEY `storage_object_status_expires_idx` (`status`, `expires_at`);
|
|
56
|
-
|
|
57
|
-
CREATE TABLE `storage_folder` (
|
|
58
|
-
`id` varchar(255) NOT NULL,
|
|
59
|
-
`scope` varchar(255) NOT NULL,
|
|
60
|
-
`path` varchar(1024) NOT NULL,
|
|
61
|
-
`parent` varchar(1024),
|
|
62
|
-
`name` varchar(255) NOT NULL,
|
|
63
|
-
`created_at` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
|
64
|
-
PRIMARY KEY (`id`),
|
|
65
|
-
UNIQUE KEY `storage_folder_scope_path_uk` (`scope`, `path`(512)),
|
|
66
|
-
KEY `storage_folder_scope_parent_idx` (`scope`, `parent`(512))
|
|
67
|
-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
|
|
68
|
-
|
|
69
|
-
-- Kysely and Prisma read the version from this table. A Drizzle setup reads
|
|
70
|
-
-- it from the table definition instead: skip this statement there.
|
|
71
|
-
UPDATE `private_dimah_s3_settings` SET `value` = '2.0.0' WHERE `key` = 'version';
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
-- @dimah-s3/db schema 1.0.0 → 2.0.0 for PostgreSQL.
|
|
2
|
-
-- Back up the database first.
|
|
3
|
-
-- - `metadata` moves to `s3_metadata`; `attributes`, `folder`, and
|
|
4
|
-
-- `upload_token` start empty (`folder` NULL is the root).
|
|
5
|
-
-- - A missing `filename` becomes the last segment of the key.
|
|
6
|
-
-- - The 1.x recommended indexes give way to the 2.0.0 indexes.
|
|
7
|
-
|
|
8
|
-
BEGIN;
|
|
9
|
-
|
|
10
|
-
ALTER TABLE "storage_object" RENAME COLUMN "metadata" TO "s3_metadata";
|
|
11
|
-
ALTER TABLE "storage_object"
|
|
12
|
-
ADD COLUMN "folder" text,
|
|
13
|
-
ADD COLUMN "attributes" json,
|
|
14
|
-
ADD COLUMN "upload_token" text;
|
|
15
|
-
|
|
16
|
-
UPDATE "storage_object"
|
|
17
|
-
SET "filename" = COALESCE(NULLIF(substring("key" from '[^/]*$'), ''), "key")
|
|
18
|
-
WHERE "filename" IS NULL;
|
|
19
|
-
ALTER TABLE "storage_object" ALTER COLUMN "filename" SET NOT NULL;
|
|
20
|
-
|
|
21
|
-
DROP INDEX IF EXISTS "storage_object_scope_status_created_idx";
|
|
22
|
-
DROP INDEX IF EXISTS "storage_object_scope_route_idx";
|
|
23
|
-
DROP INDEX IF EXISTS "storage_object_status_created_idx";
|
|
24
|
-
|
|
25
|
-
CREATE INDEX IF NOT EXISTS "storage_object_scope_folder_idx" ON "storage_object" ("scope", "status", "folder", "created_at");
|
|
26
|
-
CREATE INDEX IF NOT EXISTS "storage_object_scope_updated_idx" ON "storage_object" ("scope", "status", "updated_at");
|
|
27
|
-
CREATE INDEX IF NOT EXISTS "storage_object_scope_filename_idx" ON "storage_object" ("scope", "status", "filename");
|
|
28
|
-
CREATE INDEX IF NOT EXISTS "storage_object_scope_size_idx" ON "storage_object" ("scope", "status", "size");
|
|
29
|
-
CREATE INDEX IF NOT EXISTS "storage_object_status_expires_idx" ON "storage_object" ("status", "expires_at");
|
|
30
|
-
|
|
31
|
-
CREATE TABLE "storage_folder" (
|
|
32
|
-
"id" varchar(255) PRIMARY KEY NOT NULL,
|
|
33
|
-
"scope" text NOT NULL,
|
|
34
|
-
"path" text NOT NULL,
|
|
35
|
-
"parent" text,
|
|
36
|
-
"name" text NOT NULL,
|
|
37
|
-
"created_at" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
38
|
-
CONSTRAINT "storage_folder_scope_path_uk" UNIQUE ("scope", "path")
|
|
39
|
-
);
|
|
40
|
-
|
|
41
|
-
CREATE INDEX "storage_folder_scope_parent_idx" ON "storage_folder" ("scope", "parent");
|
|
42
|
-
|
|
43
|
-
COMMIT;
|
|
44
|
-
|
|
45
|
-
-- Kysely and Prisma read the version from this table. A Drizzle setup reads
|
|
46
|
-
-- it from the table definition instead: skip this statement there.
|
|
47
|
-
UPDATE "private_dimah_s3_settings" SET "value" = '2.0.0' WHERE "key" = 'version';
|
|
@@ -1,119 +0,0 @@
|
|
|
1
|
-
-- @dimah-s3/db schema 1.0.0 → 2.0.0 for SQLite.
|
|
2
|
-
-- Back up the database first. SQLite cannot change a column in place, so
|
|
3
|
-
-- this rebuilds `storage_object`:
|
|
4
|
-
-- - `metadata` moves to `s3_metadata`; `attributes`, `folder`, and
|
|
5
|
-
-- `upload_token` start empty (`folder` NULL is the root).
|
|
6
|
-
-- - A missing `filename` becomes the last segment of the key.
|
|
7
|
-
-- - Sizes become INTEGER. 1.x stored them as blobs: an 8-byte big-endian
|
|
8
|
-
-- integer (Kysely adapter) or the decimal digits (Drizzle).
|
|
9
|
-
-- - Timestamps become epoch milliseconds. 1.x Drizzle tables stored seconds.
|
|
10
|
-
|
|
11
|
-
BEGIN;
|
|
12
|
-
|
|
13
|
-
UPDATE "storage_object" SET "size" = CASE
|
|
14
|
-
WHEN length("size") = 8 AND substr(hex("size"), 1, 2) = '00' THEN (
|
|
15
|
-
WITH RECURSIVE "digit" ("i", "n") AS (
|
|
16
|
-
SELECT 1, 0
|
|
17
|
-
UNION ALL
|
|
18
|
-
SELECT "i" + 1, "n" * 16 + instr('0123456789ABCDEF', substr(hex("storage_object"."size"), "i", 1)) - 1
|
|
19
|
-
FROM "digit" WHERE "i" <= 16
|
|
20
|
-
)
|
|
21
|
-
SELECT "n" FROM "digit" WHERE "i" = 17
|
|
22
|
-
)
|
|
23
|
-
ELSE CAST(CAST("size" AS TEXT) AS INTEGER)
|
|
24
|
-
END
|
|
25
|
-
WHERE typeof("size") = 'blob';
|
|
26
|
-
|
|
27
|
-
UPDATE "storage_object" SET "declared_size" = CASE
|
|
28
|
-
WHEN length("declared_size") = 8 AND substr(hex("declared_size"), 1, 2) = '00' THEN (
|
|
29
|
-
WITH RECURSIVE "digit" ("i", "n") AS (
|
|
30
|
-
SELECT 1, 0
|
|
31
|
-
UNION ALL
|
|
32
|
-
SELECT "i" + 1, "n" * 16 + instr('0123456789ABCDEF', substr(hex("storage_object"."declared_size"), "i", 1)) - 1
|
|
33
|
-
FROM "digit" WHERE "i" <= 16
|
|
34
|
-
)
|
|
35
|
-
SELECT "n" FROM "digit" WHERE "i" = 17
|
|
36
|
-
)
|
|
37
|
-
ELSE CAST(CAST("declared_size" AS TEXT) AS INTEGER)
|
|
38
|
-
END
|
|
39
|
-
WHERE typeof("declared_size") = 'blob';
|
|
40
|
-
|
|
41
|
-
-- Seconds (anything before 1973 as milliseconds) and text dates become milliseconds.
|
|
42
|
-
UPDATE "storage_object" SET
|
|
43
|
-
"expires_at" = CASE WHEN typeof("expires_at") = 'text' THEN CAST(strftime('%s', "expires_at") AS INTEGER) * 1000 WHEN "expires_at" < 100000000000 THEN "expires_at" * 1000 ELSE "expires_at" END,
|
|
44
|
-
"confirmed_at" = CASE WHEN typeof("confirmed_at") = 'text' THEN CAST(strftime('%s', "confirmed_at") AS INTEGER) * 1000 WHEN "confirmed_at" < 100000000000 THEN "confirmed_at" * 1000 ELSE "confirmed_at" END,
|
|
45
|
-
"created_at" = CASE WHEN typeof("created_at") = 'text' THEN CAST(strftime('%s', "created_at") AS INTEGER) * 1000 WHEN "created_at" < 100000000000 THEN "created_at" * 1000 ELSE "created_at" END,
|
|
46
|
-
"updated_at" = CASE WHEN typeof("updated_at") = 'text' THEN CAST(strftime('%s', "updated_at") AS INTEGER) * 1000 WHEN "updated_at" < 100000000000 THEN "updated_at" * 1000 ELSE "updated_at" END,
|
|
47
|
-
"deleted_at" = CASE WHEN typeof("deleted_at") = 'text' THEN CAST(strftime('%s', "deleted_at") AS INTEGER) * 1000 WHEN "deleted_at" < 100000000000 THEN "deleted_at" * 1000 ELSE "deleted_at" END;
|
|
48
|
-
|
|
49
|
-
CREATE TABLE "storage_object_v2" (
|
|
50
|
-
"id" text PRIMARY KEY NOT NULL,
|
|
51
|
-
"scope" text NOT NULL,
|
|
52
|
-
"bucket" text NOT NULL,
|
|
53
|
-
"key" text NOT NULL,
|
|
54
|
-
"route" text NOT NULL,
|
|
55
|
-
"folder" text,
|
|
56
|
-
"filename" text NOT NULL,
|
|
57
|
-
"content_type" text,
|
|
58
|
-
"size" integer,
|
|
59
|
-
"declared_size" integer,
|
|
60
|
-
"e_tag" text,
|
|
61
|
-
"status" text NOT NULL,
|
|
62
|
-
"s3_metadata" text,
|
|
63
|
-
"attributes" text,
|
|
64
|
-
"acl" text,
|
|
65
|
-
"upload_id" text,
|
|
66
|
-
"upload_token" text,
|
|
67
|
-
"expires_at" integer,
|
|
68
|
-
"confirmed_at" integer,
|
|
69
|
-
"created_at" integer NOT NULL DEFAULT (strftime('%s', 'now') * 1000),
|
|
70
|
-
"updated_at" integer NOT NULL DEFAULT (strftime('%s', 'now') * 1000),
|
|
71
|
-
"deleted_at" integer
|
|
72
|
-
);
|
|
73
|
-
|
|
74
|
-
INSERT INTO "storage_object_v2" (
|
|
75
|
-
"id", "scope", "bucket", "key", "route", "folder", "filename",
|
|
76
|
-
"content_type", "size", "declared_size", "e_tag", "status", "s3_metadata",
|
|
77
|
-
"attributes", "acl", "upload_id", "upload_token", "expires_at",
|
|
78
|
-
"confirmed_at", "created_at", "updated_at", "deleted_at"
|
|
79
|
-
)
|
|
80
|
-
SELECT
|
|
81
|
-
"id", "scope", "bucket", "key", "route", NULL,
|
|
82
|
-
COALESCE(
|
|
83
|
-
"filename",
|
|
84
|
-
NULLIF(substr("key", length(rtrim("key", replace("key", '/', ''))) + 1), ''),
|
|
85
|
-
"key"
|
|
86
|
-
),
|
|
87
|
-
"content_type", "size", "declared_size", "e_tag", "status",
|
|
88
|
-
CASE WHEN typeof("metadata") = 'blob' THEN CAST("metadata" AS TEXT) ELSE "metadata" END,
|
|
89
|
-
NULL, "acl", "upload_id", NULL, "expires_at",
|
|
90
|
-
"confirmed_at", "created_at", "updated_at", "deleted_at"
|
|
91
|
-
FROM "storage_object";
|
|
92
|
-
|
|
93
|
-
DROP TABLE "storage_object";
|
|
94
|
-
ALTER TABLE "storage_object_v2" RENAME TO "storage_object";
|
|
95
|
-
|
|
96
|
-
CREATE UNIQUE INDEX "storage_object_bucket_key_uk" ON "storage_object" ("bucket", "key");
|
|
97
|
-
CREATE INDEX "storage_object_scope_folder_idx" ON "storage_object" ("scope", "status", "folder", "created_at");
|
|
98
|
-
CREATE INDEX "storage_object_scope_updated_idx" ON "storage_object" ("scope", "status", "updated_at");
|
|
99
|
-
CREATE INDEX "storage_object_scope_filename_idx" ON "storage_object" ("scope", "status", "filename");
|
|
100
|
-
CREATE INDEX "storage_object_scope_size_idx" ON "storage_object" ("scope", "status", "size");
|
|
101
|
-
CREATE INDEX "storage_object_status_expires_idx" ON "storage_object" ("status", "expires_at");
|
|
102
|
-
|
|
103
|
-
CREATE TABLE "storage_folder" (
|
|
104
|
-
"id" text PRIMARY KEY NOT NULL,
|
|
105
|
-
"scope" text NOT NULL,
|
|
106
|
-
"path" text NOT NULL,
|
|
107
|
-
"parent" text,
|
|
108
|
-
"name" text NOT NULL,
|
|
109
|
-
"created_at" integer NOT NULL DEFAULT (strftime('%s', 'now') * 1000)
|
|
110
|
-
);
|
|
111
|
-
|
|
112
|
-
CREATE UNIQUE INDEX "storage_folder_scope_path_uk" ON "storage_folder" ("scope", "path");
|
|
113
|
-
CREATE INDEX "storage_folder_scope_parent_idx" ON "storage_folder" ("scope", "parent");
|
|
114
|
-
|
|
115
|
-
COMMIT;
|
|
116
|
-
|
|
117
|
-
-- Kysely and Prisma read the version from this table. A Drizzle setup reads
|
|
118
|
-
-- it from the table definition instead: skip this statement there.
|
|
119
|
-
UPDATE "private_dimah_s3_settings" SET "value" = '2.0.0' WHERE "key" = 'version';
|