refactor(IsNew): check string type PrimaryKey first #538

#Issue link #538
CollaboratingPlatypus · Aug 2, 2019 · 90d6928 · 90d6928
1 parent d0a08ba
commit 90d6928
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/PetaPoco/Database.cs b/PetaPoco/Database.cs
@@ -2528,11 +2528,10 @@ protected virtual bool IsNew(string primaryKeyName, PocoData pd, object poco)
 
             var type = pk != null ? pk.GetType() : pi.PropertyType;
 
+            if (type == typeof(string))
+                return string.IsNullOrEmpty((string)pk);
             if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>) || !type.IsValueType)
                 return pk == null;
-
-            if (type == typeof(string))
-                return string.IsNullOrEmpty((string) pk);
             if (!pi.PropertyType.IsValueType)
                 return pk == null;
             if (type == typeof(long))