Merge remote-tracking branch 'remotes/upstream/master' into temp-tables

# Conflicts:
#	RELEASE_NOTES.md
#	src/SqlClient/DesignTime.fs

Author: davidoptima

README.md

@@ -1,6 +1,3 @@
-[![Issue Stats](http://issuestats.com/github/fsprojects/FSharp.Data.SqlClient/badge/issue)](http://issuestats.com/github/fsprojects/FSharp.Data.SqlClient)
-[![Issue Stats](http://issuestats.com/github/fsprojects/FSharp.Data.SqlClient/badge/pr)](http://issuestats.com/github/fsprojects/FSharp.Data.SqlClient)
-
 SqlClient providers [![NuGet Status](http://img.shields.io/nuget/v/FSharp.Data.SqlClient.svg?style=flat)](https://www.nuget.org/packages/FSharp.Data.SqlClient/)
 ==============================
 
@@ -10,9 +7,6 @@ SqlProgrammabilityProvider exposes Stored Procedures, User-Defined Types and Use
 
 More information can be found in the [documentation](http://fsprojects.github.io/FSharp.Data.SqlClient/).
 
-
-
-
 Build Status 
 -----------
 
@@ -23,6 +17,7 @@ Build Status
 
 - [@dmitry-a-morozov](https://github.com/dmitry-a-morozov)
 - [@dsevastianov](https://github.com/dsevastianov)
+- [@vasily-kirichenko](https://github.com/vasily-kirichenko) 
 
 The default maintainer account for projects under "fsprojects" is [@fsprojectsgit](https://github.com/fsprojectsgit) - F# Community Project Incubation Space (repo management)
 

RELEASE_NOTES.md

@@ -1,11 +1,13 @@
-#### 1.8.3.1 - Nov 21, 2017
-	* Temp Table
-
-#### 1.8.3 - Aug 12, 2016
+#### 1.8.4 - May 12, 2018
+    * Issue #221 - Expose custom getter/setter methods on provided DataColumn properties
 	* Issue #224 - TVP generated type implicitly from SqlDataRecord. 
 	* Issue #232 - BREAKING CHANGE! SqlFile type provider is a new way to feed external sql files into SqlCommandProvider/CreateCommand
 	* Issue #233 - Optional continueUpdateOnError parameter added Update method on statically typed data tables
 	* Issue #234 - Design-time captured value of named connection string used at runtime if code runs under fsi.exe
+    * Issue #252 - Add factory method to SqlProgrammabilityProvider-generated types
+    * Issue #280 - Upgrade TSQL parser version
+    * Issue #286 - SqlCommand disposes underlying connection in its Dispose method
+    * Issue #289 - Pass `null` if table value argument has zero records
 
 #### 1.8.2 - May 16, 2016
 	* Issue #192 - Invert order of release notes so most recent is on top

SqlClient.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{7ECDF2A7-A71C-43B5-AFF2-64468098B7B6}"
 	ProjectSection(SolutionItems) = preProject
@@ -70,7 +70,4 @@ Global
 		{573DBBFB-0F97-4327-8614-6A4151CD70BF} = {61AC061E-5824-41B7-8E09-8D3A73D564E5}
 		{CB79269B-025B-4D6A-AF84-0AD821F6A602} = {573DBBFB-0F97-4327-8614-6A4151CD70BF}
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8ADC7AFF-DF1C-4FAD-B3AD-63B3A8ED9F99}
-	EndGlobalSection
 EndGlobal

build.cmd

@@ -1,5 +1,5 @@
 @echo off
 if not exist packages\FAKE\tools\Fake.exe ( 
-  .nuget\nuget.exe install FAKE -OutputDirectory packages -Prerelease -ExcludeVersion 
+  .nuget\nuget.exe install FAKE -OutputDirectory packages -ExcludeVersion -Version 4.1.2 
 )
 packages\FAKE\tools\FAKE.exe build.fsx %* 

build.fsx

@@ -35,7 +35,7 @@ let release =
 
 let version = release.AssemblyVersion
 let releaseNotes = release.Notes |> String.concat "\n"
-let testDir = "Build/Tests"
+let testDir = "bin"
 
 // --------------------------------------------------------------------------------------
 // Generate assembly info files with the right version & up-to-date information
@@ -48,7 +48,8 @@ Target "AssemblyInfo" (fun _ ->
              Attribute.Product project
              Attribute.Description summary
              Attribute.Version version
-             Attribute.FileVersion version] )
+             Attribute.FileVersion version
+             Attribute.InternalsVisibleTo "SqlClient.Tests" ] )
 )
 
 // --------------------------------------------------------------------------------------

docs/content/comparison.fsx

@@ -58,15 +58,18 @@ Not so good:
 - By default supports only Microsoft SQLServer and T-SQL
 - Code overhead if you have a large amount of different small operations
 - Doesn't generate domain model for work with C#
+- No support for .NET Standard / .NET Core
 
 ### SQLProvider
 
 Good:
 
-- Supports any database (MSSQL, MySQL, Postgre, Oracle, Odbc, ...)
+- Supports any database (MSSQL, MySQL, PostgreSQL, Oracle, Odbc, ...)
+- Supports .NET Standard and .NET Core
 - Changing the database is not actually huge work
 - Makes effective simple SQL
 - Supports async database operations
+- Used in production for enterprise development for years
 - Simplifies user code
 - Open source
 
@@ -84,6 +87,7 @@ Good:
 
 - You can use generated DB-model from C#-projects
 - Supports even complex LINQ-operations
+- Used in production for enterprise development for years
 
 Not so good:
 
@@ -93,6 +97,25 @@ Not so good:
 - FSharp/LINQ query-syntax is a learning curve
 - Closed source
 - Supports only Microsoft SQLServer
+- No support for .NET Standard / .NET Core
+
+### Rezoom.SQL
+
+Good:
+
+- User has full control of SQL
+- Which allows full utilization of database indexes with complex queries
+- SQL syntax is already familiar for many
+- Supports SQLite, SQL Server, and PostgreSQL
+- Open source
+
+Not so good:
+
+- No support for .NET Standard / .NET Core
+- No support for MySQL, Oracle, ...
+- Code overhead if you have a large amount of different small operations
+- Doesn't generate domain model for work with C#
+
 
 [Dapper](https://code.google.com/p/dapper-dot-net/)
 -----------------------------------------

docs/content/faq.fsx

@@ -71,7 +71,7 @@ Following command allows to filter dynamically information on sales people based
 (**
 ### 4. Why do I get compile time error " ... The undeclared parameter '@p1' is used more than once in the batch being analyzed."?  
 
-This is a limitation of [sys.sp_describe_undeclared_parameters](https://msdn.microsoft.com/en-us/library/ff878260.aspx).
+This is a limitation of [sys.sp\_describe\_undeclared\_parameters](https://msdn.microsoft.com/en-us/library/ff878260.aspx).
 
 To work around this limitation, you can declare another variable in your script:
 
@@ -136,4 +136,4 @@ There are two cases when you would get those extra methods.
 * Referencing a Table Valued Function 
 
 In both cases the methods return `Option<'T>` (or `Async<Option<'T>>`) rather than `Seq<'T>` (or `Async<Seq<'T>>`)
-*)
+*)

lib/Microsoft.SqlServer.TransactSql.ScriptDom.dll

@@ -173,3 +173,17 @@ let CreareDynamicRecords() =
     |> Seq.toArray
     |> ignore
 
+
+[<Fact>]
+let ``connection is properly disposed`` () =
+  
+  let mutable connection : SqlConnection = null 
+  let mutable isDisposed = false
+  do
+    use cmd = DB.CreateCommand<"exec dbo.[Get]", ResultType.DataReader>()
+    connection <- (cmd :> ISqlCommand).Raw.Connection
+    connection.Disposed.Add(fun _ -> isDisposed <- true)
+    use reader = cmd.Execute()
+    ()
+
+  Assert.True isDisposed

src/SqlClient.Tests/CreateCommand.fs

@@ -296,6 +296,36 @@ type DataTablesTests() =
         // getting value same way as a plain datatable still yields DBNull
         Assert.Equal(DBNull.Value, r.[t.Columns.d] :?> DBNull)
 
+    [<Fact>]
+    member __.``Can use datacolumns GetValue and SetValue methods`` () =
+        let t = (new GetArbitraryDataAsDataTable()).Execute()
+        let r = t.Rows.[0]
+        let a, b, c, d =
+          t.Columns.a.GetValue(r)
+          , t.Columns.b.GetValue(r)
+          , t.Columns.c.GetValue(r)
+          , t.Columns.d.GetValue(r)
+
+        Assert.Equal(r.a, a)
+        Assert.Equal(r.b, b)
+        Assert.Equal(r.c, c)
+        Assert.Equal(r.d, d)
+
+        // need to make column readonly = false in order to use SetValue from the DataColumn
+        t.Columns.a.ReadOnly <- false
+        t.Columns.b.ReadOnly <- false
+        t.Columns.c.ReadOnly <- false
+        t.Columns.d.ReadOnly <- false
+
+        t.Columns.a.SetValue(r, 108)
+        t.Columns.b.SetValue(r, 108)
+        t.Columns.c.SetValue(r, 108)
+        t.Columns.d.SetValue(r, Some 108)
+
+        Assert.Equal(r.a, 108)
+        Assert.Equal(r.b, 108)
+        Assert.Equal(r.c, 108)
+        Assert.Equal(r.d, Some 108)
 
     [<Fact>]
     member __.``Can use DataColumnCollection`` () =
@@ -317,12 +347,21 @@ type DataTablesTests() =
         let products = new AdventureWorks.Production.Tables.Product()
 
         let product = products.NewRow()
-        product.Name <- "foo"
+        
+        // can use SetValue
+        let newName = "foo"
+        products.Columns.Name.SetValue(product, newName)
+        Assert.True(product.Name = newName)
 
         // use as plain DataColumns
         let name = product.[products.Columns.Name] :?> string
         Assert.True(product.Name = name)
-    
+
+        // can use GetValue
+        product.FinishedGoodsFlag <- true
+        let finishedGoodsFlag = products.Columns.FinishedGoodsFlag.GetValue(product)
+        Assert.Equal(product.FinishedGoodsFlag, finishedGoodsFlag)
+
     [<Fact>]
     member __.``Can use Table property on SqlCommandProvider's rows`` () =
         use cmd = new GetArbitraryDataAsDataTable()