preserve internal error

typelevel · Aug 16, 2024 · adc3c07 · adc3c07
1 parent 0ad79d0
commit adc3c07
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/modules/core/src/main/scala/result.scala b/modules/core/src/main/scala/result.scala
@@ -145,6 +145,12 @@ sealed trait Result[+T] {
       case _ => false
     }
 
+  def isFailure: Boolean =
+    this match {
+      case Result.Failure(_) => true
+      case _ => false
+    }
+
   def hasProblems: Boolean =
     this match {
       case Result.Warning(_, _) => true

diff --git a/modules/sql/shared/src/main/scala/SqlMapping.scala b/modules/sql/shared/src/main/scala/SqlMapping.scala
@@ -3557,7 +3557,13 @@ trait SqlMappingLike[F[_]] extends CirceMappingLike[F] with SqlModule[F] { self
             Result.failure(s"No field '$fieldName' for type ${context.tpe}")
         }
 
-      localField orElse mkCursorForField(this, fieldName, resultName)
+      // Fall back to the general implementation if it's a logic failure, 
+      // but retain success and internal errors.
+      if (localField.isFailure) 
+        mkCursorForField(this, fieldName, resultName) 
+      else
+        localField
+
     }
   }