Merge branch 'master' into AlwaysEncryptedDemos

Author: Pietervanhove

README.md

@@ -3,11 +3,11 @@
 # Azure Data SQL Samples Repository
 This GitHub repository contains code samples that demonstrate how to use Microsoft's Azure Data products including SQL Server, Azure SQL Database, Azure Synapse, and Azure SQL Edge. Each sample includes a README file that explains how to run and use the sample.
 
-Note that certain features like In-Memory OLTP are edition specific for SQL Server and would be possible to implement if the edition which supports that feature is being used to run the sample.
+Please note that specific features, such as In-Memory OLTP, are edition-specific for SQL Server. These features will only be available if the edition that supports them is used to run the sample.
 
 ## Releases in this repository
 
-Releases allow you to conveniently download sample databases or applications without the need to build them from source code. This SQL Server samples repository has the following notable releases:
+Releases provide convenient downloads of sample databases and applications, eliminating the need to build them from source code. This SQL Server samples repository offers the following notable releases:
 
   - [Wide World Importers sample database v1.0](https://github.com/Microsoft/sql-server-samples/releases/tag/wide-world-importers-v1.0) is the main sample for SQL Server 2016 and Azure SQL Database. It contains both an OLTP and an OLAP database.
   - [In-Memory OLTP Performance Demo v1.0](https://github.com/Microsoft/sql-server-samples/releases/tag/in-memory-oltp-demo-v1.0) illustrates the performance benefits of the In-Memory OLTP technology built into SQL Server and Azure SQL Database.
@@ -16,7 +16,12 @@ Releases allow you to conveniently download sample databases or applications wit
 To see the complete list of resources in this repository, navigate to [Releases](https://github.com/Microsoft/sql-server-samples/releases)
 
 ## Working in GitHub
-To work in GitHub, go to https://github.com/microsoft/sql-server-samples and fork the repository. Work in your own fork and when you are ready to submit to make a change or publish your sample for the first time, submit a pull request into the master branch of sql-server-samples. One of the approvers will review your request and accept or reject the pull request.
+To contribute on GitHub, follow these steps:
+
+- Visit https://github.com/microsoft/sql-server-samples and fork the repository.
+- Work in your forked repository.
+- When you're ready to make changes or publish your sample for the first time, submit a pull request into the 'master' branch of 'sql-server-samples'.
+- One of the approvers will review your request and either accept or reject the pull request.
 
 Each sample should be in its own folder with a README.md file that follows the [template](README_samples_template.md). Generated files (e.g., .exe or .bacpac) and user configuration settings (e.g., .user) should not be committed to GitHub.
 

samples/containers/unit-testing/tsqlt-docker/.github/workflows/automated-tests.yml

@@ -1,6 +1,8 @@
-# This workflow installs tSQLt and runs the test units
+# This workflow runs the configured unit tests after installing tSQLt on a SQL Server instance inside a Docker container!
 
-name: tSQLt installer and unit testing runner
+name: Unit testing runner
+
+#---------- 1. Definition of activation events
 
 # Controls when the workflow will run
 on:
@@ -9,16 +11,21 @@ on:
     branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
-    
+
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+#---------- 2. Creating a Docker container from a SQL Server image on Linux
+
 jobs:
+
   windows-auth-tsqlt:
-    name: Installting tSQLt with SQL Auth
+
+    name: Installting tSQLt framework with SQL Auth and running unit tests
+
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    
+
     services:
       sqlserver:
         image: chriseaton/adventureworks:latest
@@ -29,63 +36,67 @@ jobs:
           SA_PASSWORD: 3uuiCaKxfbForrK
 
     steps:
-      - uses: actions/checkout@v2
 
-      - name: Install tSQLt with SQL auth on tempdb
-        uses: lowlydba/tsqlt-installer@v1
-        with:
-          sql-instance: localhost
-          database: tempdb
-          version: latest
-          user: sa
-          password: 3uuiCaKxfbForrK
-        
+#---------- 2.1 Save the container ID into the environment variable ENV_CONTAINER_ID
+
       #- name: Get the containers list unformatted
       #  run: docker ps
-  
+
       #- name: Get the containers list formatted
       #  run: docker ps --all --filter status=running --no-trunc --format "{{.ID}}"
-                
+
       #- name: Set the container ID
       #  run: echo '::set-output name=CONTAINER_ID::$(docker ps --all --filter status=running --no-trunc --format "{{.ID}}")'
       #  id: ContainerID
-        
+
       #- name: Get container ID
       #  run: echo "The container ID is ${{ steps.ContainerID.outputs.CONTAINER_ID }}"
-        
+
       - name: Set environment variable ENV_CONTAINER_ID
         run: echo "ENV_CONTAINER_ID=$(docker ps --all --filter status=running --no-trunc --format "{{.ID}}")" >> $GITHUB_ENV
 
       - name: Test environment variable ENV_CONTAINER_ID
         run: echo $ENV_CONTAINER_ID
-        
-      #- name: Print environment variables
-      #  run: env        
 
-      - name: Restore AdventureWorks2017
+      - name: Sleep for 20s
+        uses: juliangruber/sleep-action@v1
+        with:
+          time: 20s
+
+#---------- 3. AdventureWorks database recovery
+
+      - name: Restore AdventureWorks
         run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -Q "RESTORE DATABASE [AdventureWorks2017] FROM DISK = '/adventureworks.bak' WITH MOVE 'AdventureWorks2017' TO '/var/opt/mssql/data/AdventureWorks.mdf', MOVE 'AdventureWorks2017_log' TO '/var/opt/mssql/data/AdventureWorks_log.ldf'"
 
       - name: Get the database list
         run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -Q "SELECT Name FROM sys.databases"
 
+#---------- 4. Installation of the tSQLt framework
+
+      - uses: actions/[email protected]
+
       - name: Install tSQLt with SQL auth on AdventureWorks2017
         uses: lowlydba/tsqlt-installer@v1
         with:
           sql-instance: localhost
           database: AdventureWorks2017
           version: latest
           user: sa
-          password: 3uuiCaKxfbForrK        
-        
+          password: 3uuiCaKxfbForrK
+
+#---------- 5. Creating the database objects to be tested (SUT)
+
       - name: Create sp usp_Raiserror_SafetyStockLevel
         run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./source/usp-raiserror-safetystocklevel.sql
-        
+
       - name: Create system under test (SUT) TR_Product_SafetyStockLevel
         run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./source/tr-product-safetystocklevel.sql
-        
+
+#---------- 6. Creation and execution of test units
+
       - name: Create test class UnitTestTRProductSafetyStockLevel
         run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./unit-test/test-class-trproductsafetystocklevel.sql
-        
+
       - name: Create and run test case try to insert one wrong row
         run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./unit-test/test-case-try-to-insert-one-wrong-row.sql
 

samples/containers/unit-testing/tsqlt-docker/README.md

@@ -95,7 +95,7 @@ on:
     branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
-    
+
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 ```
@@ -112,8 +112,11 @@ The following YAML code snippet sets up the SQL Server service.
 
 ```
 jobs:
+
   windows-auth-tsqlt:
-    name: Installting tSQLt with SQL Auth
+
+    name: Installting tSQLt framework with SQL Auth and running unit tests
+
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     
@@ -153,7 +156,7 @@ The snippet of YAML code used for the installation of the tSQLt framework in the
 
 ```
 steps:
-  - uses: actions/checkout@v2
+  - uses: actions/checkout@v3.5.2
   - name: Install tSQLt with SQL auth on AdventureWorks2017
     uses: lowlydba/tsqlt-installer@v1
     with:
@@ -177,8 +180,9 @@ Triggers and stored procedures are created in the AdventureWorks database attach
 ```
 - name: Create sp usp_Raiserror_SafetyStockLevel
   run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./source/usp-raiserror-safetystocklevel.sql
-- name: Create TR_Product_SafetyStockLevel
-  run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./source/tr_product_safetystocklevel.sql
+
+- name: Create system under test (SUT) TR_Product_SafetyStockLevel
+  run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./source/tr-product-safetystocklevel.sql
 ```
 
 **6. Creation and execution of test units**
@@ -203,10 +207,13 @@ The following snippet of YAML code creates and runs the test units.
 ```
 - name: Create and run test case try to insert one wrong row
   run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./unit-test/test-case-try-to-insert-one-wrong-row.sql
+
 - name: Create and run test case try to insert one right row
   run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./unit-test/test-case-try-to-insert-one-right-row.sql
+
 - name: Create and run test case try to insert multiple rows
   run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./unit-test/test-case-try-to-insert-multiple-rows.sql
+
 - name: Create and run test case try to insert multiple rows ordered
   run: docker exec -i $ENV_CONTAINER_ID /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "3uuiCaKxfbForrK" -d AdventureWorks2017 -b < ./unit-test/test-case-try-to-insert-multiple-rows-ordered.sql
 ```