Change imports

KyGost · KyGost · commit 1aee59d6f53c · 2022-06-02T14:40:41.000+10:00
diff --git a/src/data/mod.rs b/src/data/mod.rs
@@ -5,6 +5,7 @@ pub mod recipe;
 mod row;
 pub(crate) mod schema;
 mod table;
+pub(crate) mod types;
 pub(crate) mod value;
 
 pub use {
diff --git a/src/data/recipe/mod.rs b/src/data/recipe/mod.rs
@@ -4,7 +4,7 @@ mod planned;
 mod resolve;
 
 use {
-	crate::{executor::types::ObjectName, Error, Result, Value},
+	crate::{types::ObjectName, Error, Result, Value},
 	serde::Serialize,
 	sqlparser::ast::{DataType, Expr},
 	std::fmt::Debug,
diff --git a/src/data/recipe/new.rs b/src/data/recipe/new.rs
@@ -1,8 +1,10 @@
 use {
 	super::{Ingredient, Method, Recipe, RecipeError, TryIntoMethod},
 	crate::{
-		executor::{query::JoinManual, types::ObjectName},
-		Resolve, Result, SimplifyBy, TempDB, Value,
+		query::JoinManual,
+		recipe::{Resolve, SimplifyBy},
+		types::ObjectName,
+		Result, TempDB, Value,
 	},
 	sqlparser::ast::{Expr, FunctionArg, FunctionArgExpr, Ident},
 	std::convert::TryFrom,
diff --git a/src/data/recipe/planned.rs b/src/data/recipe/planned.rs
@@ -3,7 +3,7 @@ use {
 		Ingredient, MetaRecipe, Method, Recipe, RecipeError, RecipeUtilities, Resolve, SimplifyBy,
 	},
 	crate::{
-		executor::types::{ColumnInfo, Row},
+		types::{ColumnInfo, Row},
 		IndexFilter, Result, Value,
 	},
 	fstrings::*,
diff --git a/src/data/recipe/resolve.rs b/src/data/recipe/resolve.rs
@@ -1,6 +1,6 @@
 use {
 	super::{Ingredient, Method, Recipe, RecipeError, RecipeUtilities},
-	crate::{executor::types::Row, Result, Value},
+	crate::{types::Row, Result, Value},
 };
 
 #[derive(Clone)]
diff --git a/src/data/types.rs b/src/data/types.rs
diff --git a/src/executor/alter_row/delete.rs b/src/executor/alter_row/delete.rs
@@ -1,7 +1,8 @@
 use {
 	crate::{
-		data::Schema, executor::types::ColumnInfo, Column, ComplexTableName, ExecuteError, Glue,
-		recipe::{MetaRecipe, PlannedRecipe}, Payload, Result, Value,
+		data::Schema,
+		recipe::{MetaRecipe, PlannedRecipe},
+		Column, types::{ComplexTableName, ColumnInfo}, ExecuteError, Glue, Payload, Result, Value,
 	},
 	sqlparser::ast::{Expr, ObjectName},
 };
diff --git a/src/executor/alter_row/insert.rs b/src/executor/alter_row/insert.rs
@@ -1,6 +1,6 @@
 use {
 	super::{columns_to_positions, validate},
-	crate::{data::Schema, ComplexTableName, ExecuteError, Glue, Payload, Result, Row},
+	crate::{data::Schema, types::ComplexTableName, ExecuteError, Glue, Payload, Result, Row},
 	sqlparser::ast::{Ident, ObjectName, Query},
 };
 
diff --git a/src/executor/alter_row/update.rs b/src/executor/alter_row/update.rs
@@ -2,9 +2,9 @@ use {
 	super::{columns_to_positions, validate},
 	crate::{
 		data::Schema,
-		executor::types::{ColumnInfo, Row as VecRow},
-		recipe::{MetaRecipe, PlannedRecipe},
-		Column, ComplexTableName, ExecuteError, Glue, Payload, Result, Row, Value,
+		recipe::{MetaRecipe, PlannedRecipe, RecipeUtilities},
+		types::{ColumnInfo, ComplexTableName, Row as VecRow},
+		Column, ExecuteError, Glue, Payload, Result, Row, Value,
 	},
 	sqlparser::ast::{Assignment, Expr, TableFactor, TableWithJoins},
 };
diff --git a/src/executor/alter_row/validate.rs b/src/executor/alter_row/validate.rs
@@ -1,6 +1,6 @@
 use {
 	crate::{
-		executor::types::Row,
+		types::Row,
 		recipe::{Recipe, RecipeUtilities, Resolve, SimplifyBy},
 		Column, Error, Result, ValueDefault, ValueType,
 	},
diff --git a/src/executor/alter_table/drop.rs b/src/executor/alter_table/drop.rs
@@ -1,6 +1,6 @@
 use {
 	super::AlterError,
-	crate::{ComplexTableName, Glue, Result, ValueDefault},
+	crate::{types::ComplexTableName, Glue, Result, ValueDefault},
 	sqlparser::ast::{ObjectName, ObjectType},
 };
 
diff --git a/src/executor/create/table.rs b/src/executor/create/table.rs
@@ -1,5 +1,5 @@
 use {
-	crate::{data::Schema, Column, ComplexTableName, CreateError, Error, Glue, Result},
+	crate::{data::Schema, Column, types::ComplexTableName, CreateError, Error, Glue, Result},
 	sqlparser::ast::{ColumnDef, ObjectName},
 };
 
diff --git a/src/executor/create/view.rs b/src/executor/create/view.rs
@@ -1,5 +1,5 @@
 use {
-	crate::{Column, ComplexTableName, Glue, Result, Row, Schema, Value, ValueType},
+	crate::{Column, types::ComplexTableName, Glue, Result, Row, Schema, Value, ValueType},
 	lazy_static::lazy_static,
 	sqlparser::ast::{ObjectName, Query, SetExpr},
 };
diff --git a/src/executor/execute.rs b/src/executor/execute.rs
@@ -1,6 +1,5 @@
 use {
-	super::types::get_first_name,
-	crate::{parse_sql::Query, Glue, Result, Row},
+	crate::{parse_sql::Query, Glue, Result, Row, types::get_first_name,},
 	serde::Serialize,
 	sqlparser::ast::{ObjectType, Statement},
 	thiserror::Error as ThisError,
diff --git a/src/executor/fetch.rs b/src/executor/fetch.rs
@@ -1,6 +1,5 @@
 use {
-	super::types::{ColumnInfo, ComplexTableName},
-	crate::{result::Result, Column, DatabaseInner},
+	crate::{result::Result, Column, DatabaseInner, types::{ColumnInfo, ComplexTableName}},
 	serde::Serialize,
 	thiserror::Error as ThisError,
 };
diff --git a/src/executor/mod.rs b/src/executor/mod.rs
@@ -5,9 +5,8 @@ mod execute;
 mod fetch;
 mod other;
 mod procedure;
-mod query;
+pub(crate) mod query;
 mod set_variable;
-mod types;
 
 pub use {
 	alter_row::ValidateError,
@@ -16,5 +15,4 @@ pub use {
 	execute::{ExecuteError, Payload},
 	fetch::FetchError,
 	query::{JoinError, ManualError, PlanError, QueryError, SelectError},
-	types::ComplexTableName,
 };
diff --git a/src/executor/query/get_columns.rs b/src/executor/query/get_columns.rs
@@ -1,9 +1,10 @@
 use {
 	super::select::{refine_items, Manual},
 	crate::{
+		types::{ColumnInfo, ComplexTableName},
 		executor::{
 			fetch::fetch_columns,
-			types::{ColumnInfo, ComplexTableName},
+
 		},
 		Glue, Result,
 	},
diff --git a/src/executor/query/get_data.rs b/src/executor/query/get_data.rs
@@ -1,5 +1,5 @@
 use {
-	crate::{executor::types::LabelsAndRows, Cast, Glue, Result, VIEW_TABLE_NAME},
+	crate::{types::LabelsAndRows, Cast, Glue, Result, VIEW_TABLE_NAME},
 	sqlparser::ast::Select,
 };
 
diff --git a/src/executor/query/mod.rs b/src/executor/query/mod.rs
@@ -7,7 +7,7 @@ mod set_expr;
 pub use select::{join::*, ManualError, Plan, PlanError, SelectError};
 use {
 	crate::{
-		executor::types::LabelsAndRows,
+		types::LabelsAndRows,
 		recipe::{MetaRecipe, RecipeUtilities},
 		result::Result,
 		Cast, Glue, Value,
diff --git a/src/executor/query/select/join/execute.rs b/src/executor/query/select/join/execute.rs
@@ -1,8 +1,9 @@
 use {
 	super::{JoinError, JoinMethod, JoinPlan, JoinType},
 	crate::{
-		executor::types::{ColumnInfo, Row},
-		Glue, IndexFilter, Ingredient, MetaRecipe, Method, PlannedRecipe, Recipe, Result, Value,
+		types::{ColumnInfo, Row},
+		recipe::{Ingredient, MetaRecipe, Method, PlannedRecipe, Recipe,},
+		Glue, IndexFilter, Result, Value,
 	},
 };
 
diff --git a/src/executor/query/select/join/manual.rs b/src/executor/query/select/join/manual.rs
@@ -1,7 +1,7 @@
 use {
 	super::{JoinError, JoinType},
-	crate::{
-		executor::{types::ComplexTableName, MetaRecipe},
+	crate::{types::ComplexTableName,
+		recipe::{MetaRecipe},
 		Result, TempDB,
 	},
 	sqlparser::ast::{Join as AstJoin, JoinConstraint, JoinOperator, TableFactor},
diff --git a/src/executor/query/select/join/method.rs b/src/executor/query/select/join/method.rs
@@ -1,7 +1,7 @@
 use {
 	super::JoinType,
-	crate::{
-		executor::{types::Row, PlannedRecipe},
+	crate::{types::Row,
+		recipe::{PlannedRecipe},
 		macros::try_option,
 		JoinError, NullOrd, Result, Value,
 	},
diff --git a/src/executor/query/select/join/mod.rs b/src/executor/query/select/join/mod.rs
@@ -3,7 +3,7 @@ mod manual;
 mod method;
 mod plan;
 use {
-	crate::executor::types::ComplexTableName, serde::Serialize, std::fmt::Debug,
+	crate::types::ComplexTableName, serde::Serialize, std::fmt::Debug,
 	thiserror::Error as ThisError,
 };
 pub use {execute::JoinExecute, manual::JoinManual, method::JoinMethod, plan::JoinPlan};
diff --git a/src/executor/query/select/join/plan.rs b/src/executor/query/select/join/plan.rs
@@ -1,8 +1,8 @@
 use {
 	super::{JoinManual, JoinType},
-	crate::{
-		executor::{
-			types::{ColumnInfo, ComplexTableName},
+	crate::{types::{ColumnInfo, ComplexTableName},
+		recipe::{
+
 			MetaRecipe,
 		},
 		Glue, Result,
diff --git a/src/executor/query/select/manual/mod.rs b/src/executor/query/select/manual/mod.rs
@@ -1,8 +1,8 @@
 use {
 	super::join::JoinManual,
-	crate::{
-		executor::{
-			types::{Alias, ObjectName},
+	crate::{types::{Alias, ObjectName},
+		recipe::{
+
 			MetaRecipe,
 		},
 		Glue, Result,
diff --git a/src/executor/query/select/mod.rs b/src/executor/query/select/mod.rs
@@ -5,12 +5,10 @@ mod plan;
 
 use {
 	crate::{
-		executor::{
-			types::{LabelsAndRows, Row},
-			PlannedRecipe,
-		},
 		macros::try_option,
-		Glue, RecipeUtilities, Result, Value,
+		recipe::{PlannedRecipe, RecipeUtilities},
+		types::{LabelsAndRows, Row},
+		Glue, Result, Value,
 	},
 	futures::stream::{self, StreamExt, TryStreamExt},
 	rayon::prelude::*,
diff --git a/src/executor/query/select/order.rs b/src/executor/query/select/order.rs
@@ -1,7 +1,7 @@
 use {
 	crate::{
-		executor::types::{ColumnInfo, Row},
-		MetaRecipe, PlannedRecipe, RecipeUtilities, Result, Value,
+		types::{ColumnInfo, Row},
+		recipe::{MetaRecipe, PlannedRecipe, RecipeUtilities}, Result, Value,
 	},
 	rayon::prelude::*,
 	sqlparser::ast::OrderByExpr,
diff --git a/src/executor/query/select/plan/mod.rs b/src/executor/query/select/plan/mod.rs
@@ -3,7 +3,7 @@ mod refine_item;
 pub(crate) use refine_item::*;
 use {
 	super::{join::JoinExecute, Manual, Order, SelectItem},
-	crate::{executor::PlannedRecipe, Glue, Result},
+	crate::{recipe::PlannedRecipe, Glue, Result},
 	serde::Serialize,
 	sqlparser::ast::{OrderByExpr, Select},
 	thiserror::Error as ThisError,
diff --git a/src/executor/query/select/plan/organise_joins.rs b/src/executor/query/select/plan/organise_joins.rs
@@ -1,9 +1,7 @@
 use {
 	crate::{
-		executor::{
-			query::select::join::{JoinManual, JoinPlan},
-			types::ColumnInfo,
-		},
+		executor::query::select::join::{JoinManual, JoinPlan},
+		types::ColumnInfo,
 		Glue, Result,
 	},
 	futures::future::join_all,
diff --git a/src/executor/query/select/plan/refine_item.rs b/src/executor/query/select/plan/refine_item.rs
@@ -1,9 +1,6 @@
 use {
 	super::SelectItem,
-	crate::{
-		executor::{types::ColumnInfo, PlannedRecipe},
-		Error, PlanError, Result,
-	},
+	crate::{types::ColumnInfo, recipe::PlannedRecipe, Error, PlanError, Result},
 };
 
 pub(crate) fn refine_item(
diff --git a/src/executor/query/set_expr.rs b/src/executor/query/set_expr.rs
@@ -1,10 +1,10 @@
 use {
 	super::QueryError,
 	crate::{
-		executor::types::LabelsAndRows,
 		macros::warning,
 		recipe::{MetaRecipe, RecipeUtilities},
 		result::Result,
+		types::LabelsAndRows,
 		Error, Glue, Payload, Value,
 	},
 	async_recursion::async_recursion,
@@ -86,7 +86,9 @@ impl Glue {
 				source,
 				..
 			}) => {
-				let inserted = self.ast_insert(&table_name, &columns, &source, true).await?;
+				let inserted = self
+					.ast_insert(&table_name, &columns, &source, true)
+					.await?;
 				if let Payload::Select { labels, rows } = inserted {
 					Ok((labels, rows.into_iter().map(|row| row.0).collect()))
 				} else {
