Getting closer....

Author: KyGost

src/data/value/cast.rs

@@ -8,7 +8,10 @@ use {
 };
 
 #[enum_dispatch(Value)]
-pub trait Cast<Output: Sized> {
+pub trait Cast<Output: Sized>
+where
+	Self: Sized,
+{
 	fn cast(self) -> Result<Output> {
 		Err(Error::Value(ValueError::UnimplementedCast))
 	}
@@ -76,17 +79,19 @@ impl Cast<u64> for bool {
 }
 impl Cast<u64> for i64 {
 	fn cast(self) -> Result<u64> {
-		self.try_into().map_err(|_| ValueError::ImpossibleCast)
+		self.try_into()
+			.map_err(|_| Error::Value(ValueError::ImpossibleCast))
 	}
 }
 impl Cast<u64> for f64 {
 	fn cast(self) -> Result<u64> {
-		self.cast::<i64>()?.cast()
+		let int: i64 = self.cast()?;
+		int.cast()
 	}
 }
 impl Cast<u64> for String {
 	fn cast(self) -> Result<u64> {
-		lexical::parse(self).map_err(|_| ValueError::ImpossibleCast)
+		lexical::parse(self).map_err(|_| Error::Value(ValueError::ImpossibleCast))
 	}
 }
 
@@ -98,16 +103,17 @@ impl Cast<i64> for bool {
 impl Cast<i64> for u64 {
 	fn cast(self) -> Result<i64> {
 		self.try_into()
+			.map_err(|_| Error::Value(ValueError::ImpossibleCast))
 	}
 }
 impl Cast<i64> for f64 {
 	fn cast(self) -> Result<i64> {
-		self.try_into()
+		Ok(self.trunc() as i64) // TODO: Better
 	}
 }
 impl Cast<i64> for String {
 	fn cast(self) -> Result<i64> {
-		lexical::parse(self).map_err(|_| ValueError::ImpossibleCast)
+		lexical::parse(self).map_err(|_| Error::Value(ValueError::ImpossibleCast))
 	}
 }
 
@@ -128,7 +134,7 @@ impl Cast<f64> for i64 {
 }
 impl Cast<f64> for String {
 	fn cast(self) -> Result<f64> {
-		fast_float::parse(self).map_err(|_| ValueError::ImpossibleCast)
+		fast_float::parse(self).map_err(|_| Error::Value(ValueError::ImpossibleCast))
 	}
 }
 
@@ -162,6 +168,7 @@ impl<T: Cast<u64>> Cast<usize> for T {
 	}
 }
 
+/*
 // Non-Core
 impl CastWithRules<bool> for Value {
 	fn cast_with_rule(self, rule: Self) -> Result<bool> {
@@ -187,6 +194,7 @@ impl CastWithRules<f64> for Value {
 		}
 	}
 }
+*/
 /*impl CastWithRules<String> for Value {
 	fn cast_with_rule(self, rule: Self) -> Result<String> {
 		match rule {

src/data/value/declare.rs

@@ -3,6 +3,7 @@ use {
 	crate::{BigEndian, Cast, Error},
 	enum_dispatch::enum_dispatch,
 	serde::{Deserialize, Serialize},
+	std::cmp::{Ord, Ordering},
 	std::fmt::Debug,
 };
 
@@ -17,9 +18,8 @@ macro_rules! value_types {
 	( $($representation:ident: $type:ty),* ) => {
 		#[enum_dispatch(Value)]
 		pub trait Valued: BigEndian + BinaryOperations + UnaryOperations $(+ Cast<$type>)* {}
-		//$(impl Valued for $type {})*
 
-		#[enum_dispatch], Error
+		//#[enum_dispatch]
 		#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, PartialOrd)]
 		pub enum Value {
 			$($representation($type)),*
@@ -31,13 +31,21 @@ impl Value {
 	pub const NULL: Self = Self::Null(Null);
 }
 
+impl Eq for Value {}
+impl Ord for Value {
+	fn cmp(&self, other: &Value) -> Ordering {
+		self.partial_cmp(other).unwrap_or(Ordering::Equal)
+	}
+}
+
 /*value_types!(
 	Boolean:	bool,
 	UInteger:	u64,
 	Integer:	i64,
 	Float:		f64,
 	Text:			String,
 );*/
+
 value_types!(
 	Bool: bool,
 	U64: u64,

src/data/value/literal.rs

@@ -19,7 +19,7 @@ impl<'a> TryFrom<&'a AstValue> for Value {
 				)
 				.map_err(|_| ValueError::FailedToParseNumber.into()),
 			AstValue::SingleQuotedString(value) => Ok(Value::Str(value.clone())),
-			AstValue::NULL => Ok(Value::NULL),
+			AstValue::Null => Ok(Value::NULL),
 			_ => Err(ValueError::UnimplementedLiteralType.into()),
 		}
 	}

src/executor/alter_row/auto_increment.rs

@@ -1,5 +1,5 @@
 #![cfg(feature = "auto-increment")]
-use crate::{Column, Glue, Result, Row, Value, ValueDefault};
+use crate::{Column, Glue, Null, Result, Row, Value, ValueDefault};
 
 impl Glue {
 	pub async fn auto_increment(
@@ -18,7 +18,7 @@ impl Glue {
 					index,
 					column.name.clone(),
 					rows.iter()
-						.filter(|row| matches!(row.0.get(index), Some(Value::NULL)))
+						.filter(|row| matches!(row.0.get(index), Some(Value::Null(Null))))
 						.count() as i64,
 				)
 			})
@@ -33,7 +33,7 @@ impl Glue {
 		for row in rows.iter_mut() {
 			for ((index, _name), value) in &mut column_values {
 				let cell = row.0.get_mut(*index).unwrap();
-				if matches!(cell, Value::NULL) {
+				if matches!(cell, Value::Null(Null)) {
 					*cell = Value::I64(*value);
 					*value += 1;
 				}

src/glue/mod.rs

@@ -246,7 +246,7 @@ impl Glue {
 				row.into_iter()
 					.map(|cell| {
 						Expr::Value(match cell {
-							Value::NULL => AstValue::NULL,
+							Value::NULL => AstValue::Null,
 							Value::Bool(value) => AstValue::Boolean(value),
 							Value::I64(value) => AstValue::Number(value.to_string(), false),
 							Value::F64(value) => AstValue::Number(value.to_string(), false),