Fixes after rebase

Author: rampage644

crates/metastore/src/models/schema.rs

@@ -40,7 +40,7 @@ impl SchemaIdent {
     }
 }
 
-impl std::fmt::Display for IceBucketSchemaIdent {
+impl std::fmt::Display for SchemaIdent {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}.{}", self.database, self.schema)
     }

crates/runtime/src/execution/query.rs

@@ -38,13 +38,14 @@ use datafusion_expr::CreateMemoryTable;
 use datafusion_expr::DdlStatement;
 use datafusion_iceberg::catalog::catalog::IcebergCatalog;
 use embucket_metastore::{
-    Metastore, Schema as MetastoreSchema, SchemaIdent as MetastoreSchemaIdent,
+    Metastore, SchemaIdent as MetastoreSchemaIdent,
     TableCreateRequest as MetastoreTableCreateRequest, TableFormat as MetastoreTableFormat,
     TableIdent as MetastoreTableIdent,
 };
 use iceberg_rust::catalog::create::CreateTableBuilder;
 use iceberg_rust::catalog::Catalog;
 use iceberg_rust::spec::arrow::schema::new_fields_with_ids;
+use iceberg_rust::spec::namespace::Namespace;
 use iceberg_rust::spec::schema::Schema;
 use iceberg_rust::spec::types::StructType;
 use object_store::aws::AmazonS3Builder;

crates/runtime/src/execution/tests/query.rs

@@ -378,13 +378,13 @@ async fn test_drop_table() {
 #[tokio::test]
 async fn test_create_schema() {
     let (execution_svc, metastore, session_id) = prepare_env().await;
-    let schema_ident = IceBucketSchemaIdent {
-        database: "icebucket".to_string(),
+    let schema_ident = MetastoreSchemaIdent {
+        database: "embucket".to_string(),
         schema: "public_new".to_string(),
     };
     let query = format!("CREATE SCHEMA {schema_ident};");
     execution_svc
-        .query(&session_id, &query, IceBucketQueryContext::default())
+        .query(&session_id, &query, QueryContext::default())
         .await
         .expect("Failed to execute query");
     // TODO use "SHOW SCHEMAS" sql

crates/runtime/src/execution/utils.rs

@@ -28,6 +28,7 @@ use chrono::DateTime;
 use datafusion::arrow::array::ArrayRef;
 use datafusion::arrow::datatypes::DataType;
 use datafusion::common::Result as DataFusionResult;
+use embucket_metastore::SchemaIdent as MetastoreSchemaIdent;
 use embucket_metastore::TableIdent as MetastoreTableIdent;
 use sqlparser::ast::{Ident, ObjectName};
 use std::collections::HashMap;
@@ -393,7 +394,7 @@ impl From<NormalizedIdent> for MetastoreTableIdent {
     }
 }
 
-impl From<NormalizedIdent> for IceBucketSchemaIdent {
+impl From<NormalizedIdent> for MetastoreSchemaIdent {
     fn from(ident: NormalizedIdent) -> Self {
         let ident = ident.0;
         Self {