Make ScalarValue::Float double precision

prisma · Mar 10, 2020 · 97e8021 · 97e8021
1 parent df8b0d4
commit 97e8021
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/introspection-engine/connectors/sql-introspection-connector/src/misc_helpers.rs b/introspection-engine/connectors/sql-introspection-connector/src/misc_helpers.rs
@@ -463,7 +463,7 @@ fn parse_bool(value: &str) -> Option<bool> {
 
 static RE_FLOAT: Lazy<Regex> = Lazy::new(|| Regex::new(r"^'?([^']+)'?$").expect("compile regex"));
 
-fn parse_float(value: &str) -> Option<f32> {
+fn parse_float(value: &str) -> Option<f64> {
     debug!("Parsing float '{}'", value);
     let rslt = RE_FLOAT.captures(value);
     if rslt.is_none() {
@@ -473,7 +473,7 @@ fn parse_float(value: &str) -> Option<f32> {
 
     let captures = rslt.expect("get captures");
     let num_str = captures.get(1).expect("get capture").as_str();
-    let num_rslt = num_str.parse::<f32>();
+    let num_rslt = num_str.parse::<f64>();
     match num_rslt {
         Ok(num) => Some(num),
         Err(_) => {

diff --git a/libs/datamodel/connectors/datamodel-connector/src/scalars.rs b/libs/datamodel/connectors/datamodel-connector/src/scalars.rs
@@ -43,7 +43,7 @@ impl ToString for ScalarType {
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub enum ScalarValue {
     Int(i32),
-    Float(f32),
+    Float(f64),
     Decimal(f64),
     Boolean(bool),
     String(String),

diff --git a/libs/datamodel/core/src/common/value_validator.rs b/libs/datamodel/core/src/common/value_validator.rs
@@ -115,10 +115,10 @@ impl ValueValidator {
     }
 
     /// Tries to convert the wrapped value to a Prisma Float.
-    pub fn as_float(&self) -> Result<f32, DatamodelError> {
+    pub fn as_float(&self) -> Result<f64, DatamodelError> {
         match &self.value {
-            ast::Expression::NumericValue(value, _) => self.wrap_error_from_result(value.parse::<f32>(), "numeric"),
-            ast::Expression::Any(value, _) => self.wrap_error_from_result(value.parse::<f32>(), "numeric"),
+            ast::Expression::NumericValue(value, _) => self.wrap_error_from_result(value.parse::<f64>(), "numeric"),
+            ast::Expression::Any(value, _) => self.wrap_error_from_result(value.parse::<f64>(), "numeric"),
             _ => Err(self.construct_type_mismatch_error("numeric")),
         }
     }

diff --git a/libs/prisma-value/src/lib.rs b/libs/prisma-value/src/lib.rs
@@ -140,16 +140,6 @@ impl TryFrom<f64> for PrismaValue {
 
     fn try_from(f: f64) -> PrismaValueResult<PrismaValue> {
         Decimal::from_f64(f)
-            .map(|d| PrismaValue::Float(d))
-            .ok_or(ConversionFailure::new("f32", "Decimal"))
-    }
-}
-
-impl TryFrom<f32> for PrismaValue {
-    type Error = ConversionFailure;
-
-    fn try_from(f: f32) -> PrismaValueResult<PrismaValue> {
-        Decimal::from_f32(f)
             .map(|d| PrismaValue::Float(d))
             .ok_or(ConversionFailure::new("f64", "Decimal"))
     }

diff --git a/query-engine/prisma/src/tests/type_mappings/postgres_types.rs b/query-engine/prisma/src/tests/type_mappings/postgres_types.rs
@@ -232,7 +232,7 @@ async fn postgres_types_roundtrip(api: &TestApi) -> TestResult {
     Ok(())
 }
 
-#[test_each_connector(tags("postgres"))]
+#[test_each_connector(tags("postgres"), log = "debug")]
 async fn small_float_values_must_work(api: &TestApi) -> TestResult {
     let schema = indoc! {
         r#"