Fixup

Author: billy1624

src/query/json.rs

@@ -9,13 +9,10 @@ impl FromQueryResult for JsonValue {
         macro_rules! try_get_type {
             ( $type: ty, $col: ident ) => {
                 if let Ok(v) = res.try_get::<Option<$type>>(pre, &$col) {
-                    map.insert(
-                        $col.to_owned(),
-                        json!(v),
-                    );
+                    map.insert($col.to_owned(), json!(v));
                     continue;
                 }
-            }
+            };
         }
         match &res.row {
             #[cfg(feature = "sqlx-mysql")]
@@ -58,9 +55,9 @@ impl FromQueryResult for JsonValue {
                     match_mysql_type!(chrono::DateTime<chrono::Utc>);
                     #[cfg(feature = "with-rust_decimal")]
                     match_mysql_type!(rust_decimal::Decimal);
-                    try_get_type!(String, col);
                     #[cfg(feature = "with-json")]
                     try_get_type!(serde_json::Value, col);
+                    try_get_type!(String, col);
                     #[cfg(feature = "with-uuid")]
                     try_get_type!(uuid::Uuid, col);
                     try_get_type!(Vec<u8>, col);
@@ -106,9 +103,9 @@ impl FromQueryResult for JsonValue {
                     match_postgres_type!(chrono::DateTime<chrono::FixedOffset>);
                     #[cfg(feature = "with-rust_decimal")]
                     match_postgres_type!(rust_decimal::Decimal);
-                    try_get_type!(String, col);
                     #[cfg(feature = "with-json")]
                     try_get_type!(serde_json::Value, col);
+                    try_get_type!(String, col);
                     #[cfg(feature = "with-uuid")]
                     try_get_type!(uuid::Uuid, col);
                     try_get_type!(Vec<u8>, col);
@@ -150,6 +147,8 @@ impl FromQueryResult for JsonValue {
                     match_sqlite_type!(chrono::NaiveTime);
                     #[cfg(feature = "with-chrono")]
                     match_sqlite_type!(chrono::NaiveDateTime);
+                    #[cfg(feature = "with-json")]
+                    try_get_type!(serde_json::Value, col);
                     try_get_type!(String, col);
                     #[cfg(feature = "with-uuid")]
                     try_get_type!(uuid::Uuid, col);

tests/timestamp_tests.rs

@@ -42,7 +42,7 @@ pub async fn create_applog(db: &DatabaseConnection) -> Result<(), DbErr> {
         Some(json!({
             "id": 1,
             "action": "Testing",
-            "json": r#""HI""#,
+            "json": "HI",
             "created_at": "2021-09-17 09:50:20",
         }))
     );