Correcting Database Column Renaming from PR #235

pkg/server/db/postgres/migrations/1_initialize_schema.up.sql

@@ -25,14 +25,14 @@ CREATE TABLE IF NOT EXISTS relationships
 
 CREATE TABLE IF NOT EXISTS bundles
 (
-    id                        UUID PRIMARY KEY                  DEFAULT gen_random_uuid(),
-    trust_domain_id           UUID                     NOT NULL UNIQUE,
-    data                      BYTEA                    NOT NULL,
-    digest                    BYTEA                    NOT NULL,
-    signature                 BYTEA,
-    signing_certificate_chain BYTEA,
-    created_at                TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
-    updated_at                TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()
+    id                  UUID PRIMARY KEY                  DEFAULT gen_random_uuid(),
+    trust_domain_id     UUID                     NOT NULL UNIQUE,
+    data                BYTEA                    NOT NULL,
+    digest              BYTEA                    NOT NULL,
+    signature           BYTEA,
+    signing_certificate BYTEA,
+    created_at          TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
+    updated_at          TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()
 );
 
 CREATE TABLE IF NOT EXISTS join_tokens

pkg/server/db/postgres/migrations/2_rename_signing_certificate.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE bundles
+    RENAME signing_certificate_chain TO signing_certificate;

pkg/server/db/postgres/migrations/2_rename_signing_certificate.up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE bundles
+    RENAME signing_certificate TO signing_certificate_chain;

pkg/server/db/postgres/schema.go

@@ -16,7 +16,7 @@ var fs embed.FS
 // This is used to ensure that the app is compatible with the database schema.
 // When a new migration is created, this version should be updated in order to force
 // the migrations to run when starting up the app.
-const currentDBVersion = 1
+const currentDBVersion = 2
 
 const scheme = "postgresql"
 

pkg/server/db/sqlite/migrations/1_initialize_schema.up.sql

@@ -26,14 +26,14 @@ CREATE TABLE IF NOT EXISTS relationships
 
 CREATE TABLE IF NOT EXISTS bundles
 (
-    id                        TEXT PRIMARY KEY,
-    trust_domain_id           TEXT      NOT NULL UNIQUE,
-    data                      BLOB      NOT NULL,
-    digest                    BLOB      NOT NULL,
-    signature                 BLOB,
-    signing_certificate_chain BLOB,
-    created_at                TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at                TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    id                  TEXT PRIMARY KEY,
+    trust_domain_id     TEXT      NOT NULL UNIQUE,
+    data                BLOB      NOT NULL,
+    digest              BLOB      NOT NULL,
+    signature           BLOB,
+    signing_certificate BLOB,
+    created_at          TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at          TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (trust_domain_id)
         REFERENCES trust_domains (id)
 );

pkg/server/db/sqlite/migrations/2_rename_signing_certificate.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE bundles
+    RENAME signing_certificate_chain TO signing_certificate;

pkg/server/db/sqlite/migrations/2_rename_signing_certificate.up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE bundles
+    RENAME signing_certificate TO signing_certificate_chain;

pkg/server/db/sqlite/schema.go

@@ -16,7 +16,7 @@ var fs embed.FS
 // This is used to ensure that the app is compatible with the database schema.
 // When a new migration is created, this version should be updated in order to force
 // the migrations to run when starting up the app.
-const currentDBVersion = 1
+const currentDBVersion = 2
 
 const scheme = "sqlite3"