Upgraded BelgradeProductCatalog to .csproj

jovanpop-msft · jovanpop-msft · commit 649efa4eadd9 · 2018-09-30T17:48:35.000+02:00
diff --git a/samples/demos/belgrade-product-catalog-demo/Controllers/CompanyController.cs b/samples/demos/belgrade-product-catalog-demo/Controllers/CompanyController.cs
@@ -22,7 +22,7 @@ public CompanyController(IQueryPipe sqlQueryService)
         [HttpGet]
         public async Task Get()
         {
-            await sqlQuery.Stream("select CompanyID as [value], Name as [text] from Company FOR JSON PATH", Response.Body);
+            await sqlQuery.Sql("select CompanyID as [value], Name as [text] from Company FOR JSON PATH").Stream(Response.Body);
         }
 
         [HttpGet("login")]
diff --git a/samples/demos/belgrade-product-catalog-demo/Controllers/ProductController.cs b/samples/demos/belgrade-product-catalog-demo/Controllers/ProductController.cs
@@ -37,11 +37,11 @@ await sqlQuery
                         this.Response.StatusCode = 500;
                         throw ex;
                     })
-                .Stream(@"
+                .Sql(@"
             select  ProductID, Name, Color, Price, Quantity,
                     JSON_VALUE(Data, '$.MadeIn') as MadeIn, JSON_QUERY(Tags) as Tags
             from Product
-            FOR JSON PATH, ROOT('data')", Response.Body, EMPTY_PRODUCTS_ARRAY);
+            FOR JSON PATH, ROOT('data')").Stream(Response.Body);
         }
 
         // GET api/Product/compressed
@@ -50,91 +50,92 @@ public async Task GetCompressed()
         {
             Response.Headers.Add("Content-Type", "application/json;charset=utf-16");
             Response.Headers.Add("Content-Encoding", "gzip");
-            await sqlQuery.Stream(@"
+            await sqlQuery.Sql(@"
 select COMPRESS(
            (select  ProductID, Name, Color, Price, Quantity,
                     JSON_VALUE(Data, '$.MadeIn') as MadeIn, JSON_QUERY(Tags) as Tags
             from Product
             FOR JSON PATH, ROOT('data') )
-)", Response.Body, EMPTY_PRODUCTS_ARRAY_GZIPPED);
+)").Stream(Response.Body, EMPTY_PRODUCTS_ARRAY_GZIPPED);
         }
 
         // GET api/Product/5
         [HttpGet("{id}")]
         public async Task Get(int id)
         {
-            var cmd = new SqlCommand(
+            await sqlQuery.Sql(
 @"select    ProductID, Product.Name, Color, Price, Quantity,
             Company.Name as Company, Company.Address, Company.Email, Company.Phone 
 from Product
     join Company on Product.CompanyID = Company.CompanyID
 where ProductID = @id
-FOR JSON PATH, WITHOUT_ARRAY_WRAPPER");
-
-            cmd.Parameters.AddWithValue("id", id);
-            await sqlQuery.Stream(cmd, Response.Body, "{}");
+FOR JSON PATH, WITHOUT_ARRAY_WRAPPER")
+                .Param("id", id)
+                .Stream(Response.Body, "{}");
         }
 
         // POST api/Product
         [HttpPost]
         public async Task Post()
         {
             string product = new StreamReader(Request.Body).ReadToEnd();
-            var cmd = new SqlCommand("EXEC InsertProductFromJson @ProductJson");
-            cmd.Parameters.AddWithValue("ProductJson", product);
-            await sqlCmd.ExecuteNonQuery(cmd);
+            await sqlCmd
+                    .Sql("EXEC InsertProductFromJson @ProductJson")
+                    .Param("ProductJson", product)
+                    .Exec();
         }
 
         // PUT api/Product/5
         [HttpPut("{id}")]
         public async Task Put(int id)
         {
             string product = new StreamReader(Request.Body).ReadToEnd();
-            var cmd = new SqlCommand("EXEC UpdateProductFromJson @ProductID, @ProductJson");
-            cmd.Parameters.AddWithValue("ProductID", id);
-            cmd.Parameters.AddWithValue("ProductJson", product);
-            await sqlCmd.ExecuteNonQuery(cmd);
+            await sqlCmd
+                .Sql("EXEC UpdateProductFromJson @ProductID, @ProductJson")
+                .Param("ProductID", id)
+                .Param("ProductJson", product)
+                .Exec();
         }
 
         // DELETE api/Product/5
         [HttpDelete("{id}")]
         public async Task Delete(int id)
         {
-            var cmd = new SqlCommand(@"delete Product where ProductID = @id");
-            cmd.Parameters.AddWithValue("id", id);
-            await sqlCmd.ExecuteNonQuery(cmd);
+            await sqlCmd.Sql(@"delete Product where ProductID = @id")
+                        .Param("id", id)
+                        .Exec();
         }
 
         [HttpGet("temporal")]
         [Produces("application/json")]
         public async Task Get(DateTime? date)
         {
             if (date == null)
-                await this.sqlQuery.Stream("EXEC GetProducts", this.Response.Body, EMPTY_PRODUCTS_ARRAY);
+                await this.sqlQuery
+                    .Sql("EXEC GetProducts")
+                    .Stream(this.Response.Body, EMPTY_PRODUCTS_ARRAY);
             else
-            {
-                var cmd = new SqlCommand("EXEC GetProductsAsOf @date");
-                cmd.Parameters.AddWithValue("@date", date);
-                await this.sqlQuery.Stream(cmd, this.Response.Body, EMPTY_PRODUCTS_ARRAY);
-            }
+                await this.sqlQuery.Sql("EXEC GetProductsAsOf @date")
+                    .Param("date", date)
+                    .Stream(this.Response.Body, EMPTY_PRODUCTS_ARRAY);
         }
 
         [HttpGet("restore")]
         [Produces("application/json")]
         public void RestoreVersion(int ProductId, DateTime DateModified)
         {
-            var cmd = new SqlCommand("EXEC RestoreProduct @productid, @date");
-            cmd.Parameters.AddWithValue("@productid", ProductId);
-            cmd.Parameters.AddWithValue("@date", DateModified);
             this.sqlCmd
+                .Sql("EXEC RestoreProduct @productid, @date")
+                .Param("productid", ProductId)
+                .Param("date", DateModified)
                 .OnError(
                     ex =>
                     {
                         logger.LogError("Error while trying to restore product with id {ProductID} from time {DateModified}.\n{Error}\n{StackTrace}", ProductId, DateModified, ex.Message, ex.StackTrace);
                         this.Response.StatusCode = 500;
                         throw ex;
                     })
-                .ExecuteNonQuery(cmd);
+                .Exec();
         }
 
 
@@ -143,12 +144,13 @@ public void RestoreVersion(int ProductId, DateTime DateModified)
         public async Task Report1()
         {
             await sqlQuery
-                .Stream(@"
+                .Sql(@"
 select color as x, sum(quantity) as y
 from product
 where color is not null
 group by color
-for json path", Response.Body, EMPTY_PRODUCTS_ARRAY);
+for json path")
+                .Stream(Response.Body, EMPTY_PRODUCTS_ARRAY);
         }
 
 
@@ -157,7 +159,7 @@ group by color
         public async Task Report2()
         {
             await sqlQuery
-                .Stream(@"
+                .Sql(@"
 select name as [key], [values].x, [values].y
 	from company
 		join (select companyid, color as x, sum(quantity) as y
@@ -166,7 +168,8 @@ where color is not null
 				group by companyid, color
 				) as [values] on company.companyid = [values].companyid
 order by company.companyid
-for json auto", Response.Body, EMPTY_PRODUCTS_ARRAY);
+for json auto")
+            .Stream(Response.Body, EMPTY_PRODUCTS_ARRAY);
         }
     }
 }
diff --git a/samples/demos/belgrade-product-catalog-demo/ProductCatalog.xproj b/samples/demos/belgrade-product-catalog-demo/ProductCatalog.xproj
diff --git a/samples/demos/belgrade-product-catalog-demo/Startup.cs b/samples/demos/belgrade-product-catalog-demo/Startup.cs
@@ -9,10 +9,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using ProductCatalog.Models;
-using Serilog;
-#if NET46 
+using Serilog; 
+using Serilog.Sinks;
 using Serilog.Sinks.MSSqlServer;
-#endif
 using System;
 using System.Data.SqlClient;
 using System.Linq;
@@ -29,22 +28,24 @@ public Startup(IHostingEnvironment env)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
                 .AddEnvironmentVariables();
             Configuration = builder.Build();
-#if NETCOREAPP1_0
+#if NETCOREAPP2_0
             Log.Logger = new LoggerConfiguration()
                 .WriteTo.RollingFile(new Serilog.Formatting.Json.JsonFormatter(), System.IO.Path.Combine(env.ContentRootPath, "logs\\log-{Date}.ndjson"))
                 .CreateLogger();
 #endif
 #if NET46
             var columnOptions = new ColumnOptions();
             // Don't include the Properties XML column.
+            columnOptions.Store.Remove(StandardColumn.Id);
             columnOptions.Store.Remove(StandardColumn.Properties);
             columnOptions.Store.Remove(StandardColumn.MessageTemplate);
             columnOptions.Store.Remove(StandardColumn.Exception);
+            columnOptions.TimeStamp.ColumnName = "EventTime";
             // Do include the log event data as JSON.
             columnOptions.Store.Add(StandardColumn.LogEvent);
 
             Log.Logger = new LoggerConfiguration()
-                .WriteTo.MSSqlServer(Configuration["ConnectionStrings:BelgradeDemo"], "dbo.Logs", columnOptions: columnOptions)
+                .WriteTo.MSSqlServer(Configuration["ConnectionStrings:BelgradeDemo"], "Logs", columnOptions: columnOptions, autoCreateSqlTable: false)
                 .CreateLogger();
 #endif
         }
diff --git a/samples/demos/belgrade-product-catalog-demo/appsettings.json b/samples/demos/belgrade-product-catalog-demo/appsettings.json
@@ -8,6 +8,6 @@
     }
   },
   "ConnectionStrings": {
-    "BelgradeDemo": "Server=.\\SQLEXPRESS;Database=ProductCatalog;Integrated Security=true"
+    "BelgradeDemo": "Server=.\\SQLEXPRESS;Database=ProductCatalog;Integrated Security=true;Application Name=Belgrade"
   }
 }
diff --git a/samples/demos/belgrade-product-catalog-demo/belgrade-product-catalog-demo.csproj b/samples/demos/belgrade-product-catalog-demo/belgrade-product-catalog-demo.csproj
@@ -0,0 +1,57 @@
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <AssemblyName>belgrade-product-catalog-demo</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>belgrade-product-catalog-demo</PackageId>
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="wwwroot\**\*;Views\**\*">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Belgrade.Sql.Client" Version="1.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Session" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
+    <PackageReference Include="Serilog" Version="2.5.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="1.3.1" />
+    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
+    <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
+    <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.1.3-dev-00224" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="sql-scripts\bcp.sql.sql">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>bcp.sql.tt</DependentUpon>
+    </None>
+    <None Update="sql-scripts\bcp.sql.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>bcp.sql.sql</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/demos/belgrade-product-catalog-demo/project.json b/samples/demos/belgrade-product-catalog-demo/project.json
diff --git a/samples/demos/belgrade-product-catalog-demo/sql-scripts/1 setup.sql b/samples/demos/belgrade-product-catalog-demo/sql-scripts/1 setup.sql
@@ -115,13 +115,10 @@ END
 GO
 DROP TABLE IF EXISTS Logs;
 GO
-CREATE TABLE Logs (
-   Id int IDENTITY PRIMARY KEY,
-   Message nvarchar(max) NULL,
-   MessageTemplate nvarchar(max) NULL,
-   Level nvarchar(128) NULL,
-   TimeStamp datetimeoffset(7) NOT NULL,
-   Exception nvarchar(max) NULL,
-   Properties xml NULL,
-   LogEvent nvarchar(max) NULL
-);
+
+CREATE TABLE Logs( 
+	[Message] NVARCHAR(4000) NOT NULL,
+	[Level] VARCHAR(16) NOT NULL,
+	[EventTime] DATETIME2 (7) NOT NULL,
+	[LogEvent] NVARCHAR(max) NULL
+) 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public CompanyController(IQueryPipe sqlQueryService)`
`22`	`22`	`[HttpGet]`
`23`	`23`	`public async Task Get()`
`24`	`24`	`{`
`25`		`- await sqlQuery.Stream("select CompanyID as [value], Name as [text] from Company FOR JSON PATH", Response.Body);`
	`25`	`+ await sqlQuery.Sql("select CompanyID as [value], Name as [text] from Company FOR JSON PATH").Stream(Response.Body);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`[HttpGet("login")]`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`"ConnectionStrings": {`
`11`		`- "BelgradeDemo": "Server=.\\SQLEXPRESS;Database=ProductCatalog;Integrated Security=true"`
	`11`	`+ "BelgradeDemo": "Server=.\\SQLEXPRESS;Database=ProductCatalog;Integrated Security=true;Application Name=Belgrade"`
`12`	`12`	`}`
`13`	`13`	`}`