remove zero default

tminglei · Aug 19, 2016 · 7d4b0dd · 7d4b0dd
1 parent 95d298e
commit 7d4b0dd
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 27 deletions.
diff --git a/addons/argonaut/src/main/scala/com/github/tminglei/slickpg/PgArgonautSupport.scala b/addons/argonaut/src/main/scala/com/github/tminglei/slickpg/PgArgonautSupport.scala
@@ -28,7 +28,6 @@ trait PgArgonautSupport extends json.PgJsonExtensions with utils.PgCommonJdbcTyp
         pgjson,
         (s) => s.parse.toOption.getOrElse(jNull),
         (v) => v.nospaces,
-        zero = jNull,
         hasLiteralForm = false
       )
 

diff --git a/addons/argonaut/src/test/scala/com/github/tminglei/slickpg/PgArgonautSupportSuite.scala b/addons/argonaut/src/test/scala/com/github/tminglei/slickpg/PgArgonautSupportSuite.scala
@@ -60,10 +60,6 @@ class PgArgonautSupportSuite extends FunSuite {
           JsonTests.filter(_.id === testRec2.id.bind).map(_.json).result.head.map(
             r => assert(jArray(List(json1,json2)) === r)
           ),
-          // null return
-          JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>("d")).result.head.map(
-            r => assert(jNull === r)
-          ),
           // ->>/->
           JsonTests.filter(_.json.+>>("a") === "101".bind).map(_.json.+>>("c")).result.head.map(
             r => assert("[3,4,5,9]" === r.replace(" ", ""))

diff --git a/addons/circe-json/src/main/scala/com/github/tminglei/slickpg/PgCirceJsonSupport.scala b/addons/circe-json/src/main/scala/com/github/tminglei/slickpg/PgCirceJsonSupport.scala
@@ -29,7 +29,6 @@ trait PgCirceJsonSupport extends json.PgJsonExtensions with utils.PgCommonJdbcTy
         pgjson,
         (v) => parse(v).getOrElse(Json.Null),
         (v) => v.asJson.spaces2,
-        zero = Json.Null,
         hasLiteralForm = false
       )
 

diff --git a/addons/circe-json/src/test/scala/com/github/tminglei/slickpg/PgCirceJsonSupportSuite.scala b/addons/circe-json/src/test/scala/com/github/tminglei/slickpg/PgCirceJsonSupportSuite.scala
@@ -56,10 +56,6 @@ class PgCirceJsonSupportSuite extends FunSuite {
           JsonTests.filter(_.id === testRec2.id.bind).map(_.json).result.head.map(
             r => assert(Json.array(json1, json2) === r)
           ),
-          // null return
-          JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>("d")).result.head.map(
-            r => assert(Json.Empty === r)
-          ),
           // ->>/->
           JsonTests.filter(_.json.+>>("a") === "101".bind).map(_.json.+>>("c")).result.head.map(
             r => assert("[3,4,5,9]" === r.replace(" ", ""))

diff --git a/addons/json4s/src/main/scala/com/github/tminglei/slickpg/PgJson4sSupport.scala b/addons/json4s/src/main/scala/com/github/tminglei/slickpg/PgJson4sSupport.scala
@@ -31,7 +31,6 @@ trait PgJson4sSupport extends json.PgJsonExtensions with utils.PgCommonJdbcTypes
         pgjson,
         (s) => jsonMethods.parse(s),
         (v) => jsonMethods.compact(jsonMethods.render(v)),
-        zero = JNull,
         hasLiteralForm = false
       )
 

diff --git a/addons/json4s/src/test/scala/com/github/tminglei/slickpg/PgJson4sSupportSuite.scala b/addons/json4s/src/test/scala/com/github/tminglei/slickpg/PgJson4sSupportSuite.scala
@@ -72,10 +72,6 @@ class PgJson4sSupportSuite extends FunSuite {
           JsonTests.to[List].result.map(
             r => assert(List(testRec1, testRec2, testRec3) === r)
           ),
-          // null return
-          JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>("d")).result.head.map(
-            r => assert(JNull === r)
-          ),
           // ->>/->
           JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>>("c")).result.head.map(
             r => assert("[3,4,5,9]" === r.replace(" ", ""))

diff --git a/addons/play-json/src/main/scala/com/github/tminglei/slickpg/PgPlayJsonSupport.scala b/addons/play-json/src/main/scala/com/github/tminglei/slickpg/PgPlayJsonSupport.scala
@@ -28,7 +28,6 @@ trait PgPlayJsonSupport extends json.PgJsonExtensions with utils.PgCommonJdbcTyp
         pgjson,
         (v) => Json.parse(v),
         (v) => Json.stringify(v),
-        zero = JsNull,
         hasLiteralForm = false
       )
 

diff --git a/addons/play-json/src/test/scala/com/github/tminglei/slickpg/PgPlayJsonSupportSuite.scala b/addons/play-json/src/test/scala/com/github/tminglei/slickpg/PgPlayJsonSupportSuite.scala
@@ -79,10 +79,6 @@ class PgPlayJsonSupportSuite extends FunSuite {
           JsonTests.to[List].result.map(
             r => assert(List(testRec1, testRec2, testRec3) === r)
           ),
-          // null return
-          JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>("d")).result.head.map(
-            r => assert(JsNull === r)
-          ),
           // ->>/->
           JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>>("c")).result.head.map(
             r => assert("[3,4,5,9]" === r.replace(" ", ""))

diff --git a/addons/spray-json/src/main/scala/com/github/tminglei/slickpg/PgSprayJsonSupport.scala b/addons/spray-json/src/main/scala/com/github/tminglei/slickpg/PgSprayJsonSupport.scala
@@ -29,7 +29,6 @@ trait PgSprayJsonSupport extends json.PgJsonExtensions with utils.PgCommonJdbcTy
         pgjson,
         (s) => s.parseJson,
         (v) => v.toJson.compactPrint,
-        zero = JsNull,
         hasLiteralForm = false
       )
 

diff --git a/addons/spray-json/src/test/scala/com/github/tminglei/slickpg/PgSprayJsonSupportSuite.scala b/addons/spray-json/src/test/scala/com/github/tminglei/slickpg/PgSprayJsonSupportSuite.scala
@@ -70,10 +70,6 @@ class PgSprayJsonSupportSuite extends FunSuite {
           JsonTests.filter(_.id === testRec2.id.bind).map(_.jbean).result.head.map(
             r => assert(JBean("t1", 5) === r)
           ),
-          // null return
-          JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>("d")).result.head.map(
-            r => assert(JsNull === r)
-          ),
           // ->>/->
           JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>>("c")).result.head.map(
             r => assert("[3,4,5,9]" === r.replace(" ", ""))

diff --git a/core/src/main/scala/com/github/tminglei/slickpg/utils/PgCommonJdbcTypes.scala b/core/src/main/scala/com/github/tminglei/slickpg/utils/PgCommonJdbcTypes.scala
@@ -12,15 +12,14 @@ trait PgCommonJdbcTypes extends JdbcTypesComponent { driver: PostgresProfile =>
                            fnFromString: (String => T),
                            fnToString: (T => String) = ((r: T) => r.toString),
                            val sqlType: Int = java.sql.Types.OTHER,
-                           zero: T = null.asInstanceOf[T],
                            override val hasLiteralForm: Boolean = false)(
                   implicit override val classTag: ClassTag[T]) extends DriverJdbcType[T] {
 
     override def sqlTypeName(sym: Option[FieldSymbol]): String = sqlTypeName
 
     override def getValue(r: ResultSet, idx: Int): T = {
       val value = r.getString(idx)
-      if (r.wasNull) zero else fnFromString(value)
+      if (r.wasNull) null.asInstanceOf[T] else fnFromString(value)
     }
 
     override def setValue(v: T, p: PreparedStatement, idx: Int): Unit = p.setObject(idx, toStr(v), java.sql.Types.OTHER)