From b4b907a73a58f22fb3622123b818ea84378b37d9 Mon Sep 17 00:00:00 2001 From: Gnome! Date: Fri, 9 Feb 2024 15:37:03 +0000 Subject: [PATCH] Update nightly version to fix broken nightly detection (#2761) --- .github/workflows/ci.yml | 2 +- ...8cdb981362e089a462fa6d156b27b57468678.json | 26 ++++++++ ...76ef09a92d3f1d46021b94ded4e9c073775d1.json | 12 ++++ ...494f2c758dd890293c313811a8c4acb8edaeb.json | 20 ++++++ ...190e9be4cf55d7308973d74cb180cd2323f8a.json | 12 ++++ examples/e16_sqlite_database/Cargo.toml | 2 +- examples/e16_sqlite_database/sqlx-data.json | 65 ------------------- 7 files changed, 72 insertions(+), 67 deletions(-) create mode 100644 examples/e16_sqlite_database/.sqlx/query-597707a72d1ed8eab0cb48a3bef8cdb981362e089a462fa6d156b27b57468678.json create mode 100644 examples/e16_sqlite_database/.sqlx/query-7636fc64c882305305814ffb66676ef09a92d3f1d46021b94ded4e9c073775d1.json create mode 100644 examples/e16_sqlite_database/.sqlx/query-8a7bb6fe3b960d1d10bc8442bb1494f2c758dd890293c313811a8c4acb8edaeb.json create mode 100644 examples/e16_sqlite_database/.sqlx/query-90153b8cd85a905a1d5557ad4eb190e9be4cf55d7308973d74cb180cd2323f8a.json delete mode 100644 examples/e16_sqlite_database/sqlx-data.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a6073eea26..65781d79d7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: [push, pull_request] env: rust_min: 1.74.0 - rust_nightly: nightly-2023-11-16 + rust_nightly: nightly-2024-02-08 jobs: test: diff --git a/examples/e16_sqlite_database/.sqlx/query-597707a72d1ed8eab0cb48a3bef8cdb981362e089a462fa6d156b27b57468678.json b/examples/e16_sqlite_database/.sqlx/query-597707a72d1ed8eab0cb48a3bef8cdb981362e089a462fa6d156b27b57468678.json new file mode 100644 index 00000000000..c3edb122b3e --- /dev/null +++ b/examples/e16_sqlite_database/.sqlx/query-597707a72d1ed8eab0cb48a3bef8cdb981362e089a462fa6d156b27b57468678.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "SELECT rowid, task FROM todo WHERE user_id = ? ORDER BY rowid LIMIT 1 OFFSET ?", + "describe": { + "columns": [ + { + "name": "rowid", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "task", + "ordinal": 1, + "type_info": "Text" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false, + false + ] + }, + "hash": "597707a72d1ed8eab0cb48a3bef8cdb981362e089a462fa6d156b27b57468678" +} diff --git a/examples/e16_sqlite_database/.sqlx/query-7636fc64c882305305814ffb66676ef09a92d3f1d46021b94ded4e9c073775d1.json b/examples/e16_sqlite_database/.sqlx/query-7636fc64c882305305814ffb66676ef09a92d3f1d46021b94ded4e9c073775d1.json new file mode 100644 index 00000000000..24bb9397fc5 --- /dev/null +++ b/examples/e16_sqlite_database/.sqlx/query-7636fc64c882305305814ffb66676ef09a92d3f1d46021b94ded4e9c073775d1.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO todo (task, user_id) VALUES (?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "7636fc64c882305305814ffb66676ef09a92d3f1d46021b94ded4e9c073775d1" +} diff --git a/examples/e16_sqlite_database/.sqlx/query-8a7bb6fe3b960d1d10bc8442bb1494f2c758dd890293c313811a8c4acb8edaeb.json b/examples/e16_sqlite_database/.sqlx/query-8a7bb6fe3b960d1d10bc8442bb1494f2c758dd890293c313811a8c4acb8edaeb.json new file mode 100644 index 00000000000..ae9fa36ead9 --- /dev/null +++ b/examples/e16_sqlite_database/.sqlx/query-8a7bb6fe3b960d1d10bc8442bb1494f2c758dd890293c313811a8c4acb8edaeb.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT task FROM todo WHERE user_id = ? ORDER BY rowid", + "describe": { + "columns": [ + { + "name": "task", + "ordinal": 0, + "type_info": "Text" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "8a7bb6fe3b960d1d10bc8442bb1494f2c758dd890293c313811a8c4acb8edaeb" +} diff --git a/examples/e16_sqlite_database/.sqlx/query-90153b8cd85a905a1d5557ad4eb190e9be4cf55d7308973d74cb180cd2323f8a.json b/examples/e16_sqlite_database/.sqlx/query-90153b8cd85a905a1d5557ad4eb190e9be4cf55d7308973d74cb180cd2323f8a.json new file mode 100644 index 00000000000..e51ccc9a2a2 --- /dev/null +++ b/examples/e16_sqlite_database/.sqlx/query-90153b8cd85a905a1d5557ad4eb190e9be4cf55d7308973d74cb180cd2323f8a.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM todo WHERE rowid = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "90153b8cd85a905a1d5557ad4eb190e9be4cf55d7308973d74cb180cd2323f8a" +} diff --git a/examples/e16_sqlite_database/Cargo.toml b/examples/e16_sqlite_database/Cargo.toml index d7b08e837cd..eeda2a295b1 100644 --- a/examples/e16_sqlite_database/Cargo.toml +++ b/examples/e16_sqlite_database/Cargo.toml @@ -7,4 +7,4 @@ edition = "2018" [dependencies] serenity = { path = "../../", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] } tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] } -sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "sqlite", "offline"] } +sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "sqlite"] } diff --git a/examples/e16_sqlite_database/sqlx-data.json b/examples/e16_sqlite_database/sqlx-data.json deleted file mode 100644 index 93bc59375c2..00000000000 --- a/examples/e16_sqlite_database/sqlx-data.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "db": "SQLite", - "597707a72d1ed8eab0cb48a3bef8cdb981362e089a462fa6d156b27b57468678": { - "query": "SELECT rowid, task FROM todo WHERE user_id = ? ORDER BY rowid LIMIT 1 OFFSET ?", - "describe": { - "columns": [ - { - "name": "rowid", - "ordinal": 0, - "type_info": "Int64" - }, - { - "name": "task", - "ordinal": 1, - "type_info": "Text" - } - ], - "parameters": { - "Right": 2 - }, - "nullable": [ - false, - false - ] - } - }, - "7636fc64c882305305814ffb66676ef09a92d3f1d46021b94ded4e9c073775d1": { - "query": "INSERT INTO todo (task, user_id) VALUES (?, ?)", - "describe": { - "columns": [], - "parameters": { - "Right": 2 - }, - "nullable": [] - } - }, - "8a7bb6fe3b960d1d10bc8442bb1494f2c758dd890293c313811a8c4acb8edaeb": { - "query": "SELECT task FROM todo WHERE user_id = ? ORDER BY rowid", - "describe": { - "columns": [ - { - "name": "task", - "ordinal": 0, - "type_info": "Text" - } - ], - "parameters": { - "Right": 1 - }, - "nullable": [ - false - ] - } - }, - "90153b8cd85a905a1d5557ad4eb190e9be4cf55d7308973d74cb180cd2323f8a": { - "query": "DELETE FROM todo WHERE rowid = ?", - "describe": { - "columns": [], - "parameters": { - "Right": 1 - }, - "nullable": [] - } - } -} \ No newline at end of file