nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 18:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where deleted events stay listed

Browse Source
This commit is contained in:
Lennart
2024-06-30 19:42:26 +02:00
parent a67d7557af
commit 8afcbccd6a
14 changed files with 1 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.sqlx/query-02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "UPDATE calendars SET deleted_at = NULL WHERE (principal, id) = (?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 2
},
"nullable": []
},
"hash": "02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee"
}

62
.sqlx/query-091674cd48db0193ca1fef6053ea1cb47f51128b5d0b6b3931277a392274b021.json generated
View File

@@ -1,62 +0,0 @@
{
"db_name": "SQLite",
"query": "SELECT principal, id, displayname, \"order\", description, color, timezone, deleted_at\n FROM calendars\n WHERE principal = ? AND deleted_at IS NULL",
"describe": {
"columns": [
{
"name": "principal",
"ordinal": 0,
"type_info": "Text"
},
{
"name": "id",
"ordinal": 1,
"type_info": "Text"
},
{
"name": "displayname",
"ordinal": 2,
"type_info": "Text"
},
{
"name": "order",
"ordinal": 3,
"type_info": "Int64"
},
{
"name": "description",
"ordinal": 4,
"type_info": "Text"
},
{
"name": "color",
"ordinal": 5,
"type_info": "Text"
},
{
"name": "timezone",
"ordinal": 6,
"type_info": "Text"
},
{
"name": "deleted_at",
"ordinal": 7,
"type_info": "Datetime"
}
],
"parameters": {
"Right": 1
},
"nullable": [
false,
false,
true,
false,
true,
true,
false,
true
]
},
"hash": "091674cd48db0193ca1fef6053ea1cb47f51128b5d0b6b3931277a392274b021"
}

12
.sqlx/query-2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "DELETE FROM calendars WHERE (principal, id) = (?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 2
},
"nullable": []
},
"hash": "2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f"
}

26
.sqlx/query-732e371bf23a0d21225d01ffa6255d7875115de1e8b2bdcb5e5cb55300c3cd02.json generated
View File

@@ -1,26 +0,0 @@
{
"db_name": "SQLite",
"query": "SELECT uid, ics FROM events WHERE (principal, cid, uid) = (?, ?, ?)",
"describe": {
"columns": [
{
"name": "uid",
"ordinal": 0,
"type_info": "Text"
},
{
"name": "ics",
"ordinal": 1,
"type_info": "Text"
}
],
"parameters": {
"Right": 3
},
"nullable": [
false,
false
]
},
"hash": "732e371bf23a0d21225d01ffa6255d7875115de1e8b2bdcb5e5cb55300c3cd02"
}

12
.sqlx/query-8ad1d8fd1839cf30f9cc383505ef371a4b813cdf2381396cd0aa41833f7eb9a8.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "UPDATE events SET deleted_at = datetime() WHERE (principal, cid, uid) = (?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 3
},
"nullable": []
},
"hash": "8ad1d8fd1839cf30f9cc383505ef371a4b813cdf2381396cd0aa41833f7eb9a8"
}

12
.sqlx/query-9f7e3d16640a0de1fd4e4b37cadb350f0bc02d26d0ba1a61a305b7e4aae3415b.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "REPLACE INTO events (principal, cid, uid, ics) VALUES (?, ?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 4
},
"nullable": []
},
"hash": "9f7e3d16640a0de1fd4e4b37cadb350f0bc02d26d0ba1a61a305b7e4aae3415b"
}

26
.sqlx/query-9f8b564d4ecb98256e2dcd99165d4593c4c7df812d4d13e3b7829be11a1d81a8.json generated
View File

@@ -1,26 +0,0 @@
{
"db_name": "SQLite",
"query": "SELECT uid, ics FROM events WHERE principal = ? AND cid = ?",
"describe": {
"columns": [
{
"name": "uid",
"ordinal": 0,
"type_info": "Text"
},
{
"name": "ics",
"ordinal": 1,
"type_info": "Text"
}
],
"parameters": {
"Right": 2
},
"nullable": [
false,
false
]
},
"hash": "9f8b564d4ecb98256e2dcd99165d4593c4c7df812d4d13e3b7829be11a1d81a8"
}

12
.sqlx/query-a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "UPDATE calendars SET deleted_at = datetime() WHERE (principal, id) = (?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 2
},
"nullable": []
},
"hash": "a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15"
}

12
.sqlx/query-afeba8a8451de7646f4dab5be1c8794de8eb7845867e41921d301055782f9d9d.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "UPDATE events SET deleted_at = NULL WHERE (principal, cid, uid) = (?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 3
},
"nullable": []
},
"hash": "afeba8a8451de7646f4dab5be1c8794de8eb7845867e41921d301055782f9d9d"
}

12
.sqlx/query-c7a56d737fc8627427d0be202c3c77bb95c1a25b6a3c0c389ef0ad4f468320ee.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone = ?\n WHERE (principal, id) = (?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 9
},
"nullable": []
},
"hash": "c7a56d737fc8627427d0be202c3c77bb95c1a25b6a3c0c389ef0ad4f468320ee"
}

12
.sqlx/query-ea38d8cf5d5b398eb13ce5d36f5e68ec8ebfbd127b68316b12c4dc9c3007ff50.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "DELETE FROM events WHERE cid = ? AND uid = ?",
"describe": {
"columns": [],
"parameters": {
"Right": 2
},
"nullable": []
},
"hash": "ea38d8cf5d5b398eb13ce5d36f5e68ec8ebfbd127b68316b12c4dc9c3007ff50"
}

12
.sqlx/query-eba774e8d8afa04d33443b42ec3a4af1c2f34515288bade397b87a1e43d789df.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, timezone)\n VALUES (?, ?, ?, ?, ?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 7
},
"nullable": []
},
"hash": "eba774e8d8afa04d33443b42ec3a4af1c2f34515288bade397b87a1e43d789df"
}

62
.sqlx/query-fb4e007cf9faaa033cb2936368beb23ec942a31bcdad9a4622cc266c210f954f.json generated
View File

@@ -1,62 +0,0 @@
{
"db_name": "SQLite",
"query": "SELECT principal, id, \"order\", displayname, description, color, timezone, deleted_at\n FROM calendars\n WHERE (principal, id) = (?, ?)",
"describe": {
"columns": [
{
"name": "principal",
"ordinal": 0,
"type_info": "Text"
},
{
"name": "id",
"ordinal": 1,
"type_info": "Text"
},
{
"name": "order",
"ordinal": 2,
"type_info": "Int64"
},
{
"name": "displayname",
"ordinal": 3,
"type_info": "Text"
},
{
"name": "description",
"ordinal": 4,
"type_info": "Text"
},
{
"name": "color",
"ordinal": 5,
"type_info": "Text"
},
{
"name": "timezone",
"ordinal": 6,
"type_info": "Text"
},
{
"name": "deleted_at",
"ordinal": 7,
"type_info": "Datetime"
}
],
"parameters": {
"Right": 2
},
"nullable": [
false,
false,
false,
true,
true,
true,
false,
true
]
},
"hash": "fb4e007cf9faaa033cb2936368beb23ec942a31bcdad9a4622cc266c210f954f"
}

2
crates/store/src/sqlite_store.rs
View File

@@ -145,7 +145,7 @@ impl CalendarStore for SqliteCalendarStore {
async fn get_events(&self, principal: &str, cid: &str) -> Result<Vec<Event>, Error> {
sqlx::query_as!(
EventRow,
"SELECT uid, ics FROM events WHERE principal = ? AND cid = ?",
"SELECT uid, ics FROM events WHERE principal = ? AND cid = ? AND deleted_at IS NULL",
principal,
cid
)