Merge pull request #222 from fsprojects/Issue200

Issue 200

Author: dmitry-a-morozov

src/SqlClient.Tests/DataTablesTests.fs

@@ -18,6 +18,7 @@ type ProductCostHistory = AdventureWorks.Production.Tables.ProductCostHistory
 type GetRowCount = SqlCommandProvider<"SELECT COUNT(*) FROM HumanResources.Shift", ConnectionStrings.AdventureWorksNamed, SingleRow = true>
 type GetShiftTableData = SqlCommandProvider<"SELECT * FROM HumanResources.Shift", ConnectionStrings.AdventureWorksNamed, ResultType.DataReader>
 type GetArbitraryDataAsDataTable = SqlCommandProvider<"select 1 a, 2 b, 3 c, cast(null as int) d", ConnectionStrings.AdventureWorksNamed, ResultType.DataTable>
+
 type DataTablesTests() = 
 
     do
@@ -110,7 +111,7 @@ type DataTablesTests() =
         t.AddRow("Spanish siesta", TimeSpan.FromHours 13., TimeSpan.FromHours 16.)
 
         //remove ModifiedDate column therefore bulk insert won't send explicit NULLs to server
-        t.Columns.Remove(t.ModifiedDateColumn)
+        t.Columns.Remove(t.Columns.ModifiedDate)
 
         let bulkCopy = new SqlBulkCopy(conn, SqlBulkCopyOptions.Default, tran)
         let rowsCopied = ref 0L
@@ -124,7 +125,7 @@ type DataTablesTests() =
     [<Fact>]
     member __.DEFAULTConstraintInsertViaSqlDataAdapter() = 
         let t = new ShiftTable()
-        Assert.True t.ModifiedDateColumn.AllowDBNull
+        Assert.True t.Columns.ModifiedDate.AllowDBNull
         use conn = new SqlConnection(connectionString = adventureWorks)
         conn.Open()
         use tran = conn.BeginTransaction()
@@ -171,8 +172,8 @@ type DataTablesTests() =
         Assert.Equal(1, rowsUpdated)
 
         use getShift = new SqlCommandProvider<"SELECT * FROM HumanResources.Shift", ConnectionStrings.AdventureWorksNamed>()
-        let eveningShiftIinDb = getShift.Execute() |> Seq.find (fun x -> x.Name = "Evening")
-        Assert.Equal(finishBy10, eveningShiftIinDb.EndTime)
+        let eveningShiftInDb = getShift.Execute() |> Seq.find (fun x -> x.Name = "Evening")
+        Assert.Equal(finishBy10, eveningShiftInDb.EndTime)
 
     [<Fact>]
     member __.TableTypeTag() = 
@@ -312,7 +313,7 @@ type DataTablesTests() =
 
     [<Fact>]
     member __.``Can use datacolumns on SqlProgrammabilityProvider`` () =
-        let products = AdventureWorks.Production.Tables.Product()
+        let products = new AdventureWorks.Production.Tables.Product()
 
         let product = products.NewRow()
         product.Name <- "foo"

src/SqlClient.Tests/FreeVarDoubleDeclTests.fs

@@ -0,0 +1,55 @@
+module FSharp.Data.``The undeclared parameter 'X' is used more than once in the batch being analyzed``
+
+open System
+open Xunit
+
+[<Fact>]
+let Basic() =
+    use cmd = new SqlCommandProvider<"
+        SELECT * 
+        FROM HumanResources.Shift 
+        WHERE 
+            @time >= StartTime 
+            AND @time <= EndTime
+    ", ConnectionStrings.AdventureWorksNamed>()
+    let actual = [ for x in cmd.Execute( TimeSpan(16, 0, 0)) -> x.Name ]
+    Assert.Equal<_ list>([ "Evening" ], actual )
+
+[<Fact>]
+let WithBoundDeclaration() =
+    use cmd = new SqlCommandProvider<"
+        DECLARE @x AS INT = 42; --make bound vars handled properly
+
+        SELECT * 
+        FROM HumanResources.Shift 
+        WHERE 
+            @time >= StartTime 
+            AND @time <= EndTime
+    ", ConnectionStrings.AdventureWorksNamed>()
+    let actual = [ for x in cmd.Execute( TimeSpan(16, 0, 0)) -> x.Name ]
+    Assert.Equal<_ list>([ "Evening" ], actual )
+
+[<Fact>]
+let WithUnboundDeclaration() =
+    use cmd = new SqlCommandProvider<"
+        DECLARE @x AS INT; --make bound vars handled properly
+        SELECT * 
+        FROM HumanResources.Shift 
+        WHERE 
+            @time >= StartTime 
+            AND @time <= EndTime
+    ", ConnectionStrings.AdventureWorksNamed>()
+    let actual = [ for x in cmd.Execute( TimeSpan(16, 0, 0)) -> x.Name ]
+    Assert.Equal<_ list>([ "Evening" ], actual )
+
+[<Fact>]
+let DynamicFiltering() =
+    use cmd = new SqlCommandProvider<"
+        SELECT * 
+        FROM HumanResources.Shift 
+        WHERE CAST(@time AS TIME) IS NULL OR @time BETWEEN StartTime AND EndTime
+    ", ConnectionStrings.AdventureWorksNamed>()
+    let actual = [ for x in cmd.Execute( TimeSpan(16, 0, 0)) -> x.Name ]
+    Assert.Equal<_ list>([ "Evening" ], actual )
+
+

src/SqlClient.Tests/ProgrammabilityTests.fs

@@ -241,75 +241,6 @@ let ResultSetAndOutParam() =
     Assert.Equal<_ list>([ Some "donkey" ], [ for x in result -> x.myName ] )
     Assert.Equal(2L, !total)
 
-[<Fact>]
-let TVFSynonym() = 
-    let personId = 42
-    let actual = 
-        use cmd = new AdventureWorks.HumanResources.GetContactInformation()
-        cmd.ExecuteSingle(personId)
-        |> Option.map(fun x -> x.FirstName, x.LastName)
-
-    let expected = 
-        use cmd = new GetContactInformation()
-        cmd.ExecuteSingle(personId)
-        |> Option.map(fun x -> x.FirstName, x.LastName)
 
-    Assert.Equal(expected, actual)
-
-[<Fact>]
-let SPSynonym() = 
-    let personId = 42
-    let actual = 
-        use cmd = new AdventureWorks.HumanResources.GetEmployeeManagers()
-        [ for x in cmd.Execute(personId) -> sprintf "%A.%A" x.FirstName x.LastName ]
-
-    let expected = 
-        use cmd = new AdventureWorks.dbo.uspGetEmployeeManagers()
-        [ for x in cmd.Execute(personId) -> sprintf "%A.%A" x.FirstName x.LastName ]
-
-    Assert.Equal<_ list>(expected, actual)
-
-module ReturnValues = 
-    type AdventureWorks = SqlProgrammabilityProvider<ConnectionStrings.AdventureWorksNamed, UseReturnValue = true>
-
-    [<Fact>]
-    let AddRef() = 
-        let cmd = new AdventureWorks.dbo.AddRef()
-        let x, y = 12, -1
-        let sum = ref Int32.MinValue
-        let returnValue = ref Int32.MaxValue
-        let rowsAffected = cmd.Execute(x, y, sum, returnValue) 
-        Assert.Equal(-1, rowsAffected) 
-        Assert.Equal(x + y, !sum)
-        Assert.Equal(!sum, !returnValue)
-        //tupled syntax
-        let rowAffected2, sum2, returnValue2 = cmd.Execute(x, y)
-        Assert.Equal(x + y, sum2)
-        Assert.Equal(sum2, returnValue2)
-        Assert.Equal(-1, rowAffected2) 
-
-    type DboMyTableType = AdventureWorks.dbo.``User-Defined Table Types``.MyTableType 
-
-    [<Fact>]
-    let ResultSetAndOutParam() = 
-        let cmd = new AdventureWorks.dbo.HowManyRows()
-        let p = [
-            DboMyTableType(myId = 1)
-            DboMyTableType(myId = 2, myName = Some "donkey")
-        ]
-
-        do //explicit refs
-            let total = ref Int64.MinValue
-            let returnValue = ref Int32.MaxValue
-            let result = cmd.Execute(p, total, returnValue) 
-            Assert.Equal<_ list>( [ 2, Some "donkey" ], [ for x in result -> x.myId, x.myName ] )
-            Assert.Equal(2L, !total)
-            Assert.Equal(0, !returnValue) //default return value
-
-        do //tupled response syntax
-            let result, total, returnValue = cmd.Execute(p) 
-            Assert.Equal<_ list>( [ 2, Some "donkey" ], [ for x in result -> x.myId, x.myName ] )
-            Assert.Equal(2L, total)
-            Assert.Equal(0, returnValue) //default return value
 
 

src/SqlClient.Tests/SpReturnValueTests.fs

@@ -0,0 +1,46 @@
+module FSharp.Data.SpReturnValueTests
+
+open System
+open Xunit
+
+    type AdventureWorks = SqlProgrammabilityProvider<ConnectionStrings.AdventureWorksNamed, UseReturnValue = true>
+
+    [<Fact>]
+    let AddRef() = 
+        let cmd = new AdventureWorks.dbo.AddRef()
+        let x, y = 12, -1
+        let sum = ref Int32.MinValue
+        let returnValue = ref Int32.MaxValue
+        let rowsAffected = cmd.Execute(x, y, sum, returnValue) 
+        Assert.Equal(-1, rowsAffected) 
+        Assert.Equal(x + y, !sum)
+        Assert.Equal(!sum, !returnValue)
+        //tupled syntax
+        let rowAffected2, sum2, returnValue2 = cmd.Execute(x, y)
+        Assert.Equal(x + y, sum2)
+        Assert.Equal(sum2, returnValue2)
+        Assert.Equal(-1, rowAffected2) 
+
+    type DboMyTableType = AdventureWorks.dbo.``User-Defined Table Types``.MyTableType 
+
+    [<Fact>]
+    let ResultSetAndOutParam() = 
+        let cmd = new AdventureWorks.dbo.HowManyRows()
+        let p = [
+            DboMyTableType(myId = 1)
+            DboMyTableType(myId = 2, myName = Some "donkey")
+        ]
+
+        do //explicit refs
+            let total = ref Int64.MinValue
+            let returnValue = ref Int32.MaxValue
+            let result = cmd.Execute(p, total, returnValue) 
+            Assert.Equal<_ list>( [ 2, Some "donkey" ], [ for x in result -> x.myId, x.myName ] )
+            Assert.Equal(2L, !total)
+            Assert.Equal(0, !returnValue) //default return value
+
+        do //tupled response syntax
+            let result, total, returnValue = cmd.Execute(p) 
+            Assert.Equal<_ list>( [ 2, Some "donkey" ], [ for x in result -> x.myId, x.myName ] )
+            Assert.Equal(2L, total)
+            Assert.Equal(0, returnValue) //default return value

src/SqlClient.Tests/SqlClient.Tests.fsproj

@@ -69,14 +69,17 @@
     <Compile Include="ConfigurationTest.fs" />
     <Compile Include="OptionalParamsTests.fs" />
     <Compile Include="TypeProviderTest.fs" />
+    <Compile Include="FreeVarDoubleDeclTests.fs" />
     <Compile Include="SpatialTypesTests.fs" />
     <Compile Include="TransactionTests.fs" />
     <Compile Include="ResultTypeTests.fs" />
     <Compile Include="TVPTests.fs" />
     <Compile Include="ProgrammabilityTests.fs" />
+    <Compile Include="SpReturnValueTests.fs" />
     <Compile Include="DynamicRecordTests.fs" />
     <Compile Include="SqlEnumTests.fs" />
     <Compile Include="DataTablesTests.fs" />
+    <Compile Include="SynonymsTests.fs" />
     <Compile Include="CreateCommand.fs" />
     <None Include="sampleCommand.sql" />
     <None Include="extensions.sql" />

src/SqlClient.Tests/SynonymsTests.fs

@@ -0,0 +1,60 @@
+module FSharp.Data.SynonymsTests
+
+open System
+open System.Data
+open System.Data.SqlClient
+open ProgrammabilityTest
+open Xunit
+
+type AdventureWorks = ProgrammabilityTest.AdventureWorks
+
+[<Fact>]
+let TVFSynonym() = 
+    let personId = 42
+    let actual = 
+        use cmd = new AdventureWorks.HumanResources.GetContactInformation()
+        cmd.ExecuteSingle(personId)
+        |> Option.map(fun x -> x.FirstName, x.LastName)
+
+    let expected = 
+        use cmd = new ProgrammabilityTest.GetContactInformation()
+        cmd.ExecuteSingle(personId)
+        |> Option.map(fun x -> x.FirstName, x.LastName)
+
+    Assert.Equal(expected, actual)
+
+[<Fact>]
+let SPSynonym() = 
+    let personId = 42
+    let actual = 
+        use cmd = new AdventureWorks.HumanResources.GetEmployeeManagers()
+        [ for x in cmd.Execute(personId) -> sprintf "%A.%A" x.FirstName x.LastName ]
+
+    let expected = 
+        use cmd = new AdventureWorks.dbo.uspGetEmployeeManagers()
+        [ for x in cmd.Execute(personId) -> sprintf "%A.%A" x.FirstName x.LastName ]
+
+    Assert.Equal<_ list>(expected, actual)
+
+
+[<Fact>]
+let TableSynonym() = 
+    let adventureWorks = FSharp.Configuration.AppSettings<"app.config">.ConnectionStrings.AdventureWorks
+    use conn = new SqlConnection(connectionString = adventureWorks)
+    conn.Open()
+    use tran = conn.BeginTransaction()
+
+    use cmd = new GetRowCount(transaction = tran) 
+    Assert.Equal(Some( Some 3), cmd.Execute())
+    
+    let t = new AdventureWorks.dbo.Tables.HRShift()
+    let row = t.NewRow()
+    row.Name <- "French coffee break"
+    row.StartTime <- TimeSpan.FromHours 10.
+    row.EndTime <- TimeSpan.FromHours 12.
+    t.Rows.Add row
+    let rowsInserted = t.Update(conn, tran)
+    Assert.Equal(1, rowsInserted)
+
+    Assert.Equal(Some( Some 4), cmd.Execute())
+

src/SqlClient.Tests/TypeProviderTest.fs

@@ -313,52 +313,3 @@ let ResultsetRuntimeVerificationDiffColumnTypes() =
         err.Message
     )
 
-module ``The undeclared parameter 'X' is used more than once in the batch being analyzed`` = 
-    [<Fact>]
-    let Basic() =
-        use cmd = new SqlCommandProvider<"
-            SELECT * 
-            FROM HumanResources.Shift 
-            WHERE 
-                @time >= StartTime 
-                AND @time <= EndTime
-        ", ConnectionStrings.AdventureWorksNamed>()
-        let actual = [ for x in cmd.Execute( TimeSpan(16, 0, 0)) -> x.Name ]
-        Assert.Equal<_ list>([ "Evening" ], actual )
-
-    [<Fact>]
-    let WithBoundDeclaration() =
-        use cmd = new SqlCommandProvider<"
-            DECLARE @x AS INT = 42; --make bound vars handled properly
-
-            SELECT * 
-            FROM HumanResources.Shift 
-            WHERE 
-                @time >= StartTime 
-                AND @time <= EndTime
-        ", ConnectionStrings.AdventureWorksNamed>()
-        let actual = [ for x in cmd.Execute( TimeSpan(16, 0, 0)) -> x.Name ]
-        Assert.Equal<_ list>([ "Evening" ], actual )
-
-    [<Fact>]
-    let WithUnboundDeclaration() =
-        use cmd = new SqlCommandProvider<"
-            DECLARE @x AS INT; --make bound vars handled properly
-            SELECT * 
-            FROM HumanResources.Shift 
-            WHERE 
-                @time >= StartTime 
-                AND @time <= EndTime
-        ", ConnectionStrings.AdventureWorksNamed>()
-        let actual = [ for x in cmd.Execute( TimeSpan(16, 0, 0)) -> x.Name ]
-        Assert.Equal<_ list>([ "Evening" ], actual )
-
-    [<Fact>]
-    let DynamicFiltering() =
-        use cmd = new SqlCommandProvider<"
-            SELECT * 
-            FROM HumanResources.Shift 
-            WHERE CAST(@time AS TIME) IS NULL OR @time BETWEEN StartTime AND EndTime
-        ", ConnectionStrings.AdventureWorksNamed>()
-        let actual = [ for x in cmd.Execute( TimeSpan(16, 0, 0)) -> x.Name ]
-        Assert.Equal<_ list>([ "Evening" ], actual )