Sort casting functions by name

lib/src/fnc/cast.rs

@@ -6,13 +6,13 @@ use crate::sql::value::Value;
 pub fn run(_: &Context, name: &str, val: Value) -> Result<Value, Error> {
 	match name {
 		"bool" => bool(val),
-		"int" => int(val),
-		"float" => float(val),
-		"string" => string(val),
-		"number" => number(val),
-		"decimal" => decimal(val),
 		"datetime" => datetime(val),
+		"decimal" => decimal(val),
 		"duration" => duration(val),
+		"float" => float(val),
+		"int" => int(val),
+		"number" => number(val),
+		"string" => string(val),
 		_ => Ok(val),
 	}
 }
@@ -21,10 +21,24 @@ pub fn bool(val: Value) -> Result<Value, Error> {
 	Ok(val.is_truthy().into())
 }
 
-pub fn int(val: Value) -> Result<Value, Error> {
+pub fn datetime(val: Value) -> Result<Value, Error> {
 	Ok(match val {
-		Value::Number(Number::Int(_)) => val,
+		Value::Datetime(_) => val,
-		_ => Value::Number(Number::Int(val.as_int())),
+		_ => Value::Datetime(val.as_datetime()),
+	})
+}
+
+pub fn decimal(val: Value) -> Result<Value, Error> {
+	Ok(match val {
+		Value::Number(Number::Decimal(_)) => val,
+		_ => Value::Number(Number::Decimal(val.as_decimal())),
+	})
+}
+
+pub fn duration(val: Value) -> Result<Value, Error> {
+	Ok(match val {
+		Value::Duration(_) => val,
+		_ => Value::Duration(val.as_duration()),
 	})
 }
 
@@ -35,14 +49,14 @@ pub fn float(val: Value) -> Result<Value, Error> {
 	})
 }
 
-pub fn number(val: Value) -> Result<Value, Error> {
+pub fn int(val: Value) -> Result<Value, Error> {
 	Ok(match val {
-		Value::Number(Number::Decimal(_)) => val,
+		Value::Number(Number::Int(_)) => val,
-		_ => Value::Number(Number::Decimal(val.as_decimal())),
+		_ => Value::Number(Number::Int(val.as_int())),
 	})
 }
 
-pub fn decimal(val: Value) -> Result<Value, Error> {
+pub fn number(val: Value) -> Result<Value, Error> {
 	Ok(match val {
 		Value::Number(Number::Decimal(_)) => val,
 		_ => Value::Number(Number::Decimal(val.as_decimal())),
@@ -55,17 +69,3 @@ pub fn string(val: Value) -> Result<Value, Error> {
 		_ => Value::Strand(val.as_strand()),
 	})
 }
-
-pub fn datetime(val: Value) -> Result<Value, Error> {
-	Ok(match val {
-		Value::Datetime(_) => val,
-		_ => Value::Datetime(val.as_datetime()),
-	})
-}
-
-pub fn duration(val: Value) -> Result<Value, Error> {
-	Ok(match val {
-		Value::Duration(_) => val,
-		_ => Value::Duration(val.as_duration()),
-	})
-}

lib/src/sql/function.rs

@@ -202,13 +202,13 @@ fn cast(i: &str) -> IResult<&str, Function> {
 fn function_casts(i: &str) -> IResult<&str, &str> {
 	alt((
 		tag("bool"),
-		tag("int"),
-		tag("float"),
-		tag("string"),
-		tag("number"),
-		tag("decimal"),
 		tag("datetime"),
+		tag("decimal"),
 		tag("duration"),
+		tag("float"),
+		tag("int"),
+		tag("number"),
+		tag("string"),
 	))(i)
 }