Change API

Author: KyGost

Diff for: src/executor/alter_row/delete.rs

@@ -1,13 +1,13 @@
 use {
 	crate::{
 		data::Schema, executor::types::ColumnInfo, Column, ComplexTableName, ExecuteError, Glue,
-		MetaRecipe, Payload, PlannedRecipe, Result, Value,
+		recipe::{MetaRecipe, PlannedRecipe}, Payload, Result, Value,
 	},
 	sqlparser::ast::{Expr, ObjectName},
 };
 
 impl Glue {
-	pub async fn delete(
+	pub async fn ast_delete(
 		&mut self,
 		table_name: &ObjectName,
 		selection: &Option<Expr>,

Diff for: src/executor/alter_row/insert.rs

@@ -5,7 +5,7 @@ use {
 };
 
 impl Glue {
-	pub async fn insert(
+	pub async fn ast_insert(
 		&mut self,
 		table_name: &ObjectName,
 		columns: &[Ident],
@@ -28,7 +28,7 @@ impl Glue {
 			.ok_or(ExecuteError::TableNotExists)?;
 
 		// TODO: Multi storage
-		let (labels, mut rows) = self.query(source.clone()).await?;
+		let (labels, mut rows) = self.ast_query(source.clone()).await?;
 		let column_positions = columns_to_positions(&column_defs, columns)?;
 
 		validate(&column_defs, &column_positions, &mut rows)?;

Diff for: src/executor/alter_row/update.rs

@@ -3,14 +3,14 @@ use {
 	crate::{
 		data::Schema,
 		executor::types::{ColumnInfo, Row as VecRow},
-		Column, ComplexTableName, ExecuteError, Glue, MetaRecipe, Payload, PlannedRecipe,
-		RecipeUtilities, Result, Row, Value,
+		recipe::{MetaRecipe, PlannedRecipe},
+		Column, ComplexTableName, ExecuteError, Glue, Payload, Result, Row, Value,
 	},
 	sqlparser::ast::{Assignment, Expr, TableFactor, TableWithJoins},
 };
 
 impl Glue {
-	pub async fn update(
+	pub async fn ast_update(
 		&mut self,
 		table: &TableWithJoins,
 		selection: &Option<Expr>,

Diff for: src/executor/alter_row/validate.rs

@@ -1,7 +1,8 @@
 use {
 	crate::{
-		executor::types::Row, Column, Error, Recipe, RecipeUtilities, Resolve, Result, SimplifyBy,
-		ValueDefault, ValueType,
+		executor::types::Row,
+		recipe::{Recipe, RecipeUtilities, Resolve, SimplifyBy},
+		Column, Error, Result, ValueDefault, ValueType,
 	},
 	rayon::prelude::*,
 	serde::Serialize,

Diff for: src/executor/alter_table/alter_table.rs

@@ -5,7 +5,7 @@ use {
 };
 
 impl Glue {
-	pub async fn alter_table(
+	pub async fn ast_alter_table(
 		&mut self,
 		name: &ObjectName,
 		operation: &AlterTableOperation,

Diff for: src/executor/alter_table/drop.rs

@@ -5,7 +5,7 @@ use {
 };
 
 impl Glue {
-	pub async fn drop(
+	pub async fn ast_drop(
 		&mut self,
 		object_type: &ObjectType,
 		names: &[ObjectName],

Diff for: src/executor/alter_table/truncate.rs

@@ -5,7 +5,7 @@ use {
 };
 
 impl Glue {
-	pub async fn truncate(&mut self, table_name: &ObjectName) -> Result<()> {
+	pub async fn ast_truncate(&mut self, table_name: &ObjectName) -> Result<()> {
 		let database = &mut **self.get_mut_database(&None)?;
 		let table_name = get_name(table_name)?;
 		let schema = database.fetch_schema(table_name).await?;

Diff for: src/executor/create/index.rs

@@ -7,7 +7,7 @@ use {
 };
 
 impl Glue {
-	pub async fn create_index(
+	pub async fn ast_create_index(
 		&mut self,
 		table: &ObjectName,
 		name: &ObjectName,

Diff for: src/executor/create/table.rs

@@ -4,7 +4,7 @@ use {
 };
 
 impl Glue {
-	pub async fn create_table(
+	pub async fn ast_create_table(
 		&mut self,
 		name: &ObjectName,
 		column_defs: &[ColumnDef],

Diff for: src/executor/create/view.rs

@@ -5,7 +5,7 @@ use {
 };
 
 impl Glue {
-	pub async fn create_view(
+	pub async fn ast_create_view(
 		&mut self,
 		name: &ObjectName,
 		query: &Box<Query>,

Diff for: src/executor/execute.rs

@@ -83,7 +83,7 @@ impl Glue {
 				if_not_exists,
 				..
 			} => self
-				.create_table(name, columns, *if_not_exists)
+				.ast_create_table(name, columns, *if_not_exists)
 				.await
 				.map(|_| Payload::Create),
 			Statement::CreateView {
@@ -92,7 +92,7 @@ impl Glue {
 				or_replace,
 				..
 			} => self
-				.create_view(name, query, *or_replace)
+				.ast_create_view(name, query, *or_replace)
 				.await
 				.map(|_| Payload::Create),
 			Statement::Drop {
@@ -110,17 +110,17 @@ impl Glue {
 					}
 				}
 				object_type => self
-					.drop(object_type, names, *if_exists)
+					.ast_drop(object_type, names, *if_exists)
 					.await
 					.map(|_| Payload::DropTable),
 			},
 			#[cfg(feature = "alter-table")]
 			Statement::AlterTable { name, operation } => self
-				.alter_table(name, operation)
+				.ast_alter_table(name, operation)
 				.await
 				.map(|_| Payload::AlterTable),
 			Statement::Truncate { table_name, .. } => self
-				.truncate(table_name)
+				.ast_truncate(table_name)
 				.await
 				.map(|_| Payload::TruncateTable),
 			Statement::CreateIndex {
@@ -130,7 +130,7 @@ impl Glue {
 				unique,
 				if_not_exists,
 			} => self
-				.create_index(table_name, name, columns, *unique, *if_not_exists)
+				.ast_create_index(table_name, name, columns, *unique, *if_not_exists)
 				.await
 				.map(|_| Payload::Create),
 
@@ -140,22 +140,22 @@ impl Glue {
 				columns,
 				source,
 				..
-			} => self.insert(table_name, columns, source, false).await,
+			} => self.ast_insert(table_name, columns, source, false).await,
 			Statement::Update {
 				table,
 				selection,
 				assignments,
 				// TODO
 				from: _,
-			} => self.update(table, selection, assignments).await,
+			} => self.ast_update(table, selection, assignments).await,
 			Statement::Delete {
 				table_name,
 				selection,
-			} => self.delete(table_name, selection).await,
+			} => self.ast_delete(table_name, selection).await,
 
 			//- Selection
 			Statement::Query(query_value) => {
-				let result = self.query(*query_value.clone()).await?;
+				let result = self.ast_query(*query_value.clone()).await?;
 				let (labels, rows) = result;
 				let rows = rows.into_iter().map(Row).collect(); // I don't like this. TODO
 				let payload = Payload::Select { labels, rows };
@@ -166,13 +166,13 @@ impl Glue {
 			Statement::SetVariable {
 				variable, value, ..
 			} => self
-				.set_variable(variable, value)
+				.set_variable(variable.into(), value)
 				.await
 				.map(|_| Payload::Success),
 
 			Statement::ExplainTable { table_name, .. } => self.explain(table_name).await,
 
-			Statement::Execute { name, parameters } => self.procedure(name, parameters).await,
+			Statement::Execute { name, parameters } => self.ast_procedure(name, parameters).await,
 			_ => Err(ExecuteError::QueryNotSupported.into()),
 		}
 	}

Diff for: src/executor/procedure.rs

@@ -4,7 +4,7 @@ use {
 };
 
 impl Glue {
-	pub async fn procedure(&mut self, name: &Ident, parameters: &[Expr]) -> Result<Payload> {
+	pub async fn ast_procedure(&mut self, name: &Ident, parameters: &[Expr]) -> Result<Payload> {
 		return match name.value.as_str() {
 			"FILE" => {
 				if let Some(Ok(query)) = parameters.get(0).map(|path| {

Diff for: src/executor/query/mod.rs

@@ -7,8 +7,10 @@ mod set_expr;
 pub use select::{join::*, ManualError, Plan, PlanError, SelectError};
 use {
 	crate::{
-		executor::types::LabelsAndRows, result::Result, Cast, Glue, MetaRecipe, RecipeUtilities,
-		Value,
+		executor::types::LabelsAndRows,
+		recipe::{MetaRecipe, RecipeUtilities},
+		result::Result,
+		Cast, Glue, Value,
 	},
 	async_recursion::async_recursion,
 	serde::Serialize,
@@ -38,7 +40,7 @@ pub enum QueryError {
 
 impl Glue {
 	#[async_recursion(?Send)]
-	pub async fn query(&mut self, query: Query) -> Result<LabelsAndRows> {
+	pub async fn ast_query(&mut self, query: Query) -> Result<LabelsAndRows> {
 		let Query {
 			body,
 			order_by,
@@ -83,7 +85,7 @@ impl Glue {
 					columns: _, // TODO: Columns - Check that number is same and then rename labels
 				} = alias;
 				let name = name.value;
-				let data = self.query(query).await?;
+				let data = self.ast_query(query).await?;
 				self.tempdb.set_table(name, data);
 			}
 		}

Diff for: src/executor/query/set_expr.rs

@@ -1,8 +1,11 @@
 use {
 	super::QueryError,
 	crate::{
-		executor::types::LabelsAndRows, macros::warning, result::Result, Error, Glue, MetaRecipe,
-		Payload, RecipeUtilities, Value,
+		executor::types::LabelsAndRows,
+		macros::warning,
+		recipe::{MetaRecipe, RecipeUtilities},
+		result::Result,
+		Error, Glue, Payload, Value,
 	},
 	async_recursion::async_recursion,
 	sqlparser::ast::{OrderByExpr, SetExpr, SetOperator, Statement},
@@ -83,7 +86,7 @@ impl Glue {
 				source,
 				..
 			}) => {
-				let inserted = self.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 {

Diff for: src/glue/insert.rs

@@ -1,18 +1,26 @@
 use {
 	super::Glue,
-	crate::{recipe::Recipe, Cast, ExecuteError, Result, Value},
+	crate::{recipe::Recipe, Cast, ExecuteError, Payload, Result, Value},
 	serde_json::{json, value::Value as JSONValue},
 };
 
 trait ParameterValue {
 	fn into_recipe(self) -> Recipe;
 }
 impl ParameterValue for Value {
-	fn into_recipe(self) -> Recipe {}
+	fn into_recipe(self) -> Recipe {
+		unimplemented!()
+	}
 }
 
 /// ## Insert (`INSERT`)
 impl Glue {
-	pub fn insert(&mut self, table: &str, columns: &[&str], values: Vec<Recipe>) -> Result<String> {
+	pub fn insert(
+		&mut self,
+		table: &str,
+		columns: &[&str],
+		values: Vec<Recipe>,
+	) -> Result<Payload> {
+		unimplemented!()
 	}
 }