rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2025-12-22 21:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline various migration queries (#10231)

Browse Source 
There was no value in saving them off to temporary variables.

Signed-off-by: Tristan Partin <tristan@neon.tech>

Signed-off-by: Tristan Partin <tristan@neon.tech>
This commit is contained in:
Tristan Partin
2025-01-02 16:12:56 -06:00
committed by GitHub
parent cd10c719f9
commit eefad27538
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
compute_tools/src/migration.rs
View File

@@ -35,8 +35,6 @@ impl<'m> MigrationRunner<'m> {
/// used if you would like to fail the application of a series of migrations /// used if you would like to fail the application of a series of migrations
/// at some point. /// at some point.
fn update_migration_id(&mut self, migration_id: i64) -> Result<()> { fn update_migration_id(&mut self, migration_id: i64) -> Result<()> {
let setval = format!("UPDATE neon_migration.migration_id SET id={}", migration_id);
// We use this fail point in order to check that failing in the // We use this fail point in order to check that failing in the
// middle of applying a series of migrations fails in an expected // middle of applying a series of migrations fails in an expected
// manner // manner
@@ -58,7 +56,10 @@ impl<'m> MigrationRunner<'m> {
} }
self.client self.client
.simple_query(&setval) .query(
"UPDATE neon_migration.migration_id SET id = $1",
&[&migration_id],
)
.context("run_migrations update id")?; .context("run_migrations update id")?;
Ok(()) Ok(())
@@ -66,20 +67,16 @@ impl<'m> MigrationRunner<'m> {
/// Prepare the migrations the target database for handling migrations /// Prepare the migrations the target database for handling migrations
fn prepare_database(&mut self) -> Result<()> { fn prepare_database(&mut self) -> Result<()> {
let query = "CREATE SCHEMA IF NOT EXISTS neon_migration"; self.client
self.client.simple_query(query)?; .simple_query("CREATE SCHEMA IF NOT EXISTS neon_migration")?;
self.client.simple_query("CREATE TABLE IF NOT EXISTS neon_migration.migration_id (key INT NOT NULL PRIMARY KEY, id bigint NOT NULL DEFAULT 0)")?;
let query = "CREATE TABLE IF NOT EXISTS neon_migration.migration_id (key INT NOT NULL PRIMARY KEY, id bigint NOT NULL DEFAULT 0)"; self.client.simple_query(
self.client.simple_query(query)?; "INSERT INTO neon_migration.migration_id VALUES (0, 0) ON CONFLICT DO NOTHING",
)?;
let query = "INSERT INTO neon_migration.migration_id VALUES (0, 0) ON CONFLICT DO NOTHING"; self.client
self.client.simple_query(query)?; .simple_query("ALTER SCHEMA neon_migration OWNER TO cloud_admin")?;
self.client
let query = "ALTER SCHEMA neon_migration OWNER TO cloud_admin"; .simple_query("REVOKE ALL ON SCHEMA neon_migration FROM PUBLIC")?;
self.client.simple_query(query)?;
let query = "REVOKE ALL ON SCHEMA neon_migration FROM PUBLIC";
self.client.simple_query(query)?;
Ok(()) Ok(())
} }