refactor(WIP)!: 1

Author: TheRustifyer

canyon_core/src/query/operators.rs

@@ -1,6 +1,6 @@
 use crate::connection::database_type::DatabaseType;
 use crate::query::querybuilder::syntax::keyword::Keyword;
-use crate::query::querybuilder::syntax::tokens::{SqlToken, SqlTokens, Symbol, ToSqlTokens};
+use crate::query::querybuilder::syntax::tokens::{SqlTokens, Symbol, ToSqlTokens};
 use std::fmt::Display;
 
 /// Enumerated type for represent the comparison operations

canyon_core/src/query/querybuilder/syntax/ast/insert.rs

@@ -2,7 +2,7 @@ use crate::query::parameters::QueryParameter;
 use crate::query::querybuilder::syntax::column::ColumnRef;
 use crate::query::querybuilder::syntax::emitter::AstProcessor;
 use crate::query::querybuilder::syntax::query_kind::QueryKind;
-use transient::{Any, Transient};
+use transient::Transient;
 
 #[derive(Default, Transient)]
 pub struct InsertAst<'a> {

canyon_core/src/query/querybuilder/syntax/column.rs

@@ -1,8 +1,7 @@
 use crate::query::bounds::FieldIdentifier;
 use crate::query::querybuilder::syntax::keyword::Keyword;
 use crate::query::querybuilder::syntax::symbol::Symbol::Dot;
-use crate::query::querybuilder::syntax::tokens::{SqlToken, SqlTokens, ToSqlTokens};
-use std::borrow::Cow;
+use crate::query::querybuilder::syntax::tokens::{SqlTokens, ToSqlTokens};
 
 #[derive(Debug, Clone, Default)]
 pub struct ColumnRef<'a> {
@@ -43,7 +42,7 @@ impl<'a> ToSqlTokens<'a> for ColumnRef<'a> {
 }
 
 impl<'a> ColumnRef<'a> {
-    pub fn new(column_name: &'a str) -> Self {
+    pub const fn new(column_name: &'a str) -> Self {
         Self {
             column: column_name,
             table: None,
@@ -72,7 +71,7 @@ impl<'a> ColumnRef<'a> {
 mod __impl {
     use crate::query::querybuilder::syntax::column::{__detail, ColumnRef};
 
-    pub(crate) fn column_ref_from_str_ref(value: &str) -> ColumnRef {
+    pub(crate) fn column_ref_from_str_ref(value: &str) -> ColumnRef<'_> {
         let trimmed = value.trim();
 
         let (before_alias, alias) = match __detail::find_case_insensitive_as(trimmed) {

canyon_core/src/query/querybuilder/syntax/emitter/backends/pg.rs

@@ -1,5 +1,5 @@
 use crate::query::querybuilder::syntax::dialect::PgDialect;
-use crate::query::querybuilder::syntax::emitter::{AstProcessor, SqlEmitter};
+use crate::query::querybuilder::syntax::emitter::SqlEmitter;
 use crate::query::querybuilder::syntax::tokens::SqlTokens;
 
 #[derive(Default)]

canyon_core/src/query/querybuilder/syntax/emitter/types/select.rs

@@ -1,6 +1,5 @@
 use crate::query::querybuilder::syntax::ast::select::SelectAst;
 use crate::query::querybuilder::syntax::ast::BaseAst;
-use crate::query::querybuilder::syntax::emitter::types::helpers;
 use crate::query::querybuilder::syntax::emitter::{AstProcessor, SqlEmitter};
 use crate::query::querybuilder::syntax::keyword::Keyword;
 use crate::query::querybuilder::syntax::tokens::SqlTokens;
@@ -23,8 +22,8 @@ where
 
         tokens.keyword(Keyword::Select);
 
-        emit_columns(select_ast, &mut tokens);
-        emit_from(base_ast, &mut tokens);
+        __impl::emit_columns(select_ast, &mut tokens);
+        __impl::emit_from(base_ast, &mut tokens);
 
         tokens
     }
@@ -36,11 +35,20 @@ pub trait EmitSelect<'a>: SqlEmitter<'a> {
     -> SqlTokens<'a>;
 }
 
-pub(crate) fn emit_columns<'a>(ast: &SelectAst<'a>, tokens: &mut SqlTokens<'a>) {
-    helpers::emit_columns(&ast.columns, tokens)
-}
+mod __impl {
+    use crate::query::querybuilder::syntax::ast::select::SelectAst;
+    use crate::query::querybuilder::syntax::ast::BaseAst;
+    use crate::query::querybuilder::syntax::emitter::types::helpers;
+    use crate::query::querybuilder::syntax::keyword::Keyword;
+    use crate::query::querybuilder::syntax::tokens::{SqlTokens, ToSqlTokens};
+
+    pub(crate) fn emit_columns<'a>(ast: &SelectAst<'a>, tokens: &mut SqlTokens<'a>) {
+        helpers::emit_columns(&ast.columns, tokens)
+    }
 
-pub(crate) fn emit_from<'a>(base_ast: &BaseAst<'a>, tokens: &mut SqlTokens<'a>) {
-    //meta.to_tokens(emitter.tokens())
-    todo!()
+    pub(crate) fn emit_from<'a>(base_ast: &BaseAst<'a>, tokens: &mut SqlTokens<'a>) {
+        tokens.keyword(Keyword::From);
+        base_ast.table.to_tokens(tokens);
+        // TODO: the out opt-in params
+    }
 }

canyon_core/src/query/querybuilder/syntax/join.rs

@@ -33,19 +33,19 @@ pub struct JoinClause<'a> {
 }
 
 impl<'a> JoinClause<'a> {
-    pub fn new<I: Into<ColumnRef<'a>>>(
+    pub const fn new(
         kind: JoinKind,
         target_table: TableMetadata<'a>,
-        left: I,
+        left: ColumnRef<'a>,
         operator: Comp,
-        right: I,
+        right: ColumnRef<'a>,
     ) -> Self {
         Self {
             kind,
             target_table,
-            left: left.into(),
+            left,
             operator,
-            right: right.into(),
+            right,
         }
     }
 }

canyon_core/src/query/querybuilder/syntax/writer.rs

@@ -1,5 +1,5 @@
 use crate::connection::database_type::DatabaseType;
-use crate::query::querybuilder::syntax::tokens::{SqlToken, SqlTokens};
+use crate::query::querybuilder::syntax::tokens::SqlTokens;
 
 pub struct TokenWriter {}
 
@@ -21,7 +21,7 @@ impl TokenWriter {
 
 mod __impl {
     use crate::connection::database_type::DatabaseType;
-    use crate::query::querybuilder::syntax::tokens::{SqlToken, Symbol};
+    use crate::query::querybuilder::syntax::tokens::SqlToken;
     use crate::query::querybuilder::syntax::writer::__detail;
     use std::fmt::Write;
 

canyon_core/src/query/querybuilder/types/mod.rs

@@ -11,9 +11,8 @@ use crate::query::query::Query;
 use crate::query::querybuilder::syntax::ast::BaseAst;
 use crate::query::querybuilder::syntax::clause::ConditionClauseKind;
 use crate::query::querybuilder::syntax::emitter::AstProcessor;
-use crate::query::querybuilder::syntax::emitter::backends::PgEmitter;
 use crate::query::querybuilder::syntax::table_metadata::TableMetadata;
-use crate::query::querybuilder::syntax::tokens::{SqlToken, SqlTokens, Symbol};
+use crate::query::querybuilder::syntax::tokens::{SqlTokens, Symbol};
 use crate::query::querybuilder::syntax::writer::TokenWriter;
 use std::error::Error;
 
@@ -115,11 +114,11 @@ mod __impl {
     use crate::query::bounds::FieldIdentifier;
     use crate::query::operators::Comp;
     use crate::query::parameters::QueryParameter;
-    use crate::query::querybuilder::QueryBuilder;
     use crate::query::querybuilder::syntax::clause::{ConditionClause, ConditionClauseKind};
     use crate::query::querybuilder::syntax::column::ColumnRef;
     use crate::query::querybuilder::syntax::emitter::AstProcessor;
     use crate::query::querybuilder::types::__validators;
+    use crate::query::querybuilder::QueryBuilder;
     use std::error::Error;
 
     pub(crate) fn generate_values_in_for_and_or_or_clause<'a, 'b, P, Z, Q>(
@@ -277,10 +276,10 @@ mod __detail {
 
 mod __validators {
     use crate::query::parameters::QueryParameter;
-    use crate::query::querybuilder::QueryBuilder;
     use crate::query::querybuilder::syntax::clause::ConditionClauseKind;
     use crate::query::querybuilder::syntax::emitter::AstProcessor;
     use crate::query::querybuilder::types::__errors;
+    use crate::query::querybuilder::QueryBuilder;
     use std::error::Error;
     use std::fmt::Display;