Apply typename limit to table names in SQL queries

Author: kellerkindt

asn1rs-model/src/gen/rust/shared_psql.rs

@@ -4,19 +4,23 @@ use crate::model::sql::Sql;
 use crate::model::{Model, RustType};
 
 pub(crate) fn select_statement_single(name: &str) -> String {
+    let name = Model::<Sql>::sql_definition_name(name);
     format!("SELECT * FROM {} WHERE id = $1", name)
 }
 
 #[cfg(feature = "async-psql")]
 pub(crate) fn select_statement_many(name: &str) -> String {
+    let name = Model::<Sql>::sql_definition_name(name);
     format!("SELECT * FROM {} WHERE id = ANY($1)", name)
 }
 
 pub(crate) fn tuple_struct_insert_statement(name: &str) -> String {
+    let name = Model::<Sql>::sql_definition_name(name);
     format!("INSERT INTO {} DEFAULT VALUES RETURNING id", name)
 }
 
 pub(crate) fn struct_insert_statement(name: &str, fields: &[Field]) -> String {
+    let name = Model::<Sql>::sql_definition_name(name);
     format!(
         "INSERT INTO {}({}) VALUES({}) RETURNING id",
         name,
@@ -44,6 +48,7 @@ pub(crate) fn struct_insert_statement(name: &str, fields: &[Field]) -> String {
 }
 
 pub(crate) fn data_enum_insert_statement(name: &str, enumeration: &DataEnum) -> String {
+    let name = Model::<Sql>::sql_definition_name(name);
     format!(
         "INSERT INTO {}({}) VALUES({}) RETURNING id",
         name,
@@ -64,7 +69,10 @@ pub(crate) fn data_enum_insert_statement(name: &str, enumeration: &DataEnum) ->
 pub(crate) fn struct_list_entry_insert_statement(struct_name: &str, field_name: &str) -> String {
     format!(
         "INSERT INTO {}(list, value) VALUES ($1, $2)",
-        Model::<Sql>::struct_list_entry_table_name(struct_name, field_name),
+        Model::<Sql>::sql_definition_name(&Model::<Sql>::struct_list_entry_table_name(
+            struct_name,
+            field_name
+        )),
     )
 }
 
@@ -73,7 +81,9 @@ pub(crate) fn struct_list_entry_select_referenced_value_statement(
     field_name: &str,
     other_type: &str,
 ) -> String {
-    let listentry_table = Model::<Sql>::struct_list_entry_table_name(struct_name, field_name);
+    let listentry_table = Model::<Sql>::sql_definition_name(
+        &Model::<Sql>::struct_list_entry_table_name(struct_name, field_name),
+    );
     format!(
         "SELECT * FROM {} WHERE id IN (SELECT value FROM {} WHERE list = $1)",
         RustCodeGenerator::rust_variant_name(other_type),
@@ -85,25 +95,26 @@ pub(crate) fn struct_list_entry_select_value_statement(
     struct_name: &str,
     field_name: &str,
 ) -> String {
-    let listentry_table = Model::<Sql>::struct_list_entry_table_name(struct_name, field_name);
+    let listentry_table = Model::<Sql>::sql_definition_name(
+        &Model::<Sql>::struct_list_entry_table_name(struct_name, field_name),
+    );
     format!("SELECT value FROM {} WHERE list = $1", listentry_table,)
 }
 
 pub(crate) fn list_entry_insert_statement(name: &str) -> String {
-    format!("INSERT INTO {}ListEntry(list, value) VALUES ($1, $2)", name)
+    let name = Model::<Sql>::sql_definition_name(&format!("{name}ListEntry"));
+    format!("INSERT INTO {}(list, value) VALUES ($1, $2)", name)
 }
 
 pub(crate) fn list_entry_query_statement(name: &str, inner: &RustType) -> String {
+    let name_le = Model::<Sql>::sql_definition_name(&format!("{name}ListEntry"));
     if Model::<Sql>::is_primitive(inner) {
-        format!(
-            "SELECT value FROM {}ListEntry WHERE {}ListEntry.list = $1",
-            name, name
-        )
+        format!("SELECT value FROM {name_le} WHERE {name_le}.list = $1",)
     } else {
         let inner = inner.clone().as_inner_type().to_string();
+        let inner = Model::<Sql>::sql_definition_name(&inner);
         format!(
-            "SELECT * FROM {} INNER JOIN {}ListEntry ON {}.id = {}ListEntry.value WHERE {}ListEntry.list = $1",
-            inner, name, inner, name, name
+            "SELECT * FROM {inner} INNER JOIN {name_le} ON {inner}.id = {name_le}.value WHERE {name_le}.list = $1"
         )
     }
 }