Add lenientString to SqlRow

And use it for ColReader to restore previous behaviour
lucidsoftware · Sep 26, 2023 · a30000f · a30000f
1 parent fd73b7a
commit a30000f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/relate/src/main/scala/com/lucidchart/relate/ColReader.scala b/relate/src/main/scala/com/lucidchart/relate/ColReader.scala
@@ -47,7 +47,7 @@ object ColReader {
   implicit val intReader: ColReader[Int] = ColReader { (col, row) => row.intOption(col)}
   implicit val longReader: ColReader[Long] = ColReader { (col, row) => row.longOption(col)}
   implicit val shortReader: ColReader[Short] = ColReader { (col, row) => row.shortOption(col)}
-  implicit val stringReader: ColReader[String] = ColReader { (col, row) => row.stringOption(col)}
+  implicit val stringReader: ColReader[String] = ColReader { (col, row) => row.lenientStringOption(col)}
   implicit val uuidReader: ColReader[UUID] = ColReader[UUID] { (col, row) => row.uuidOption(col)}
 
   def enumReader[A <: Enumeration](e: A): ColReader[e.Value] = {

diff --git a/relate/src/main/scala/com/lucidchart/relate/SqlRow.scala b/relate/src/main/scala/com/lucidchart/relate/SqlRow.scala
@@ -99,6 +99,13 @@ class SqlRow(val resultSet: java.sql.ResultSet) extends ResultSetWrapper {
     }
   }
 
+  def lenientString(column: String): String = lenientStringOption(column).get
+  /**
+   * Like [[stringOption]], but calls `getString` instead of `getObject`, so may
+   * convert other types into Strings, depending on the driver.
+   */
+  def lenientStringOption(column: String): Option[String] = getResultSetOption(resultSet.getString(column))
+
   def int(column: String): Int = intOption(column).get
   def intOption(column: String): Option[Int] = getResultSetOption(resultSet.getInt(column))
 
@@ -319,6 +326,8 @@ object SqlResultTypes {
 
   def string(column: String)(implicit sr: SqlRow) = sr.string(column)
   def stringOption(column: String)(implicit sr: SqlRow) = sr.stringOption(column)
+  def lenientString(column: String)(implicit sr: SqlRow) = sr.lenientString(column)
+  def lenientStringOption(column: String)(implicit sr: SqlRow) = sr.lenientStringOption(column)
   def int(column: String)(implicit sr: SqlRow) = sr.int(column)
   def intOption(column: String)(implicit sr: SqlRow) = sr.intOption(column)
   def double(column: String)(implicit sr: SqlRow) = sr.double(column)