With C# driver libraries, always deal with nulls :-(

fsprojects · Oct 21, 2023 · 42188da · 42188da
1 parent 6a8ba05
commit 42188da
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/SQLProvider.Runtime/Providers.Firebird.fs b/src/SQLProvider.Runtime/Providers.Firebird.fs
@@ -103,7 +103,7 @@ module Firebird =
                     if e.Types.Length = 0 then
                         failwith errmsg
                     else e.Types, Some errmsg
-            match types |> Array.tryFind(fun t -> t.Name = name) with
+            match types |> Array.tryFind(fun t -> (not (isNull t)) && t.Name = name) with
             | Some t -> t
             | None ->
                 match err with

diff --git a/src/SQLProvider.Runtime/Providers.MsSqlServer.Dynamic.fs b/src/SQLProvider.Runtime/Providers.MsSqlServer.Dynamic.fs
@@ -33,7 +33,7 @@ module MSSqlServerDynamic =
                     if e.Types.Length = 0 then
                         failwith errmsg
                     else e.Types, Some errmsg
-            match types |> Array.tryFind(fun t -> t.Name = name) with
+            match types |> Array.tryFind(fun t -> (not (isNull t)) && t.Name = name) with
             | Some t -> t
             | None ->
                 match err with

diff --git a/src/SQLProvider.Runtime/Providers.MySql.fs b/src/SQLProvider.Runtime/Providers.MySql.fs
@@ -34,7 +34,7 @@ module MySql =
                     if e.Types.Length = 0 then
                         failwith errmsg
                     else e.Types, Some errmsg
-            match types |> Array.tryFind(fun t -> t.Name = name) with
+            match types |> Array.tryFind(fun t -> (not (isNull t)) && t.Name = name) with
             | Some t -> t
             | None ->
                 match err with

diff --git a/src/SQLProvider.Runtime/Providers.Oracle.fs b/src/SQLProvider.Runtime/Providers.Oracle.fs
@@ -37,7 +37,7 @@ module internal Oracle =
                     if e.Types.Length = 0 then
                         failwith errmsg
                     else e.Types, Some errmsg
-            match types |> Array.tryFind(fun t -> t.Name = name) with
+            match types |> Array.tryFind(fun t -> (not (isNull t)) && t.Name = name) with
             | Some t -> t
             | None ->
                 match err with
@@ -293,7 +293,7 @@ module internal Oracle =
                       IsPrimaryKey = pkColumn
                       IsNullable = nullable
                       IsAutonumber = pkColumn
-                      HasDefault = row.[4] <> null
+                      HasDefault = not (isNull row.[4])
                       IsComputed = false
                       TypeInfo = ValueSome typeinfo }
                 ))

diff --git a/src/SQLProvider.Runtime/Providers.Postgresql.fs b/src/SQLProvider.Runtime/Providers.Postgresql.fs
@@ -50,7 +50,7 @@ module PostgreSQL =
                 if e.Types.Length = 0 then
                     failwith errmsg
                 else e.Types, Some errmsg
-        match types |> Array.tryFind(fun t -> t.Name = name) with
+        match types |> Array.tryFind(fun t -> (not (isNull t)) && t.Name = name) with
         | Some t -> Some t
         | None ->
             match err with

diff --git a/src/SQLProvider.Runtime/Providers.SQLite.fs b/src/SQLProvider.Runtime/Providers.SQLite.fs
@@ -156,7 +156,7 @@ type internal SQLiteProvider(resolutionPath, contextSchemaPath, referencedAssemb
                     if e.Types.Length = 0 then
                         failwith errmsg
                     else e.Types, Some errmsg
-            match types |> Array.tryFind f with
+            match types |> Array.filter(fun t -> not (isNull t)) |> Array.tryFind f with
             | Some t -> t
             | None ->
                 match err with