new migration

coder · sreya · Aug 17, 2022 · Aug 9, 2022 · Aug 9, 2022 · Aug 9, 2022
commit c1b987166da666f47eef56b2346584ccb84b2fee
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000034_linked_user_id.up.sql b/coderd/database/migrations/000034_linked_user_id.up.sql
@@ -1,7 +1,5 @@
 BEGIN;
 
-ALTER TYPE login_type ADD VALUE 'oidc';
-
 CREATE TABLE IF NOT EXISTS user_links (
 	user_id uuid NOT NULL,
 	login_type login_type NOT NULL,
@@ -39,6 +37,10 @@ FROM
 	) as keys
  WHERE x=1 AND keys.login_type != 'password';
 
-ALTER TABLE api_keys RENAME COLUMN login_type TO _login_type
+ALTER TABLE api_keys 
+	DROP COLUMN oauth_access_token,
+	DROP COLUMN oauth_refresh_token,
+	DROP COLUMN oauth_id_token,
+	DROP COLUMN oauth_expiry;
 
 COMMIT;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/postgres/postgres.go b/coderd/database/postgres/postgres.go
@@ -138,6 +138,7 @@ func Open() (string, func(), error) {
 		}
 		retryErr = database.MigrateUp(db)
 		if retryErr != nil {
+			fmt.Printf("err: %v\n", retryErr)
 			return xerrors.Errorf("migrate db: %w", retryErr)
 		}
 

diff --git a/coderd/database/querier.go b/coderd/database/querier.go