rename

SeaQL · Apr 24, 2023 · 5329fb2 · 5329fb2
1 parent d615448
commit 5329fb2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/postgres/query/constraints/mod.rs b/src/postgres/query/constraints/mod.rs
@@ -9,7 +9,7 @@ pub use referential_constraints::*;
 pub use table_constraints::*;
 
 use super::{InformationSchema, SchemaQueryBuilder};
-use crate::{postgres::query::select_table_and_view, sqlx_types::postgres::PgRow};
+use crate::{postgres::query::select_base_table_and_view, sqlx_types::postgres::PgRow};
 use sea_query::{Alias, Condition, Expr, Iden, JoinType, Order, Query, SeaRc, SelectStatement};
 
 #[derive(Debug, Default)]
@@ -163,7 +163,8 @@ impl SchemaQueryBuilder {
             )
             .and_where(Expr::col((Schema::TableConstraints, Tcf::TableName)).eq(table.to_string()))
             .and_where(
-                Expr::col((rcsq.clone(), Kcuf::TableName)).not_in_subquery(select_table_and_view()),
+                Expr::col((rcsq.clone(), Kcuf::TableName))
+                    .not_in_subquery(select_base_table_and_view()),
             )
             .order_by((Schema::TableConstraints, Tcf::ConstraintName), Order::Asc)
             .order_by((Schema::KeyColumnUsage, Kcuf::OrdinalPosition), Order::Asc)

diff --git a/src/postgres/query/schema.rs b/src/postgres/query/schema.rs
@@ -17,7 +17,7 @@ pub enum InformationSchema {
     ConstraintColumnUsage,
 }
 
-pub(crate) fn select_table_and_view() -> SelectStatement {
+pub(crate) fn select_base_table_and_view() -> SelectStatement {
     #[derive(Debug, Iden)]
     enum PgClass {
         Table,

diff --git a/src/postgres/query/table.rs b/src/postgres/query/table.rs
@@ -1,4 +1,4 @@
-use super::{select_table_and_view, InformationSchema, SchemaQueryBuilder};
+use super::{select_base_table_and_view, InformationSchema, SchemaQueryBuilder};
 use crate::sqlx_types::postgres::PgRow;
 use sea_query::{Expr, Iden, Query, SeaRc, SelectStatement};
 
@@ -46,7 +46,9 @@ impl SchemaQueryBuilder {
             .from((InformationSchema::Schema, InformationSchema::Tables))
             .and_where(Expr::col(TablesFields::TableSchema).eq(schema.to_string()))
             .and_where(Expr::col(TablesFields::TableType).eq(TableType::BaseTable.to_string()))
-            .and_where(Expr::col(TablesFields::TableName).not_in_subquery(select_table_and_view()))
+            .and_where(
+                Expr::col(TablesFields::TableName).not_in_subquery(select_base_table_and_view()),
+            )
             .take()
     }
 }