Merge pull request openimis#113 from openimis/develop

Develop

Author: delcroip

.github/workflows/file-merge.yml

@@ -0,0 +1,23 @@
+name: Merge SQL files
+# This workflow run automatically for every commit on github it checks the syntax and launch the tests.
+# | grep . | uniq -c filters out empty lines and then groups consecutive lines together with the number of occurrences
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      comment:
+        description: Just a simple comment to know the purpose of the manual build
+        required: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Merge me!
+        run : bash concatenate_files.sh
+      - name: Publish artifact
+        uses: actions/upload-artifact@master
+        with:
+          name: sql-files
+          path: output 

.github/workflows/openmis-module-test.yml

@@ -32,6 +32,9 @@ jobs:
         uses: actions/checkout@v2
         with:
           path: './new'
+      - name: generate new files
+        working-directory: ./new
+        run: bash concatenate_files.sh
       - name: install linux packages
         run: |
             mkdir ./oldMain 
@@ -49,17 +52,16 @@ jobs:
             /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'DROP DATABASE IF EXISTS imis_1_4_2'
             /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'CREATE DATABASE imis_1_4_2'
             /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_1_4_2 -i 1.42/openIMIS_ONLINE.sql | grep . | uniq -c
-            /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_1_4_2 -i "new/Migration script/openIMIS migration latest.sql" | grep . | uniq -c
-            /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_1_4_2 -i "new/Demo database/openIMIS_demo_ONLINE.sql" | grep . | uniq -c           
+            /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_1_4_2 -i "new/output/fullMigrationScipt.sql" | grep . | uniq -c           
         env:
             SA_PASSWORD: GitHub999
             ACCEPT_EULA: Y
       - name: Initialize DB latest
         run: |
             /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'DROP DATABASE IF EXISTS imis'
             /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'CREATE DATABASE imis'
-            /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis -i "new/Empty databases/openIMIS_ONLINE.sql" | grep . | uniq -c
-            /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis -i "new/Demo database/openIMIS_demo_ONLINE.sql" | grep . | uniq -c
+            /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis -i "new/output/fullDemoDatabase.sql" | grep . | uniq -c
+
 
         env:
           SA_PASSWORD: GitHub999
@@ -70,7 +72,7 @@ jobs:
             /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'CREATE DATABASE imis_main'
             /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_main -i oldMain/openIMIS_ONLINE.sql | grep . | uniq -c
             /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_main -i oldMain/openIMIS_demo_ONLINE.sql | grep . | uniq -c
-            /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_main -i "new/Migration script/openIMIS migration latest.sql" | grep . | uniq -c
+            /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_main -i "new/output/fullMigrationScipt.sql" | grep . | uniq -c
 
 
         env:
@@ -109,7 +111,6 @@ jobs:
               DB_PASSWORD: GitHub999
               #DEV_SERVER: true
               SITE_ROOT: api
-              REMOTE_USER_AUTHENTICATION: True
       - name: Django tests 1.4.2
         working-directory: ./openimis
         run: |
@@ -130,7 +131,6 @@ jobs:
             DB_PASSWORD: GitHub999
             #DEV_SERVER: true
             SITE_ROOT: api
-            REMOTE_USER_AUTHENTICATION: True
       - name: Django tests last main
         working-directory: ./openimis
         run: |
@@ -151,4 +151,3 @@ jobs:
             DB_PASSWORD: GitHub999
             #DEV_SERVER: true
             SITE_ROOT: api
-            REMOTE_USER_AUTHENTICATION: True

Demo database/openIMIS_demo_ONLINE.sql

@@ -1,3 +1,4 @@
+[![Automated CI testing](https://github.com/openimis/database_ms_sqlserver/actions/workflows/openmis-module-test.yml/badge.svg?branch=develop)](https://github.com/openimis/database_ms_sqlserver/actions/workflows/openmis-module-test.yml)
 # openIMIS SQL Server database
 
 This repository contains the openIMIS database for Microsoft SQL Server.

README.md

@@ -19,4 +19,4 @@ FETCH NEXT FROM TableCursor INTO @TableName
 END
 CLOSE TableCursor
 DEALLOCATE TableCursor
-GO
+GO

Tools/Index_rebuild.sql

@@ -0,0 +1,6 @@
+New-Item -ItemType Directory -Force output | Out-Null
+Get-Content (Get-ChildItem 'sql\migrations\1_migration_latest.sql','sql\stored_procedures\*.sql' -Recurse -File) > output\fullMigrationScipt.sql
+Get-Content (Get-ChildItem 'sql\base\*.sql','sql\stored_procedures\*.sql' -Recurse -File) > output\fullEmptyDatabase.sql
+Get-Content (Get-ChildItem 'sql\base\*.sql','sql\stored_procedures\*.sql','sql\demo\*.sql' -Recurse -File) > output\fullDemoDatabase.sql
+Get-Content (Get-ChildItem 'sql\base\*.sql','sql\stored_procedures\*.sql','sql\offline\central.sql' -Recurse -File) > output\fullOfflineCentralDatabase.sql
+Get-Content (Get-ChildItem 'sql\base\*.sql','sql\stored_procedures\*.sql','sql\offline\hf.sql' -Recurse -File) > output\fullOfflineHFDatabase.sql

concatenate_files.ps1

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+mkdir output
+cat sql/migrations/1_migration_latest.sql sql/stored_procedures/*.sql > output/fullMigrationScipt.sql
+cat sql/base/*.sql sql/stored_procedures/*.sql > output/fullEmptyDatabase.sql
+cat sql/base/*.sql sql/stored_procedures/*.sql sql/demo/*.sql> output/fullDemoDatabase.sql
+cat sql/base/*.sql sql/stored_procedures/*.sql sql/offline/central.sql > output/fullOfflineCentralDatabase.sql
+cat sql/base/*.sql sql/stored_procedures/*.sql sql/offline/hf.sql > output/fullOfflineHFDatabase.sql