From c1a3f9657462dabeb1775050464d7fd7284f0431 Mon Sep 17 00:00:00 2001 From: Matthew Plant Date: Mon, 20 May 2024 10:33:18 -0400 Subject: [PATCH] rename data_sets table to hex_assignments_data_set_status --- mobile_verifier/migrations/33_data_sets.sql | 2 +- mobile_verifier/src/boosting_oracles/data_sets.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mobile_verifier/migrations/33_data_sets.sql b/mobile_verifier/migrations/33_data_sets.sql index d76d99a37..dba5aea9f 100644 --- a/mobile_verifier/migrations/33_data_sets.sql +++ b/mobile_verifier/migrations/33_data_sets.sql @@ -12,7 +12,7 @@ CREATE TYPE data_set_type AS enum ( 'landtype' ); -CREATE TABLE IF NOT EXISTS data_sets ( +CREATE TABLE IF NOT EXISTS hex_assignment_data_set_status ( filename TEXT PRIMARY KEY, data_set data_set_type NOT NULL, time_to_use TIMESTAMPTZ NOT NULL, diff --git a/mobile_verifier/src/boosting_oracles/data_sets.rs b/mobile_verifier/src/boosting_oracles/data_sets.rs index 77693d7f1..06e65ae7a 100644 --- a/mobile_verifier/src/boosting_oracles/data_sets.rs +++ b/mobile_verifier/src/boosting_oracles/data_sets.rs @@ -444,7 +444,7 @@ pub mod db { pool: &PgPool, data_set_type: DataSetType, ) -> sqlx::Result>> { - sqlx::query_scalar("SELECT time_to_use FROM data_sets WHERE data_set = $1 ORDER BY time_to_use DESC LIMIT 1") + sqlx::query_scalar("SELECT time_to_use FROM hex_assignment_data_set_status WHERE data_set = $1 ORDER BY time_to_use DESC LIMIT 1") .bind(data_set_type) .fetch_optional(pool) .await @@ -458,7 +458,7 @@ pub mod db { ) -> sqlx::Result<()> { sqlx::query( r#" - INSERT INTO data_sets (filename, data_set, time_to_use, status) + INSERT INTO hex_assignment_data_set_status (filename, data_set, time_to_use, status) VALUES ($1, $2, $3, 'pending') ON CONFLICT DO NOTHING "#, @@ -477,7 +477,7 @@ pub mod db { since: Option>, ) -> sqlx::Result> { sqlx::query_as( - "SELECT filename, time_to_use, status FROM data_sets WHERE status != 'processed' AND data_set = $1 AND COALESCE(time_to_use > $2, TRUE) AND time_to_use <= $3 ORDER BY time_to_use DESC LIMIT 1" + "SELECT filename, time_to_use, status FROM hex_assignment_data_set_status WHERE status != 'processed' AND data_set = $1 AND COALESCE(time_to_use > $2, TRUE) AND time_to_use <= $3 ORDER BY time_to_use DESC LIMIT 1" ) .bind(data_set_type) .bind(since) @@ -491,7 +491,7 @@ pub mod db { data_set_type: DataSetType, ) -> sqlx::Result> { sqlx::query_as( - "SELECT filename, time_to_use, status FROM data_sets WHERE status = 'processed' AND data_set = $1 ORDER BY time_to_use DESC LIMIT 1" + "SELECT filename, time_to_use, status FROM hex_assignment_data_set_status WHERE status = 'processed' AND data_set = $1 ORDER BY time_to_use DESC LIMIT 1" ) .bind(data_set_type) .fetch_optional(pool) @@ -503,7 +503,7 @@ pub mod db { filename: &str, status: DataSetStatus, ) -> sqlx::Result<()> { - sqlx::query("UPDATE data_sets SET status = $1 WHERE filename = $2") + sqlx::query("UPDATE hex_assignment_data_set_status SET status = $1 WHERE filename = $2") .bind(status) .bind(filename) .execute(pool) @@ -516,7 +516,7 @@ pub mod db { data_set_type: DataSetType, ) -> sqlx::Result>> { sqlx::query_scalar( - "SELECT time_to_use FROM data_sets WHERE status = 'processed' AND data_set = $1 ORDER BY time_to_use DESC LIMIT 1" + "SELECT time_to_use FROM hex_assignment_data_set_status WHERE status = 'processed' AND data_set = $1 ORDER BY time_to_use DESC LIMIT 1" ) .bind(data_set_type) .fetch_optional(pool) @@ -529,7 +529,7 @@ pub mod db { period_end: DateTime, ) -> sqlx::Result { Ok(sqlx::query_scalar( - "SELECT COUNT(*) > 0 FROM data_sets WHERE time_to_use <= $1 AND status != 'processed'", + "SELECT COUNT(*) > 0 FROM hex_assignment_data_set_status WHERE time_to_use <= $1 AND status != 'processed'", ) .bind(period_end) .fetch_one(pool)