Merge pull request zio#688 from vidyasankarv/zio#675

zio#675 - Add uuid() function to MySqlModule
vidyasankarv · May 26, 2022 · 9b6b455 · 9b6b455
2 parents 33a9e27 + e56958b
commit 9b6b455
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mysql/src/main/scala/zio/sql/mysql/MysqlSqlModule.scala b/mysql/src/main/scala/zio/sql/mysql/MysqlSqlModule.scala
@@ -2,6 +2,7 @@ package zio.sql.mysql
 
 import java.sql.ResultSet
 import java.time.{ LocalDate, LocalTime, OffsetTime, Year, ZonedDateTime }
+import java.util.UUID
 import zio.sql.Sql
 
 trait MysqlSqlModule extends Sql { self =>
@@ -21,7 +22,6 @@ trait MysqlSqlModule extends Sql { self =>
               r => Right(r)
             )
       }
-
     }
   }
 
@@ -39,6 +39,6 @@ trait MysqlSqlModule extends Sql { self =>
     val Pi          = Expr.FunctionCall0[Double](FunctionDef[Any, Double](FunctionName("pi")))
     val Rand        = FunctionDef[Int, Double](FunctionName("rand"))
     val RPad        = FunctionDef[(String, Int, String), String](FunctionName("rpad"))
+    val Uuid        = Expr.FunctionCall0[UUID](FunctionDef[Any, UUID](FunctionName("uuid")))
   }
-
 }
diff --git a/mysql/src/test/scala/zio/sql/mysql/FunctionDefSpec.scala b/mysql/src/test/scala/zio/sql/mysql/FunctionDefSpec.scala
@@ -148,6 +148,9 @@ object FunctionDefSpec extends MysqlRunnableSpec with ShopSchema {
 
       assertZIO(testResult.runHead.some)(equalTo(expected))
     },
+    test("uuid") {
+      assertZIO(execute(select(Uuid)).runHead.some)(!isNull)
+    },
     test("rand") {
       val query = select(Rand(5))