Merge pull request #299 from smoothdeveloper/docs-fixes

Docs fixes

Author: vasily-kirichenko

docs/content/bulk load.fsx

@@ -1,5 +1,5 @@
 (*** hide ***)
-#r @"..\..\src\SqlClient\bin\Debug\FSharp.Data.SqlClient.dll"
+#r @"..\..\bin\FSharp.Data.SqlClient.dll"
 #r "System.Transactions"
 open FSharp.Data
 open System

docs/content/configuration and Input.fsx

@@ -105,7 +105,7 @@ For example, it can be handed over to DBA team for optimization. It's harder to
 are mixed together (LINQ).
 *)
 
-let cmd = new SqlCommandProvider<"GetDate.sql", connStr>(connStr)
+let cmd = new SqlCommandProvider<const(SqlFile<"GetDate.sql">.Text), connStr>(connStr)
 cmd.Execute() |> ignore
 
 (**

docs/content/dynamic local db.fsx

@@ -1,6 +1,6 @@
 (*** hide ***)
 #r "../../bin/FSharp.Data.SqlClient.dll"
-#r "../../bin/Microsoft.SqlServer.Types.dll"
+#r "Microsoft.SqlServer.Types"
 
 (**
 Dynamic creation of offline MDF
@@ -13,7 +13,7 @@ Sometimes you don't want to have to be online just to compile your programs. Wit
 open FSharp.Data
 
 [<Literal>]
-let connectionString=@"Data Source=(LocalDB)\v11.0;AttachDbFilename=C:\git\Project1\Database1.mdf;Integrated Security=True;Connect Timeout=10"
+let connectionString = @"Data Source=(LocalDB)\v12.0;AttachDbFilename=C:\git\Project1\Database1.mdf;Integrated Security=True;Connect Timeout=10"
 
 (**
 However, binary files like this are difficult to diff/merge when working with multiple developers. For this reason wouldn't it be nice
@@ -73,7 +73,7 @@ Then change your connection string to look like this
 *)
 
 [<Literal>]
-let connectionStringForCompileTime = @"Data Source=(LocalDB)\v11.0;AttachDbFilename=" + __SOURCE_DIRECTORY__ + @"\Database1.mdf;Integrated Security=True;Connect Timeout=10"
+let connectionStringForCompileTime = @"Data Source=(LocalDB)\v12.0;AttachDbFilename=" + __SOURCE_DIRECTORY__ + @"\Database1.mdf;Integrated Security=True;Connect Timeout=10"
 
 type Foo = SqlCommandProvider<"SELECT * FROM Foo", connectionStringForCompileTime>
 

docs/content/reference architecture.fsx

@@ -103,7 +103,7 @@ END
 open FSharp.Data
 
 [<Literal>]
-let adventureWorks = @"Data Source=(LocalDb)\v11.0;Initial Catalog=AdventureWorks2012;Integrated Security=True"
+let adventureWorks = @"Data Source=(LocalDb)\v12.0;Initial Catalog=AdventureWorks2012;Integrated Security=True"
 
 [<Literal>]
 let euler17 = "

docs/content/setup.fsx

@@ -5,4 +5,4 @@
 open FSharp.Data
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2014;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"

docs/content/sqlenumprovider.quickstart.fsx

@@ -194,7 +194,7 @@ type Roles =
     SqlEnumProvider<"
         SELECT * 
         FROM (VALUES(('Read'), 1), ('Write', 2), ('Admin', 4)) AS T(Name, Value)
-    ", @"Data Source=(LocalDb)\v11.0;Integrated Security=True", Kind = SqlEnumKind.CLI>
+    ", @"Data Source=(LocalDb)\v12.0;Integrated Security=True", Kind = SqlEnumKind.CLI>
 
 type CustomAuthorizeAttribute(roles: Roles) = 
     inherit AuthorizeAttribute()

docs/content/transactions.fsx

@@ -4,7 +4,7 @@
 open FSharp.Data
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2014;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
 
 (**
 Transactions 
@@ -156,15 +156,15 @@ do
                 HumanResources.Employee 
             WHERE 
                 BusinessEntityID = @id
-            ", connectionString, ResultType.Tuples, SingleRow = true>()
+            ", connectionString, ResultType.Tuples, SingleRow = true>(connectionString)
 
         jamesKramerId |> cmd.Execute |> Option.get
 
     assert("Production Technician - WC60" = jobTitle)
 
     let newJobTitle = "Uber " + jobTitle
 
-    use updatedJobTitle = new AdventureWorks.HumanResources.uspUpdateEmployeeHireInfo()
+    use updatedJobTitle = new AdventureWorks.HumanResources.uspUpdateEmployeeHireInfo(connectionString)
     let recordsAffrected = 
         updatedJobTitle.Execute(
             businessEntityID, 
@@ -177,7 +177,7 @@ do
         )
 
     let updatedJobTitle = 
-        use cmd = new AdventureWorks.dbo.ufnGetContactInformation()
+        use cmd = new AdventureWorks.dbo.ufnGetContactInformation(connectionString)
         //Use ExecuteSingle on sproc/function generated types
         //if you're sure it return 0 or 1 rows
         let result = cmd.ExecuteSingle(PersonID = jamesKramerId) 
@@ -247,7 +247,7 @@ do
         INSERT INTO Sales.CurrencyRate 
         VALUES (@currencyRateDate, @fromCurrencyCode, @toCurrencyCode, 
                 @averageRate, @endOfDayRate, @modifiedDate) 
-    ", connectionString>()
+    ", connectionString>(connectionString)
 
     let today = DateTime.Now.Date
 

docs/content/unit-testing.fsx

@@ -1,12 +1,12 @@
 (*** hide ***)
 #r @"..\..\bin\FSharp.Data.SqlClient.dll"
-#r @"..\..\packages\xunit.1.9.2\lib\net20\xunit.dll"
+#r @"..\..\packages\Test\xunit\lib\net20\xunit.dll"
 #r "System.Transactions"
 open FSharp.Data
 open System
 
 [<Literal>]
-let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2014;Integrated Security=True"
+let connectionString = @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
 
 (**
 
@@ -40,14 +40,14 @@ type IRepository =
     abstract GetSalesChampion: country: string -> option<GetSalesChampion.Record>
 
 //Production implementation
-type Repository(?connectionString: string) = 
+type Repository(connectionString: string) = 
     interface IRepository with 
         member __.GetEmployeesByLevel(orgLevel) = 
-            use cmd = new GetEmployeesByLevel()
+            use cmd = new GetEmployeesByLevel(connectionString)
             cmd.Execute(orgLevel) |> Seq.toList
 
         member __.GetSalesChampion( region) = 
-            use cmd = new GetSalesChampion()
+            use cmd = new GetSalesChampion(connectionString)
             cmd.Execute(region) 
 
 //logic to test
@@ -74,7 +74,7 @@ module MyTests =
                 else []
 
             member __.GetSalesChampion( region) = 
-                use cmd = new GetSalesChampion()
+                use cmd = new GetSalesChampion(connectionString)
                 cmd.Execute(region) 
     }
 

docs/content/whatsnew.fsx

@@ -6,7 +6,7 @@ open FSharp.Data
 
 [<Literal>]
 let connectionString = 
-    @"Data Source=.;Initial Catalog=AdventureWorks2014;Integrated Security=True"
+    @"Data Source=.;Initial Catalog=AdventureWorks2012;Integrated Security=True"
 
 type DB = SqlProgrammabilityProvider<connectionString>
 
@@ -27,7 +27,7 @@ do
             FROM Sales.vSalesPerson
             WHERE CountryRegionName = @regionName AND SalesYTD > @salesMoreThan 
             ORDER BY SalesYTD
-        ">()
+        ">(connectionString)
     cmd.Execute(topN = 3L, regionName = "United States", salesMoreThan = 1000000M) |> printfn "%A"
 
 (**
@@ -66,10 +66,10 @@ Access to command and record types
 Compare it with usage of ```SqlCommandProvider``` where generated command type aliased explicitly.
 *)
 
-let cmd1 = DB.CreateCommand<"SELECT name, create_date FROM sys.databases">()
+let cmd1 = DB.CreateCommand<"SELECT name, create_date FROM sys.databases">(connectionString)
 // vs
 type Get42 = SqlCommandProvider<"SELECT name, create_date FROM sys.databases", connectionString>
-let cmd2 = new Get42()
+let cmd2 = new Get42(connectionString)
 
 //access to Record type
 type Cmd2Record = Get42.Record
@@ -95,7 +95,7 @@ but auto-competition still chokes on multi-line definitions.
 A workaround is to provide explicit name for generated command type
 *)
 
-let cmd3 = DB.CreateCommand<"SELECT name, create_date FROM sys.databases", TypeName = "Get42">()
+let cmd3 = DB.CreateCommand<"SELECT name, create_date FROM sys.databases", TypeName = "Get42">(connectionString)
 type Cmd3Record = DB.Commands.Get42.Record
 
 (**