Move StdColumn from dbt-schemas to dbt-fusion-adapter (#5804)

* Move StdColumn from dbt-schemas to dbt-fusion-adapter

* fix branch inversion and use filter() instead of filter_map()

* cargo fmt

* remove old code

* Update crates/dbt-adapter/src/redshift/adapter.rs

GitOrigin-RevId: ca1c75890c68332681ccb1d2228dd700c45a27b3

Author: felipecrv

crates/dbt-fusion-adapter/src/base_adapter.rs

@@ -1,4 +1,5 @@
 use crate::cache::RelationCache;
+use crate::columns::{BigqueryColumnMode, StdColumn};
 use crate::metadata::{CatalogAndSchema, MetadataAdapter};
 use crate::sql_engine::SqlEngine;
 use crate::typed_adapter::TypedBaseAdapter;
@@ -10,7 +11,6 @@ use dbt_common::adapter::SchemaRegistry;
 use dbt_common::cancellation::CancellationToken;
 use dbt_common::io_args::ReplayMode;
 use dbt_schemas::schemas::InternalDbtNodeAttributes;
-use dbt_schemas::schemas::columns::{BigqueryColumnMode, StdColumn};
 use dbt_schemas::schemas::common::ResolvedQuoting;
 use dbt_schemas::schemas::project::QueryComment;
 use dbt_schemas::schemas::relations::base::{BaseRelation, ComponentName};

crates/dbt-fusion-adapter/src/bridge_adapter.rs

@@ -1,6 +1,7 @@
 use crate::base_adapter::{AdapterType, AdapterTyping};
 use crate::cache::RelationCache;
 use crate::cast_util::downcast_value_to_dyn_base_relation;
+use crate::columns::StdColumn;
 use crate::funcs::{
     dispatch_adapter_calls, dispatch_adapter_get_value, execute_macro, execute_macro_wrapper,
     none_value,
@@ -22,7 +23,6 @@ use dbt_common::behavior_flags::{Behavior, BehaviorFlag};
 use dbt_common::cancellation::CancellationToken;
 use dbt_common::{FsError, FsResult, current_function_name};
 use dbt_schemas::schemas::InternalDbtNodeWrapper;
-use dbt_schemas::schemas::columns::StdColumn;
 use dbt_schemas::schemas::common::{DbtIncrementalStrategy, ResolvedQuoting};
 use dbt_schemas::schemas::dbt_column::{DbtColumn, DbtColumnRef};
 use dbt_schemas::schemas::manifest::{

crates/dbt-schemas/src/schemas/columns.rs renamed to crates/dbt-fusion-adapter/src/columns.rs

@@ -1,14 +1,17 @@
 use std::sync::Arc;
 
 use dbt_common::{adapter::AdapterType, current_function_name};
+use dbt_schemas::schemas::dbt_column::DbtCoreBaseColumn;
+use dbt_schemas::schemas::serde::minijinja_value_to_typed_struct;
+use minijinja;
 use minijinja::{
     Value,
     arg_utils::{ArgParser, ArgsIter, check_num_args},
     value::{Enumerator, Object},
 };
 use serde::{Deserialize, Serialize};
 
-use crate::schemas::{dbt_column::DbtColumn, serde::minijinja_value_to_typed_struct};
+use dbt_schemas::schemas::dbt_column::DbtColumn;
 
 /// A struct representing a column type for use with static methods
 #[derive(Clone, Debug)]
@@ -736,16 +739,3 @@ impl Into<Value> for StdColumn {
         Value::from_object(self)
     }
 }
-
-/// The BaseColumn as implemented by dbt Core.
-///
-/// This is used to deserialize columns from Jinja that produces them, for example
-/// the public API macros for `get_columns_in_relation()`
-#[derive(Deserialize, Debug)]
-struct DbtCoreBaseColumn {
-    name: String,
-    dtype: String,
-    char_size: Option<u32>,
-    numeric_precision: Option<u64>,
-    numeric_scale: Option<u64>,
-}

crates/dbt-fusion-adapter/src/lib.rs

@@ -7,6 +7,7 @@ mod macros;
 pub mod base_adapter;
 pub mod bridge_adapter;
 pub mod cache;
+pub mod columns;
 pub mod errors;
 pub mod factory;
 pub mod formatter;

crates/dbt-fusion-adapter/src/parse/adapter.rs

@@ -1,5 +1,6 @@
 use crate::base_adapter::{AdapterFactory, AdapterType, AdapterTyping, BaseAdapter, backend_of};
 use crate::cast_util::downcast_value_to_dyn_base_relation;
+use crate::columns::{BigqueryColumnMode, StdColumn, StdColumnType};
 use crate::funcs::{
     dispatch_adapter_calls, empty_map_value, empty_mutable_vec_value, empty_string_value,
     empty_vec_value, none_value,
@@ -22,7 +23,6 @@ use dbt_common::behavior_flags::Behavior;
 use dbt_common::cancellation::CancellationToken;
 use dbt_common::io_args::ReplayMode;
 use dbt_common::{FsError, FsResult, current_function_name};
-use dbt_schemas::schemas::columns::{BigqueryColumnMode, StdColumn, StdColumnType};
 use dbt_schemas::schemas::common::{DbtQuoting, ResolvedQuoting};
 use dbt_schemas::schemas::project::QueryComment;
 use dbt_schemas::schemas::relations::base::{BaseRelation, RelationPattern};

crates/dbt-fusion-adapter/src/typed_adapter.rs

@@ -1,3 +1,4 @@
+use crate::columns::StdColumn;
 use crate::errors::{AdapterError, AdapterErrorKind};
 use crate::funcs::{execute_macro, none_value};
 use crate::metadata::CatalogAndSchema;
@@ -15,7 +16,6 @@ use arrow_schema::{DataType, Schema};
 use dbt_common::FsResult;
 use dbt_common::behavior_flags::BehaviorFlag;
 use dbt_frontend_common::dialect::Dialect;
-use dbt_schemas::schemas::columns::StdColumn;
 use dbt_schemas::schemas::common::Constraint;
 use dbt_schemas::schemas::common::ConstraintSupport;
 use dbt_schemas::schemas::common::ConstraintType;

crates/dbt-schemas/src/lib.rs

@@ -8,7 +8,6 @@ pub mod state;
 pub mod stats;
 
 pub mod schemas {
-    pub mod columns;
     pub mod common;
     pub mod data_tests;
     pub mod dbt_column;

crates/dbt-schemas/src/schemas/dbt_column.rs

@@ -14,6 +14,19 @@ use crate::schemas::{
 
 use super::{common::Constraint, data_tests::DataTests};
 
+/// The BaseColumn as implemented by dbt Core.
+///
+/// This is used to deserialize columns from Jinja that produces them, for example
+/// the public API macros for `get_columns_in_relation()`
+#[derive(Deserialize, Debug)]
+pub struct DbtCoreBaseColumn {
+    pub name: String,
+    pub dtype: String,
+    pub char_size: Option<u32>,
+    pub numeric_precision: Option<u64>,
+    pub numeric_scale: Option<u64>,
+}
+
 #[skip_serializing_none]
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Default, Clone)]
 #[serde(rename_all = "snake_case")]

crates/dbt-schemas/src/schemas/manifest/bigquery_partition.rs

@@ -1,4 +1,3 @@
-use dbt_common::adapter::AdapterType;
 use dbt_common::current_function_name;
 use dbt_serde_yaml::{JsonSchema, UntaggedEnumDeserialize};
 use minijinja::value::Enumerator;
@@ -11,8 +10,6 @@ use minijinja::{
 use serde::{Deserialize, Serialize};
 use strum::{AsRefStr, Display, EnumIter, EnumString, IntoEnumIterator};
 
-use crate::schemas::columns::StdColumn;
-
 use std::convert::AsRef;
 use std::{rc::Rc, sync::Arc};
 
@@ -167,15 +164,16 @@ impl BigqueryPartitionConfig {
         parser.check_num_args(current_function_name!(), 0, 1)?;
 
         let columns = parser.get::<MinijinjaValue>("columns")?;
-        if let Ok(columns) = StdColumn::vec_from_jinja_value(AdapterType::Bigquery, columns) {
-            let columns = columns
-                .into_iter()
-                .filter_map(|c| {
-                    if c.name.to_uppercase() == self.field.to_uppercase() {
-                        None
-                    } else {
-                        Some(MinijinjaValue::from_object(c))
-                    }
+        if let Ok(iter) = columns.try_iter() {
+            let columns = iter
+                .filter(|c| {
+                    let name = c
+                        .get_attr("name")
+                        .expect("column must have a name attribute");
+                    !name
+                        .as_str()
+                        .expect("name attribute must be a string")
+                        .eq_ignore_ascii_case(self.field.as_str())
                 })
                 .collect::<Vec<_>>();
             Ok(MinijinjaValue::from(columns))