Update

Author: atrakic

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 
 jobs:
-  test:
+  ci:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/deploy.yml

@@ -7,19 +7,17 @@ on:
   workflow_dispatch:
     inputs:
       environment:
+        type: choice
         description: 'Environment'
         required: true
         default: 'dev'
         options:
-          dev:
-            - 'dev'
-          staging:
-            - 'staging'
-          prod:
-            - 'prod'
+          - 'dev'
+          - 'staging'
+          - 'prod'
 
 jobs:
-  build:
+  deploy:
     runs-on: ubuntu-latest
     environment:
       name: ${{ github.event.inputs.environment }}

DbProject/dbo/Tables/DimCustomer.sql

@@ -13,4 +13,3 @@ CREATE TABLE [dbo].[DimCustomer] (
 
 
 GO
-

DbProject/dbo/Tables/DimDate.sql

@@ -11,4 +11,3 @@ CREATE TABLE [dbo].[DimDate] (
 
 
 GO
-

DbProject/dbo/Tables/DimProduct.sql

@@ -9,4 +9,3 @@ CREATE TABLE [dbo].[DimProduct] (
 
 
 GO
-

DbProject/dbo/Views/vSalesByRegion.sql

@@ -14,4 +14,3 @@
  GROUP BY d.[Year], d.[Month], d.MonthName, c.CountryRegion;
 
 GO
-

Makefile

@@ -1,14 +1,14 @@
 
-.PHONY: all docker clean
+.PHONY: docker build clean
 
-all:
+docker:
+	docker compose up --build --force-recreate --remove-orphans -d
+
+build:
 	dotnet tool restore
 	dotnet outdated --upgrade
 	dotnet build
 
-docker:
-	docker compose up --build --force-recreate --remove-orphans -d
-
 clean:
 	dotnet clean
 	docker compose down --remove-orphans --volumes

README.md

@@ -5,36 +5,41 @@
 
 ## Overview
 
-> This project demonstrates how to automate database development with
-    [dacpac](https://learn.microsoft.com/en-us/sql/relational-databases/data-tier-applications/data-tier-applications?view=sql-server-ver16) 
-to an Azure SQL Database using a GitHub Actions.
+> This project demonstrates how to automate database development with 'microsoft.sqlpackage' to an Azure SQL Database using a GitHub Actions.
 
 
-## Flow 
+## Flow
 
-1. Database Project build
-2. DacPack file is created
-3. Contents of dacpac is consumed by Github Action
-4. Deploy against a database
+1. Build SQL server objects (tables, views, and instance objects)
+2. Dacpack file is created
+3. Contents of dacpac is consumed by Github Actions
+4. Deploy against a SQL database
 
 
 ## Prerequisites
 - Azure Subscription
 
 ## Setup
 1. Create a new Azure Service Principal
-2. Create a new Azure SQL Database, see infra [README.md](../infra/README.md) for more details.
+2. Create a new Azure SQL Database, see infra [Makefile](./infra/Makefile) for more details.
 
 ## Configuration
 1. Add the following secrets to your GitHub repository:
-    - `AZURE_SQL_CONNECTION_STRING` - Azure SQL Database connection string
+    - `AZURE_SQL_CONNECTION_STRING` - Azure SQL Database connection string of your choice
 
 ## Azure Deployment
-See [deploy.yml](.github/workflows/deploy.yml)
+1. Run database deployment from github actions tab. See [deploy.yml](.github/workflows/deploy.yml)
 
 
-## Resources
-- https://github.com/microsoft/DacFx?tab=readme-ov-file#-create-a-sql-project
-- https://learn.microsoft.com/en-gb/sql/tools/sqlpackage/sqlpackage?view=sql-server-ver16
-- https://learn.microsoft.com/en-us/sql/relational-databases/data-tier-applications/data-tier-applications?view=sql-server-ver16
-- https://www.nuget.org/packages/microsoft.build.sql/
+## Local development environment
+To run sql project in Docker, follow these steps:
+
+1. Build and start the necessary containers
+```bash
+make docker
+```
+
+2. Examine the logs
+```bash
+docker compose logs -f sqlpackage
+```

compose.yml

@@ -8,6 +8,7 @@ services:
     env_file:
       - .env
     environment:
+      DACFX_TELEMETRY_OPTOUT: true
       SourceFile: "bin/Debug/DbProject.dacpac"
       TargetConnectionString: "Server=tcp:db,1433;Initial Catalog=demo;UID=sa;Password=${MSSQL_SA_PASSWORD};TrustServerCertificate=true;Connection Timeout=3;"
     volumes:
@@ -18,7 +19,7 @@ services:
       - -c
       - |
         /scripts/deploy.sh
-        # enables to keep the container running
+        # keep the container running (for debugging)
         tail -f /dev/null
     depends_on:
       db:

tests/test.sh

@@ -2,7 +2,7 @@
 # select all tables and views from sql server:
 
 QUERY="
-SELECT * FROM INFORMATION_SCHEMA.TABLES 
+SELECT * FROM INFORMATION_SCHEMA.TABLES
 "
 
 docker exec -it --env-file .env db /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "$MSSQL_SA_PASSWORD" -Q "$QUERY" -b