comment out cornucopia generating for now

Author: HTGAzureX1212

database/hartex-database-queries/build.rs

@@ -31,7 +31,7 @@ pub fn main() {
         return;
     }
 
-    let api_backend_queries_path = "queries/api_backend";
+    /*let api_backend_queries_path = "queries/api_backend";
     println!("cargo::rerun-if-changed={api_backend_queries_path}");
 
     let url = env::var("API_PGSQL_URL").unwrap();
@@ -74,7 +74,7 @@ pub fn main() {
             is_async: true,
         },
     )
-    .unwrap();
+    .unwrap();*/
 
     hartex_database_typedsql::generate_queries_with_schemas("schemas", "queries", "").unwrap();
 }

database/hartex-database-queries/queries/api_backend/start_timestamp_select_by_component.sql

@@ -4,4 +4,4 @@ SELECT
 FROM
     "APIBackend".public."StartTimestamps"
 WHERE
-    "component" = :component;
+    "component" = @component;

database/hartex-database-queries/queries/api_backend/start_timestamp_upsert.sql

@@ -4,4 +4,4 @@ INSERT INTO
 VALUES (:component, :timestamp)
 ON CONFLICT ("component") DO UPDATE
     SET
-        "timestamp" = :timestamp;
+        "timestamp" = @timestamp;

database/hartex-database-queries/queries/configuration/plugin_enabled.sql

@@ -5,6 +5,6 @@ SELECT EXISTS(
     FROM
         "Nightly"."GuildConfigurations"
     WHERE
-        "enabled_plugins" @> array[ :plugin ] AND
-        "guild_id" = :guild_id
+        "enabled_plugins" @> array[ @plugin ] AND
+        "guild_id" = @guild_id
 );

database/hartex-database-queries/queries/discord_frontend/cached_emoji_select_by_guild_id.sql

@@ -4,4 +4,4 @@ SELECT
 FROM
     "DiscordFrontend"."Nightly"."CachedEmojis"
 WHERE
-    "guild_id" = :guild_id;
+    "guild_id" = @guild_id;

database/hartex-database-queries/queries/discord_frontend/cached_emoji_select_by_id.sql

@@ -4,4 +4,4 @@ SELECT
 FROM
     "DiscordFrontend"."Nightly"."CachedEmojis"
 WHERE
-    "id" = :id;
+    "id" = @id;

database/hartex-database-queries/queries/discord_frontend/cached_emoji_upsert.sql

@@ -1,9 +1,9 @@
 --! cached_emoji_upsert (animated, name, id, guild_id, managed)
 INSERT INTO "DiscordFrontend"."Nightly"."CachedEmojis" ("animated", "name", "id", "guild_id", "managed")
-VALUES (:animated, :name, :id, :guild_id, :managed)
+VALUES (@animated, @name, @id, @guild_id, @managed)
 ON CONFLICT ("id") DO UPDATE
     SET
-        "guild_id" = :guild_id,
-        "animated" = :animated,
+        "guild_id" = @guild_id,
+        "animated" = @animated,
         "name" = :name,
-        "managed" = :managed;
+        "managed" = @managed;

database/hartex-database-queries/queries/discord_frontend/cached_guild_select_by_id.sql

@@ -4,4 +4,4 @@ SELECT
 FROM
     "DiscordFrontend"."Nightly"."CachedGuilds"
 WHERE
-    "id" = :id;
+    "id" = @id;

database/hartex-database-queries/queries/discord_frontend/cached_guild_upsert.sql

@@ -1,17 +1,17 @@
 --! cached_guild_upsert (default_message_notifications, explicit_content_filter, features, icon?, large, name, owner_id, id, mfa_level, premium_subscription_count?, premium_tier, verification_level)
 INSERT INTO
     "DiscordFrontend"."Nightly"."CachedGuilds" ("default_message_notifications", "explicit_content_filter", "features", "icon", "large", "name", "owner_id", "id", "mfa_level", "premium_subscription_count", "premium_tier", "verification_level")
-VALUES (:default_message_notifications, :explicit_content_filter, :features, :icon, :large, :name, :owner_id, :id, :mfa_level, :premium_subscription_count, :premium_tier, :verification_level)
+VALUES (@default_message_notifications, @explicit_content_filter, @features, @icon, @large, @name, @owner_id, @id, @mfa_level, @premium_subscription_count, @premium_tier, @verification_level)
 ON CONFLICT ("id") DO UPDATE
     SET
-        "default_message_notifications" = :default_message_notifications,
-        "explicit_content_filter" = :explicit_content_filter,
-        "features" = :features,
-        "icon" = :icon,
-        "large" = :large,
-        "mfa_level" = :mfa_level,
-        "name" = :name,
-        "owner_id" = :owner_id,
-        "premium_subscription_count" = :premium_subscription_count,
-        "premium_tier" = :premium_tier,
-        "verification_level" = :verification_level;
+        "default_message_notifications" = @default_message_notifications,
+        "explicit_content_filter" = @explicit_content_filter,
+        "features" = @features,
+        "icon" = @icon,
+        "large" = @large,
+        "mfa_level" = @mfa_level,
+        "name" = @name,
+        "owner_id" = @owner_id,
+        "premium_subscription_count" = @premium_subscription_count,
+        "premium_tier" = @premium_tier,
+        "verification_level" = @verification_level;

database/hartex-database-queries/queries/discord_frontend/cached_member_select_by_guild_id.sql

@@ -1,7 +1,7 @@
---! cached_member_select_by_guild_id (guild_id) : (flags, joined_at?, nick?, user_id, guild_id, roles)
+--! cached_member_select_by_guild_id (guild_id) @ (flags, joined_at?, nick?, user_id, guild_id, roles)
 SELECT
     *
 FROM
     "DiscordFrontend"."Nightly"."CachedMembers"
 WHERE
-    "guild_id" = :guild_id;
+    "guild_id" = @guild_id;

database/hartex-database-queries/queries/discord_frontend/cached_member_select_by_user_id_and_guild_id.sql

@@ -1,8 +1,8 @@
---! cached_member_select_by_user_id_and_guild_id : (flags, joined_at?, nick?, user_id, guild_id, roles)
+--! cached_member_select_by_user_id_and_guild_id @ (flags, joined_at?, nick?, user_id, guild_id, roles)
 SELECT
     *
 FROM
     "DiscordFrontend"."Nightly"."CachedMembers"
 WHERE
-    user_id = :user_id AND
-    guild_id = :guild_id;
+    user_id = @user_id AND
+    guild_id = @guild_id;

database/hartex-database-queries/queries/discord_frontend/cached_member_upsert.sql

@@ -1,9 +1,9 @@
 --! cached_member_upsert (flags, joined_at?, nick?, user_id, guild_id, roles)
 INSERT INTO "DiscordFrontend"."Nightly"."CachedMembers" ("flags", "joined_at", "nick", "user_id", "guild_id", "roles")
-VALUES (:flags, :joined_at, :nick, :user_id, :guild_id, :roles)
+VALUES (@flags, @joined_at, @nick, @user_id, @guild_id, @roles)
 ON CONFLICT ("user_id", "guild_id") DO UPDATE
     SET
-        "flags" = :flags,
-        "joined_at" = :joined_at,
-        "nick" = :nick,
-        "roles" = :roles;
+        "flags" = @flags,
+        "joined_at" = @joined_at,
+        "nick" = @nick,
+        "roles" = @roles;

database/hartex-database-queries/queries/discord_frontend/cached_role_select_by_guild_id.sql

@@ -1,8 +1,8 @@
---! cached_role_select_by_guild_id (guild_id) : (color, icon?, id, guild_id, flags, hoist, managed, mentionable, position)
+--! cached_role_select_by_guild_id (guild_id) @ (color, icon?, id, guild_id, flags, hoist, managed, mentionable, position)
 SELECT
     *
 FROM
     "DiscordFrontend"."Nightly"."CachedRoles"
 WHERE
-    "guild_id" = :guild_id;
+    "guild_id" = @guild_id;
 

database/hartex-database-queries/queries/discord_frontend/cached_role_select_by_id_and_guild_id.sql

@@ -1,8 +1,8 @@
---! cached_role_select_by_id_and_guild_id : (color, icon?, id, guild_id, flags, hoist, managed, mentionable, position)
+--! cached_role_select_by_id_and_guild_id @ (color, icon?, id, guild_id, flags, hoist, managed, mentionable, position)
 SELECT
     *
 FROM
     "DiscordFrontend"."Nightly"."CachedRoles"
 WHERE
-    "id" = :id AND
-    "guild_id" = :guild_id;
+    "id" = @id AND
+    "guild_id" = @guild_id;

database/hartex-database-queries/queries/discord_frontend/cached_role_upsert.sql

@@ -1,12 +1,12 @@
 --! cached_role_upsert (color, icon?, id, guild_id, flags, hoist, managed, mentionable, position)
 INSERT INTO "DiscordFrontend"."Nightly"."CachedRoles" ("color", "icon", "id", "guild_id", "flags", "hoist", "managed", "mentionable", "position")
-VALUES (:color, :icon, :id, :guild_id, :flags, :hoist, :managed, :mentionable, :position)
+VALUES (@color, @icon, @id, @guild_id, @flags, @hoist, @managed, @mentionable, @position)
 ON CONFLICT ("id", "guild_id") DO UPDATE
     SET
-        "color" = :color,
-        "icon" = :icon,
-        "flags" = :flags,
-        "hoist" = :hoist,
-        "managed" = :managed,
-        "mentionable" = :mentionable,
-        "position" = :position;
+        "color" = @color,
+        "icon" = @icon,
+        "flags" = @flags,
+        "hoist" = @hoist,
+        "managed" = @managed,
+        "mentionable" = @mentionable,
+        "position" = @position;

database/hartex-database-queries/queries/discord_frontend/cached_user_select_by_id.sql

@@ -1,7 +1,7 @@
---! cached_user_select_by_id : (avatar?, id, bot, name, discriminator, global_name?)
+--! cached_user_select_by_id @ (avatar?, id, bot, name, discriminator, global_name?)
 SELECT
     *
 FROM
     "DiscordFrontend"."Nightly"."CachedUsers"
 WHERE
-    "id" = :id;
+    "id" = @id;

database/hartex-database-queries/queries/discord_frontend/cached_user_upsert.sql

@@ -1,10 +1,10 @@
 --! cached_user_upsert (avatar?, id, bot, name, discriminator, global_name?)
 INSERT INTO "DiscordFrontend"."Nightly"."CachedUsers" ("avatar", "id", "bot", "name", "discriminator", "global_name")
-VALUES (:avatar, :id, :bot, :name, :discriminator, :global_name)
+VALUES (@avatar, @id, @bot, @name, @discriminator, @global_name)
 ON CONFLICT ("id") DO UPDATE
     SET
-        "avatar" = :avatar,
-        "bot" = :bot,
-        "name" = :name,
-        "discriminator" = :discriminator,
-        "global_name" = :global_name;
+        "avatar" = @avatar,
+        "bot" = @bot,
+        "name" = @name,
+        "discriminator" = @discriminator,
+        "global_name" = @global_name;

database/hartex-database-typedsql/src/lib.rs

@@ -44,7 +44,8 @@ where
 
     let _ = query::read_queries(queries_dir.as_ref())?
         .map(|info| query::parse_query(info, schemas.clone()))
-        .filter_map(Result::ok);
+        .filter_map(Result::ok)
+        .collect::<Vec<_>>();
 
     // todo
     Ok(())

database/hartex-database-typedsql/src/query.rs

@@ -63,6 +63,9 @@ pub(crate) fn read_queries(
         }))
 }
 
-pub(crate) fn parse_query(_: RawQueryInfo, _: HashMap<String, SchemaInfo>) -> crate::error::Result<QueryInfo> {
+#[allow(dead_code)]
+pub(crate) fn parse_query(query_info: RawQueryInfo, _: HashMap<String, SchemaInfo>) -> crate::error::Result<QueryInfo> {
+    let _ = pg_query::parse(query_info.contents.as_str())?;
+
     Ok(QueryInfo)
 }