Handle both typedef and abstract Null<T>

Haxe 4 has switched to an abstract Null<T> [see: HaxeFoundation/haxe#6380].
jonasmalacofilho · Aug 23, 2017 · 10d7767 · 10d7767
1 parent 8fd679f
commit 10d7767
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/sys/db/RecordMacros.hx b/src/sys/db/RecordMacros.hx
@@ -163,7 +163,7 @@ class RecordMacros {
 					return c;
 				csup = csup.t.get().superClass;
 			}
-		case TType(t, p):
+		case TType(t, p) | TAbstract(t, p):
 			var name = t.toString();
 			if( p.length == 1 && (name == "Null" || name == "sys.db.SNull") ) {
 				isNull = true;
@@ -211,6 +211,7 @@ class RecordMacros {
 			case "Int": DInt;
 			case "Float": DFloat;
 			case "Bool": DBool;
+			case "Null": isNull = true; return makeType(p[0]);
 			case _ if (!a.get().meta.has(':coreType')):
 				var a = a.get();
 #if macro