minor code cleanup

Author: Thorium

src/SqlClient.DesignTime/DesignTime.fs

@@ -610,7 +610,7 @@ type DesignTime private() =
                         assert(p.Direction = ParameterDirection.Input)
 
                         let userDefinedTableTypeRow = 
-                            if udttsPerSchema = null
+                            if isNull udttsPerSchema
                             then //SqlCommandProvider case
                                 match cmdProvidedType.GetNestedType(p.TypeInfo.UdttName) with 
                                 | null -> 

src/SqlClient.DesignTime/DesignTimeConnectionString.fs

@@ -68,7 +68,7 @@ type internal DesignTimeConnectionString =
                     value
                 else
                     let section = ConfigurationManager.ConnectionStrings.[name]
-                    if section = null 
+                    if isNull section
                     then raise <| KeyNotFoundException(message = sprintf "Cannot find name %s in <connectionStrings> section of config file." name)
                     else section.ConnectionString
             @@>

src/SqlClient.DesignTime/SqlClientProvider.fs

@@ -416,7 +416,7 @@ type SqlProgrammabilityProvider(config : TypeProviderConfig) as this =
                             Debug.Assert(values.Length = optionalParams.Length, "values.Length = optionalParams.Length")
 
                             for name, value, optional in Array.zip3 namesOfUpdateableColumns values optionalParams do 
-                                row.[name] <- if value = null && optional then box DbNull else value
+                                row.[name] <- if isNull value && optional then box DbNull else value
                             row
                         @@>
 

src/SqlClient.DesignTime/SqlCommandProvider.fs

@@ -111,8 +111,7 @@ type SqlCommandProvider(config : TypeProviderConfig) as this =
 
         let schemas =
             sqlDataTypes
-            |> Seq.map (fun i -> i.RetrieveSchemas())
-            |> Seq.concat
+            |> Seq.collect (fun i -> i.RetrieveSchemas())
             |> Seq.distinct
             |> Seq.toArray
 

src/SqlClient.DesignTime/SqlEnumProvider.fs

@@ -94,7 +94,7 @@ type SqlEnumProvider(config : TypeProviderConfig) as this =
 
             let getValueType(row: DataRow) = 
                 let t = Type.GetType( typeName = string row.["DataType"], throwOnError = true)
-                if not( t.IsValueType || t = typeof<string>)
+                if not( t.IsValueType || Type.(=)(t, typeof<string>))
                 then 
                     failwithf "Invalid type %s of column %O for value part. Only .NET value types and strings supported as value." t.FullName row.["ColumnName"]
                 t

src/SqlClient/DataTable.fs

@@ -38,7 +38,7 @@ type DataTable<'T when 'T :> DataRow>(selectCommand: SqlCommand, ?connectionStri
 
     member __.NewRow(): 'T = downcast base.NewRow()
 
-    member private this.IsDirectTable = this.TableName <> null
+    member private this.IsDirectTable = not (isNull this.TableName)
 
     member this.Update(?connection, ?transaction, ?batchSize, ?continueUpdateOnError, ?timeout: TimeSpan) = 
         // not supported on all DataTable instances
@@ -49,7 +49,7 @@ type DataTable<'T when 'T :> DataRow>(selectCommand: SqlCommand, ?connectionStri
         connection |> Option.iter selectCommand.set_Connection
         transaction |> Option.iter selectCommand.set_Transaction 
 
-        if selectCommand.Connection = null && this.IsDirectTable 
+        if isNull selectCommand.Connection && this.IsDirectTable 
         then 
             assert(connectionString.IsSome)
             selectCommand.Connection <- new SqlConnection( connectionString.Value.Value)

src/SqlClient/DynamicRecord.fs

@@ -10,7 +10,7 @@ type DynamicRecord(data: IDictionary<string, obj>) =
     inherit DynamicObject() 
 
     do
-        assert(data <> null)
+        assert(not (isNull data))
 
     member internal this.Data = data 
 
@@ -42,7 +42,7 @@ type DynamicRecord(data: IDictionary<string, obj>) =
     override this.ToString() =
         [|
             for KeyValue(key, value) in data ->
-                sprintf "%s = %s" key ( if value = null || Convert.IsDBNull( value) then "None" else sprintf "%A" value) 
+                sprintf "%s = %s" key ( if isNull value || Convert.IsDBNull( value) then "None" else sprintf "%A" value) 
         |]
         |> String.concat "; "
         |> sprintf "{ %s }" 

src/SqlClient/ISqlCommand.fs

@@ -107,7 +107,7 @@ type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connectio
                 notImplemented, 
                 notImplemented
             | rowMapping, itemTypeName ->
-                assert (rowMapping <> null && itemTypeName <> null)
+                assert ((not(isNull rowMapping)) && (not (isNull itemTypeName)))
                 let itemType = Type.GetType( itemTypeName, throwOnError = true)
 
                 let executeHandle =