fix(test): Fixed Quaint tests (#5231)

- Fixed broken Quaint doc-tests - Allowed running Quaint doc-tests on CI
prisma · Mar 6, 2025 · ab62ab1 · ab62ab1
1 parent 6128620
commit ab62ab1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/test-quaint.yml b/.github/workflows/test-quaint.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         features:
-          - "--lib --features=all-native"
+          - "--features=all-native"
     env:
       TEST_MYSQL: "mysql://root:prisma@localhost:3306/prisma"
       TEST_MYSQL8: "mysql://root:prisma@localhost:3307/prisma"

diff --git a/quaint/src/ast/delete.rs b/quaint/src/ast/delete.rs
@@ -88,7 +88,7 @@ impl<'a> Delete<'a> {
     /// let query = Delete::from_table("users").returning(vec!["id"]);
     /// let (sql, _) = Sqlite::build(query)?;
     ///
-    /// assert_eq!("DELETE FROM `users` RETURNING \"id\"", sql);
+    /// assert_eq!("DELETE FROM `users` RETURNING `id` AS `id`", sql);
     /// # Ok(())
     /// # }
     pub fn returning<K, I>(mut self, columns: I) -> Self

diff --git a/quaint/src/ast/insert.rs b/quaint/src/ast/insert.rs
@@ -236,7 +236,7 @@ impl<'a> Insert<'a> {
     /// let insert = Insert::from(query).comment("trace_id='5bd66ef5095369c7b0d1f8f4bd33716a', parent_id='c532cb4098ac3dd2'");
     /// let (sql, _) = Sqlite::build(insert)?;
     ///
-    /// assert_eq!("INSERT INTO `users` DEFAULT VALUES; /* trace_id='5bd66ef5095369c7b0d1f8f4bd33716a', parent_id='c532cb4098ac3dd2' */", sql);
+    /// assert_eq!("INSERT INTO `users` DEFAULT VALUES /* trace_id='5bd66ef5095369c7b0d1f8f4bd33716a', parent_id='c532cb4098ac3dd2' */", sql);
     /// # Ok(())
     /// # }
     /// ```

diff --git a/quaint/src/connector/result_set/result_row.rs b/quaint/src/connector/result_set/result_row.rs
@@ -28,10 +28,12 @@ impl IntoIterator for ResultRow {
 ///
 /// ```
 /// # use quaint::connector::*;
-/// let names = vec!["id".to_string(), "name".to_string()];
+/// let names = vec!["id".to_string(), "name".to_string()];    /// # let column_types = vec![ColumnType::Text, ColumnType::Text];
+/// let column_types = vec![ColumnType::Text, ColumnType::Text];
 /// let rows = vec![vec!["1234".into(), "Musti".into()]];
 ///
-/// let result_set = ResultSet::new(names, rows);
+/// let result_set = ResultSet::new(names, column_types, rows);
+///
 /// let row = result_set.first().unwrap();
 ///
 /// assert_eq!(row[0], row["id"]);
@@ -100,8 +102,9 @@ impl<'a> ResultRowRef<'a> {
     /// ```
     /// # use quaint::connector::*;
     /// # let names = vec!["id".to_string(), "name".to_string()];
+    /// # let column_types = vec![ColumnType::Text, ColumnType::Text];
     /// # let rows = vec![vec!["1234".into(), "Musti".into()]];
-    /// # let result_set = ResultSet::new(names, rows);
+    /// # let result_set = ResultSet::new(names, column_types, rows);
     /// # let row = result_set.first().unwrap();
     /// assert_eq!(Some(&row[0]), row.at(0));
     /// ```
@@ -118,8 +121,9 @@ impl<'a> ResultRowRef<'a> {
     /// ```
     /// # use quaint::connector::*;
     /// # let names = vec!["id".to_string(), "name".to_string()];
+    /// # let column_types = vec![ColumnType::Text, ColumnType::Text];
     /// # let rows = vec![vec!["1234".into(), "Musti".into()]];
-    /// # let result_set = ResultSet::new(names, rows);
+    /// # let result_set = ResultSet::new(names, column_types, rows);
     /// # let row = result_set.first().unwrap();
     /// assert_eq!(Some(&row["id"]), row.get("id"));
     /// ```