grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
lemmy/crates/db_schema/src/diesel_ltree.patch

37 lines
1 KiB
Diff
Raw Normal View History

Revert "feat: re-added captcha checks (#3249)" (#3288) This reverts commit 8a086c82405bc8e2c8cb2fbbcceb10418f231d1b.
2023-06-23 11:02:05 +00:00
diff --git a/crates/db_schema/src/schema.rs b/crates/db_schema/src/schema.rs
index 255c6422..f2ccf5e2 100644
--- a/crates/db_schema/src/schema.rs
+++ b/crates/db_schema/src/schema.rs
@@ -2,16 +2,12 @@
Adding diesel enums for SortType and ListingType (#2808) * Adding diesel enums for SortType and ListingType - Uses diesel-derive-enum. - Adds diesel.toml , so we can again use the auto-generated schema.rs - Fixes a lot of DB null issues and column ordering issues. - Fixes #1136 - Also replaces RegistrationMode boilerplate. * Fixing unit tests 1. * Remove comment line. * Before patch. * Before again. * Using patch file to fix diesel_ltree issue with diesel.toml * Adding some yalc ignores * Fixing RegistrationMode enums * Adding woodpecker diesel schema check. * Try adding openssl 1. * Try using diesel-cli image 1 * Try using diesel-cli image 2 * Try using diesel-cli image 3 * Try using diesel-cli image 4 * Try using diesel-cli image 5 * Try using diesel-cli image 6 * Try using diesel-cli image 7 * Try using diesel-cli image 8 * Try using diesel-cli image 9 * Try using diesel-cli image 10 * Try using diesel-cli image 11 * Try using diesel-cli image 12 * Try using diesel-cli image 13
2023-04-17 19:19:51 +00:00
Revert "feat: re-added captcha checks (#3249)" (#3288) This reverts commit 8a086c82405bc8e2c8cb2fbbcceb10418f231d1b.
2023-06-23 11:02:05 +00:00
pub mod sql_types {
feat: re-added captcha checks (#3249)
2023-06-23 09:47:12 +00:00
#[derive(diesel::sql_types::SqlType)]
Revert "feat: re-added captcha checks (#3249)" (#3288) This reverts commit 8a086c82405bc8e2c8cb2fbbcceb10418f231d1b.
2023-06-23 11:02:05 +00:00
#[diesel(postgres_type(name = "listing_type_enum"))]
pub struct ListingTypeEnum;
- #[derive(diesel::sql_types::SqlType)]
Adding diesel enums for SortType and ListingType (#2808) * Adding diesel enums for SortType and ListingType - Uses diesel-derive-enum. - Adds diesel.toml , so we can again use the auto-generated schema.rs - Fixes a lot of DB null issues and column ordering issues. - Fixes #1136 - Also replaces RegistrationMode boilerplate. * Fixing unit tests 1. * Remove comment line. * Before patch. * Before again. * Using patch file to fix diesel_ltree issue with diesel.toml * Adding some yalc ignores * Fixing RegistrationMode enums * Adding woodpecker diesel schema check. * Try adding openssl 1. * Try using diesel-cli image 1 * Try using diesel-cli image 2 * Try using diesel-cli image 3 * Try using diesel-cli image 4 * Try using diesel-cli image 5 * Try using diesel-cli image 6 * Try using diesel-cli image 7 * Try using diesel-cli image 8 * Try using diesel-cli image 9 * Try using diesel-cli image 10 * Try using diesel-cli image 11 * Try using diesel-cli image 12 * Try using diesel-cli image 13
2023-04-17 19:19:51 +00:00
- #[diesel(postgres_type(name = "ltree"))]
- pub struct Ltree;
-
Revert "feat: re-added captcha checks (#3249)" (#3288) This reverts commit 8a086c82405bc8e2c8cb2fbbcceb10418f231d1b.
2023-06-23 11:02:05 +00:00
#[derive(diesel::sql_types::SqlType)]
Adding diesel enums for SortType and ListingType (#2808) * Adding diesel enums for SortType and ListingType - Uses diesel-derive-enum. - Adds diesel.toml , so we can again use the auto-generated schema.rs - Fixes a lot of DB null issues and column ordering issues. - Fixes #1136 - Also replaces RegistrationMode boilerplate. * Fixing unit tests 1. * Remove comment line. * Before patch. * Before again. * Using patch file to fix diesel_ltree issue with diesel.toml * Adding some yalc ignores * Fixing RegistrationMode enums * Adding woodpecker diesel schema check. * Try adding openssl 1. * Try using diesel-cli image 1 * Try using diesel-cli image 2 * Try using diesel-cli image 3 * Try using diesel-cli image 4 * Try using diesel-cli image 5 * Try using diesel-cli image 6 * Try using diesel-cli image 7 * Try using diesel-cli image 8 * Try using diesel-cli image 9 * Try using diesel-cli image 10 * Try using diesel-cli image 11 * Try using diesel-cli image 12 * Try using diesel-cli image 13
2023-04-17 19:19:51 +00:00
#[diesel(postgres_type(name = "registration_mode_enum"))]
pub struct RegistrationModeEnum;
Revert "feat: re-added captcha checks (#3249)" (#3288) This reverts commit 8a086c82405bc8e2c8cb2fbbcceb10418f231d1b.
2023-06-23 11:02:05 +00:00
#[derive(diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "sort_type_enum"))]
@@ -67,13 +63,13 @@ diesel::table! {
when_ -> Timestamp,
}
}
Adding diesel enums for SortType and ListingType (#2808) * Adding diesel enums for SortType and ListingType - Uses diesel-derive-enum. - Adds diesel.toml , so we can again use the auto-generated schema.rs - Fixes a lot of DB null issues and column ordering issues. - Fixes #1136 - Also replaces RegistrationMode boilerplate. * Fixing unit tests 1. * Remove comment line. * Before patch. * Before again. * Using patch file to fix diesel_ltree issue with diesel.toml * Adding some yalc ignores * Fixing RegistrationMode enums * Adding woodpecker diesel schema check. * Try adding openssl 1. * Try using diesel-cli image 1 * Try using diesel-cli image 2 * Try using diesel-cli image 3 * Try using diesel-cli image 4 * Try using diesel-cli image 5 * Try using diesel-cli image 6 * Try using diesel-cli image 7 * Try using diesel-cli image 8 * Try using diesel-cli image 9 * Try using diesel-cli image 10 * Try using diesel-cli image 11 * Try using diesel-cli image 12 * Try using diesel-cli image 13
2023-04-17 19:19:51 +00:00
diesel::table! {
use diesel::sql_types::*;
- use super::sql_types::Ltree;
+ use diesel_ltree::sql_types::Ltree;
comment (id) {
id -> Int4,
Revert "feat: re-added captcha checks (#3249)" (#3288) This reverts commit 8a086c82405bc8e2c8cb2fbbcceb10418f231d1b.
2023-06-23 11:02:05 +00:00
creator_id -> Int4,
post_id -> Int4,
content -> Text,
Reference in a new issue Copy permalink