fix import conflicts after rebase

MaterializeInc · Nov 12, 2024 · 15286cd · 15286cd
1 parent 42a4484
commit 15286cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/adapter/src/coord.rs b/src/adapter/src/coord.rs
@@ -134,6 +134,10 @@ use mz_sql::ast::{Raw, Statement};
 use mz_sql::catalog::{CatalogCluster, EnvironmentId};
 use mz_sql::names::{QualifiedItemName, ResolvedIds, SchemaSpecifier};
 use mz_sql::optimizer_metrics::OptimizerMetrics;
+use mz_sql::plan::{
+    self, AlterSinkPlan, ConnectionDetails, CreateConnectionPlan, OnTimeoutAction, Params,
+    QueryWhen,
+};
 use mz_sql::session::user::User;
 use mz_sql::session::vars::{ConnectionCounter, SystemVars};
 use mz_sql_parser::ast::display::AstDisplay;

diff --git a/src/sql/src/plan/statement/ddl.rs b/src/sql/src/plan/statement/ddl.rs
@@ -39,8 +39,8 @@ use mz_repr::optimize::OptimizerFeatureOverrides;
 use mz_repr::refresh_schedule::{RefreshEvery, RefreshSchedule};
 use mz_repr::role_id::RoleId;
 use mz_repr::{
-    preserves_order, strconv, CatalogItemId, ColumnName, ColumnType, GlobalId, RelationDesc,
-    RelationType, RelationVersionSelector, ScalarType, Timestamp,
+    preserves_order, strconv, CatalogItemId, ColumnName, ColumnType, RelationDesc, RelationType,
+    RelationVersionSelector, ScalarType, Timestamp,
 };
 use mz_sql_parser::ast::display::comma_separated;
 use mz_sql_parser::ast::{