From f0f461c03b18ea661597964ecea10c62dba50336 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Thu, 5 Jan 2023 13:07:16 -0500 Subject: [PATCH] Fix regresions introduced by #78 --- peridot/db/psql/package.go | 2 ++ ...pport-modular-dependencies-for-scoped-packages.down.sql | 5 ++--- ...support-modular-dependencies-for-scoped-packages.up.sql | 7 ++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/peridot/db/psql/package.go b/peridot/db/psql/package.go index 4cc97a6a..b711f431 100644 --- a/peridot/db/psql/package.go +++ b/peridot/db/psql/package.go @@ -367,6 +367,8 @@ func (a *Access) SetGroupInstallOptionsForPackage(projectId string, packageName projectId, packageName, dependsOn, + enableModule, + disableModule, ) return err } diff --git a/peridot/migrate/20221219144131_support-modular-dependencies-for-scoped-packages.down.sql b/peridot/migrate/20221219144131_support-modular-dependencies-for-scoped-packages.down.sql index 3c002d56..0e1d0cfc 100644 --- a/peridot/migrate/20221219144131_support-modular-dependencies-for-scoped-packages.down.sql +++ b/peridot/migrate/20221219144131_support-modular-dependencies-for-scoped-packages.down.sql @@ -1,3 +1,2 @@ -ALTER TABLE - IF EXISTS extra_package_options DROP COLUMN IF EXISTS enable_module, - IF EXISTS extra_package_options DROP COLUMN IF EXISTS disable_module; +ALTER TABLE IF EXISTS extra_package_options DROP COLUMN IF EXISTS enable_module, +DROP COLUMN IF EXISTS disable_module; diff --git a/peridot/migrate/20221219144131_support-modular-dependencies-for-scoped-packages.up.sql b/peridot/migrate/20221219144131_support-modular-dependencies-for-scoped-packages.up.sql index 10863c79..085bb167 100644 --- a/peridot/migrate/20221219144131_support-modular-dependencies-for-scoped-packages.up.sql +++ b/peridot/migrate/20221219144131_support-modular-dependencies-for-scoped-packages.up.sql @@ -1,5 +1,2 @@ -ALTER TABLE - IF EXISTS extra_package_options -ADD - COLUMN IF NOT EXISTS enable_module text [] not null default array [] :: text [], - COLUMN IF NOT EXISTS disable_module text [] not null default array [] :: text []; +ALTER TABLE IF EXISTS extra_package_options ADD COLUMN IF NOT EXISTS enable_module text [] NOT NULL DEFAULT ARRAY []::text [], +ADD COLUMN IF NOT EXISTS disable_module text [] NOT NULL DEFAULT ARRAY []::text [];