Fix quaint geometry as raw

prisma · Oct 3, 2024 · c7a5ed3 · c7a5ed3
1 parent c08999d
commit c7a5ed3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/quaint/src/visitor/mssql.rs b/quaint/src/visitor/mssql.rs
@@ -424,10 +424,10 @@ impl<'a> Visitor<'a> for Mssql<'a> {
             // TODO@geometry: find a way to avoid cloning
             ValueType::Geometry(g) => g
                 .as_ref()
-                .map(|g| self.visit_function(geom_from_text(g.wkt.clone(), g.srid, false))),
+                .map(|g| self.visit_function(geom_from_text(g.wkt.clone().raw(), g.srid.map(IntoRaw::raw), false))),
             ValueType::Geography(g) => g
                 .as_ref()
-                .map(|g| self.visit_function(geom_from_text(g.wkt.clone(), g.srid, true))),
+                .map(|g| self.visit_function(geom_from_text(g.wkt.clone().raw(), g.srid.map(IntoRaw::raw), true))),
         };
 
         match res {
@@ -839,6 +839,7 @@ impl<'a> Visitor<'a> for Mssql<'a> {
         self.write(if geom.geography { "geography" } else { "geometry" })?;
         self.surround_with("::STGeomFromText(", ")", |ref mut s| {
             s.visit_expression(*geom.wkt_expression)?;
+            s.write(",")?;
             if geom.geography {
                 s.visit_expression(*geom.srid_expression.unwrap_or_else(|| Box::new(4326.into())))?;
             } else {

diff --git a/quaint/src/visitor/mysql.rs b/quaint/src/visitor/mysql.rs
@@ -196,10 +196,10 @@ impl<'a> Visitor<'a> for Mysql<'a> {
             // TODO@geometry: find a way to avoid cloning
             ValueType::Geometry(g) => g
                 .as_ref()
-                .map(|g| self.visit_function(geom_from_text(g.wkt.clone(), g.srid, false))),
+                .map(|g| self.visit_function(geom_from_text(g.wkt.clone().raw(), g.srid.map(IntoRaw::raw), false))),
             ValueType::Geography(g) => g
                 .as_ref()
-                .map(|g| self.visit_function(geom_from_text(g.wkt.clone(), g.srid, true))),
+                .map(|g| self.visit_function(geom_from_text(g.wkt.clone().raw(), g.srid.map(IntoRaw::raw), true))),
         };
 
         match res {

diff --git a/quaint/src/visitor/postgres.rs b/quaint/src/visitor/postgres.rs
@@ -260,10 +260,10 @@ impl<'a> Visitor<'a> for Postgres<'a> {
             // TODO@geometry: find a way to avoid cloning
             ValueType::Geometry(g) => g
                 .as_ref()
-                .map(|g| self.visit_function(geom_from_text(g.wkt.clone(), g.srid, false))),
+                .map(|g| self.visit_function(geom_from_text(g.wkt.clone().raw(), g.srid.map(IntoRaw::raw), false))),
             ValueType::Geography(g) => g
                 .as_ref()
-                .map(|g| self.visit_function(geom_from_text(g.wkt.clone(), g.srid, true))),
+                .map(|g| self.visit_function(geom_from_text(g.wkt.clone().raw(), g.srid.map(IntoRaw::raw), true))),
         };
 
         match res {

diff --git a/quaint/src/visitor/sqlite.rs b/quaint/src/visitor/sqlite.rs
@@ -143,10 +143,10 @@ impl<'a> Visitor<'a> for Sqlite<'a> {
             // TODO@geometry: find a way to avoid cloning
             ValueType::Geometry(g) => g
                 .as_ref()
-                .map(|g| self.visit_function(geom_from_text(g.wkt.clone(), g.srid, false))),
+                .map(|g| self.visit_function(geom_from_text(g.wkt.clone().raw(), g.srid.map(IntoRaw::raw), false))),
             ValueType::Geography(g) => g
                 .as_ref()
-                .map(|g| self.visit_function(geom_from_text(g.wkt.clone(), g.srid, true))),
+                .map(|g| self.visit_function(geom_from_text(g.wkt.clone().raw(), g.srid.map(IntoRaw::raw), true))),
         };
 
         match res {