Merge remote-tracking branch 'origin/master'

Author: isaacabraham

src/code-listings/lesson-35/BankAccountDb/Script.PostDeployment.sql

@@ -14,4 +14,22 @@ IF NOT EXISTS (SELECT * FROM dbo.Operation)
 BEGIN
 	INSERT INTO dbo.Operation VALUES (1, 'Withdraw')
 	INSERT INTO dbo.Operation VALUES (2, 'Deposit')
+END
+
+IF NOT EXISTS (SELECT * FROM dbo.Account)
+BEGIN
+    INSERT INTO [dbo].[Account] ([Owner], [AccountId]) VALUES (N'isaac', N'c425e943-b3ca-40b5-8977-f3ddbcda80fc')
+END
+
+IF NOT EXISTS (SELECT * FROM dbo.AccountTransaction)
+BEGIN
+    SET IDENTITY_INSERT [dbo].[AccountTransaction] ON
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (1, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:47', 2, CAST(10 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (2, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:48', 2, CAST(10 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (3, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:48', 2, CAST(10 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (4, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:48', 2, CAST(10 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (5, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:51', 2, CAST(50 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (6, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:54', 1, CAST(100 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (7, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:52:00', 2, CAST(50 AS Decimal(18, 0)))
+    SET IDENTITY_INSERT [dbo].[AccountTransaction] OFF
 END

src/code-listings/lesson-35/Core/Scratchpad.fsx

@@ -1,6 +1,24 @@
 #load "Domain.fs"
 #load "Operations.fs"
+#r @"..\packages\FSharp.Data.SqlClient.1.8.2\lib\net40\FSharp.Data.SqlClient.dll"
+#load "SqlRepository.fs"
 
 open Capstone6.Operations
 open Capstone6.Domain
 open System
+open FSharp.Data
+
+// Copied from SqlRepository.fs, this allows you to test out the queries and commands in isolation.
+let [<Literal>] Conn = @"Data Source=(localdb)\MSSQLLocalDB;Database=BankAccountDb;Integrated Security=True;Connect Timeout=60"
+type AccountsDb = SqlProgrammabilityProvider<Conn>
+type GetAccountId = SqlCommandProvider<"SELECT TOP 1 AccountId FROM dbo.Account WHERE Owner = @owner", Conn, SingleRow = true>
+type FindTransactions = SqlCommandProvider<"SELECT Timestamp, OperationId, Amount FROM dbo.AccountTransaction WHERE AccountId = @accountId", Conn>
+type FindTransactionsByOwner = SqlCommandProvider<"SELECT a.AccountId, at.Timestamp, at.OperationId, at.Amount FROM dbo.Account a LEFT JOIN dbo.AccountTransaction at on a.AccountId = at.AccountId WHERE Owner = @owner", Conn>
+type DbOperations = SqlEnumProvider<"SELECT Description, OperationId FROM dbo.Operation", Conn>
+
+// Get an accountId and then associated transactions. Note that I'm using .Value to "unwrap" the
+// optional accountId. This is unsafe and should NEVER be done in "real" code; use either pattern
+// matching or Option.map. I'm using it here as (a) this is a demo script, and (b) the database
+// is primed with an account that I know about.
+let accountId = GetAccountId.Create(Conn).Execute("isaac")
+let transactions = FindTransactions.Create(Conn).Execute(accountId.Value) |> Seq.toArray

src/code-listings/lesson-35/sample-solution/BankAccountDb/Script.PostDeployment.sql

@@ -14,4 +14,22 @@ IF NOT EXISTS (SELECT * FROM dbo.Operation)
 BEGIN
 	INSERT INTO dbo.Operation VALUES (1, 'Withdraw')
 	INSERT INTO dbo.Operation VALUES (2, 'Deposit')
+END
+
+IF NOT EXISTS (SELECT * FROM dbo.Account)
+BEGIN
+    INSERT INTO [dbo].[Account] ([Owner], [AccountId]) VALUES (N'isaac', N'c425e943-b3ca-40b5-8977-f3ddbcda80fc')
+END
+
+IF NOT EXISTS (SELECT * FROM dbo.AccountTransaction)
+BEGIN
+    SET IDENTITY_INSERT [dbo].[AccountTransaction] ON
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (1, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:47', 2, CAST(10 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (2, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:48', 2, CAST(10 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (3, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:48', 2, CAST(10 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (4, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:48', 2, CAST(10 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (5, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:51', 2, CAST(50 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (6, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:51:54', 1, CAST(100 AS Decimal(18, 0)))
+    INSERT INTO [dbo].[AccountTransaction] ([AccountTransactionId], [AccountId], [Timestamp], [OperationId], [Amount]) VALUES (7, N'c425e943-b3ca-40b5-8977-f3ddbcda80fc', N'2017-05-11 22:52:00', 2, CAST(50 AS Decimal(18, 0)))
+    SET IDENTITY_INSERT [dbo].[AccountTransaction] OFF
 END

src/code-listings/lesson-35/sample-solution/Core/Scratchpad.fsx

@@ -1,6 +1,24 @@
 #load "Domain.fs"
 #load "Operations.fs"
+#r @"..\packages\FSharp.Data.SqlClient.1.8.2\lib\net40\FSharp.Data.SqlClient.dll"
+#load "SqlRepository.fs"
 
 open Capstone6.Operations
 open Capstone6.Domain
 open System
+open FSharp.Data
+
+// Copied from SqlRepository.fs, this allows you to test out the queries and commands in isolation.
+let [<Literal>] Conn = @"Data Source=(localdb)\MSSQLLocalDB;Database=BankAccountDb;Integrated Security=True;Connect Timeout=60"
+type AccountsDb = SqlProgrammabilityProvider<Conn>
+type GetAccountId = SqlCommandProvider<"SELECT TOP 1 AccountId FROM dbo.Account WHERE Owner = @owner", Conn, SingleRow = true>
+type FindTransactions = SqlCommandProvider<"SELECT Timestamp, OperationId, Amount FROM dbo.AccountTransaction WHERE AccountId = @accountId", Conn>
+type FindTransactionsByOwner = SqlCommandProvider<"SELECT a.AccountId, at.Timestamp, at.OperationId, at.Amount FROM dbo.Account a LEFT JOIN dbo.AccountTransaction at on a.AccountId = at.AccountId WHERE Owner = @owner", Conn>
+type DbOperations = SqlEnumProvider<"SELECT Description, OperationId FROM dbo.Operation", Conn>
+
+// Get an accountId and then associated transactions. Note that I'm using .Value to "unwrap" the
+// optional accountId. This is unsafe and should NEVER be done in "real" code; use either pattern
+// matching or Option.map. I'm using it here as (a) this is a demo script, and (b) the database
+// is primed with an account that I know about.
+let accountId = GetAccountId.Create(Conn).Execute("isaac")
+let transactions = FindTransactions.Create(Conn).Execute(accountId.Value) |> Seq.toArray

src/code-listings/lesson-36.fsx

@@ -37,11 +37,8 @@ let asyncLength =
 
 asyncLength |> Async.RunSynchronously
 
-// Listing 36.4
-let getTextAsync = async { return "HELLO" }
-Async.StartWithContinuations(getTextAsync, (fun text -> printfn "%s WORLD" text), ignore, ignore)
-
 // Listing 36.5
+let getTextAsync = async { return "HELLO" }
 let printHelloWorld =
     async {
         let! text = getTextAsync