From 690ef7bca838d201db7d08d1fdd4f99af922b007 Mon Sep 17 00:00:00 2001 From: Don Browne Date: Thu, 8 Aug 2024 15:24:47 +0100 Subject: [PATCH] ensure temporary table does not exist --- database/migrations/000089_migrate_rule_statuses.up.sql | 4 ++++ internal/db/models.go | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/database/migrations/000089_migrate_rule_statuses.up.sql b/database/migrations/000089_migrate_rule_statuses.up.sql index 54061a8145..e09af2d10a 100644 --- a/database/migrations/000089_migrate_rule_statuses.up.sql +++ b/database/migrations/000089_migrate_rule_statuses.up.sql @@ -115,4 +115,8 @@ UPDATE rule_evaluations SET migrated = TRUE WHERE id IN (SELECT rule_evaluation_id FROM temp_migrate_rule_evaluations); +-- this is not strictly necessary, but if we don't do it - sqlc will generate +-- a model for the temporary table :( +DROP TABLE IF EXISTS temp_migrate_rule_evaluations; + COMMIT; \ No newline at end of file diff --git a/internal/db/models.go b/internal/db/models.go index 95d07bc0ce..f628528318 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -734,11 +734,6 @@ type Subscription struct { CurrentVersion string `json:"current_version"` } -type TempMigrateRuleEvaluation struct { - RuleEvaluationID uuid.UUID `json:"rule_evaluation_id"` - EvaluationStatusID uuid.NullUUID `json:"evaluation_status_id"` -} - type User struct { ID int32 `json:"id"` IdentitySubject string `json:"identity_subject"`