diff --git a/.sqlx/query-589d9e38730b484d594bab8c7e013860427f51a185229ac6a9b36832321b9db7.json b/.sqlx/query-589d9e38730b484d594bab8c7e013860427f51a185229ac6a9b36832321b9db7.json deleted file mode 100644 index 482d729..0000000 --- a/.sqlx/query-589d9e38730b484d594bab8c7e013860427f51a185229ac6a9b36832321b9db7.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "SQLite", - "query": "DELETE FROM subscriptions WHERE id = ? ", - "describe": { - "columns": [], - "parameters": { - "Right": 1 - }, - "nullable": [] - }, - "hash": "589d9e38730b484d594bab8c7e013860427f51a185229ac6a9b36832321b9db7" -} diff --git a/.sqlx/query-6a8e5ba48d72ad1d6e761c8f050ddb76480b19589fcab0283cac823ce90f94bf.json b/.sqlx/query-6a8e5ba48d72ad1d6e761c8f050ddb76480b19589fcab0283cac823ce90f94bf.json deleted file mode 100644 index 4b628f0..0000000 --- a/.sqlx/query-6a8e5ba48d72ad1d6e761c8f050ddb76480b19589fcab0283cac823ce90f94bf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "SQLite", - "query": "INSERT OR REPLACE INTO subscriptions (id, topic, expiration, push_resource) VALUES (?, ?, ?, ?)", - "describe": { - "columns": [], - "parameters": { - "Right": 4 - }, - "nullable": [] - }, - "hash": "6a8e5ba48d72ad1d6e761c8f050ddb76480b19589fcab0283cac823ce90f94bf" -} diff --git a/.sqlx/query-4d89c9973ea3318085749b5982c544c2a337305491ff410ed6e72f0c609af423.json b/.sqlx/query-8159ceb84de9016e738e5fdc9a5203a4c4cbc583483241e3cdee542232c1bc35.json similarity index 81% rename from .sqlx/query-4d89c9973ea3318085749b5982c544c2a337305491ff410ed6e72f0c609af423.json rename to .sqlx/query-8159ceb84de9016e738e5fdc9a5203a4c4cbc583483241e3cdee542232c1bc35.json index fa876e5..75aab9f 100644 --- a/.sqlx/query-4d89c9973ea3318085749b5982c544c2a337305491ff410ed6e72f0c609af423.json +++ b/.sqlx/query-8159ceb84de9016e738e5fdc9a5203a4c4cbc583483241e3cdee542232c1bc35.json @@ -1,6 +1,6 @@ { "db_name": "SQLite", - "query": "SELECT id, topic, expiration, push_resource\n FROM subscriptions\n WHERE (id) = (?)", + "query": "SELECT id, topic, expiration, push_resource\n FROM davpush_subscriptions\n WHERE (id) = (?)", "describe": { "columns": [ { @@ -34,5 +34,5 @@ false ] }, - "hash": "4d89c9973ea3318085749b5982c544c2a337305491ff410ed6e72f0c609af423" + "hash": "8159ceb84de9016e738e5fdc9a5203a4c4cbc583483241e3cdee542232c1bc35" } diff --git a/.sqlx/query-84772106cd7461119dfaf0e60908f6523860b35c06010bb0a85a531ceeeadede.json b/.sqlx/query-84772106cd7461119dfaf0e60908f6523860b35c06010bb0a85a531ceeeadede.json new file mode 100644 index 0000000..d9f4677 --- /dev/null +++ b/.sqlx/query-84772106cd7461119dfaf0e60908f6523860b35c06010bb0a85a531ceeeadede.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT OR REPLACE INTO davpush_subscriptions (id, topic, expiration, push_resource) VALUES (?, ?, ?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "84772106cd7461119dfaf0e60908f6523860b35c06010bb0a85a531ceeeadede" +} diff --git a/.sqlx/query-5d882981e72c3610d4ef2f4997ec3f783774cac46b6787e447c74a315f9bdbb8.json b/.sqlx/query-851fdb63dfffde80b8793c08fa6c81ecae1d70b33dd63c8bd5b296eae330b522.json similarity index 80% rename from .sqlx/query-5d882981e72c3610d4ef2f4997ec3f783774cac46b6787e447c74a315f9bdbb8.json rename to .sqlx/query-851fdb63dfffde80b8793c08fa6c81ecae1d70b33dd63c8bd5b296eae330b522.json index ac5f053..fc82668 100644 --- a/.sqlx/query-5d882981e72c3610d4ef2f4997ec3f783774cac46b6787e447c74a315f9bdbb8.json +++ b/.sqlx/query-851fdb63dfffde80b8793c08fa6c81ecae1d70b33dd63c8bd5b296eae330b522.json @@ -1,6 +1,6 @@ { "db_name": "SQLite", - "query": "SELECT id, topic, expiration, push_resource\n FROM subscriptions\n WHERE (topic) = (?)", + "query": "SELECT id, topic, expiration, push_resource\n FROM davpush_subscriptions\n WHERE (topic) = (?)", "describe": { "columns": [ { @@ -34,5 +34,5 @@ false ] }, - "hash": "5d882981e72c3610d4ef2f4997ec3f783774cac46b6787e447c74a315f9bdbb8" + "hash": "851fdb63dfffde80b8793c08fa6c81ecae1d70b33dd63c8bd5b296eae330b522" } diff --git a/.sqlx/query-e912be3352702bbf035b3ee6e9f239bf75a1ffef20211f1b1e895a67a2310960.json b/.sqlx/query-e912be3352702bbf035b3ee6e9f239bf75a1ffef20211f1b1e895a67a2310960.json new file mode 100644 index 0000000..5e6274b --- /dev/null +++ b/.sqlx/query-e912be3352702bbf035b3ee6e9f239bf75a1ffef20211f1b1e895a67a2310960.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM davpush_subscriptions WHERE id = ? ", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "e912be3352702bbf035b3ee6e9f239bf75a1ffef20211f1b1e895a67a2310960" +} diff --git a/crates/store_sqlite/migrations/3_subscriptions.sql b/crates/store_sqlite/migrations/3_subscriptions.sql index 9116f48..b1bcd05 100644 --- a/crates/store_sqlite/migrations/3_subscriptions.sql +++ b/crates/store_sqlite/migrations/3_subscriptions.sql @@ -1,4 +1,4 @@ -CREATE TABLE subscriptions ( +CREATE TABLE davpush_subscriptions ( id TEXT NOT NULL, topic TEXT NOT NULL, expiration DATETIME NOT NULL, diff --git a/crates/store_sqlite/src/subscription_store.rs b/crates/store_sqlite/src/subscription_store.rs index 083df93..8c989be 100644 --- a/crates/store_sqlite/src/subscription_store.rs +++ b/crates/store_sqlite/src/subscription_store.rs @@ -8,7 +8,7 @@ impl SubscriptionStore for SqliteStore { Ok(sqlx::query_as!( Subscription, r#"SELECT id, topic, expiration, push_resource - FROM subscriptions + FROM davpush_subscriptions WHERE (topic) = (?)"#, topic ) @@ -21,7 +21,7 @@ impl SubscriptionStore for SqliteStore { Ok(sqlx::query_as!( Subscription, r#"SELECT id, topic, expiration, push_resource - FROM subscriptions + FROM davpush_subscriptions WHERE (id) = (?)"#, id ) @@ -32,7 +32,7 @@ impl SubscriptionStore for SqliteStore { async fn upsert_subscription(&self, sub: Subscription) -> Result { sqlx::query!( - r#"INSERT OR REPLACE INTO subscriptions (id, topic, expiration, push_resource) VALUES (?, ?, ?, ?)"#, + r#"INSERT OR REPLACE INTO davpush_subscriptions (id, topic, expiration, push_resource) VALUES (?, ?, ?, ?)"#, sub.id, sub.topic, sub.expiration, @@ -42,7 +42,7 @@ impl SubscriptionStore for SqliteStore { Ok(false) } async fn delete_subscription(&self, id: &str) -> Result<(), Error> { - sqlx::query!(r#"DELETE FROM subscriptions WHERE id = ? "#, id) + sqlx::query!(r#"DELETE FROM davpush_subscriptions WHERE id = ? "#, id) .execute(&self.db) .await .map_err(crate::Error::from)?;