Merge branch 'develop' into feature/improve_installation

Author: delcroip

Dockerfile

@@ -1,4 +1,4 @@
-FROM  mcr.microsoft.com/mssql/server:2017-latest
+FROM  mcr.microsoft.com/mssql/server:2022-latest
 ARG ACCEPT_EULA=Y
 ENV ACCEPT_EULA=N
 ARG SA_PASSWORD=IMISuserP@s

script/run-initialization.sh

@@ -4,31 +4,35 @@
 # Wait to be sure that SQL Server came up
 sleep 60s
 
+MSSQL_TOOLS_BASE="/opt/mssql-tools"
+MSSQL_TOOLS_VERSION=$(ls -d ${MSSQL_TOOLS_BASE}* 2>/dev/null | sort -V | tail -n 1 | sed "s|${MSSQL_TOOLS_BASE}||")
+SQLCMD_PATH="${MSSQL_TOOLS_BASE}${MSSQL_TOOLS_VERSION}/bin/sqlcmd"
+
 
 # DATABASE initialisation
 
 echo "Database initialisation"
 # if the table does not exist it will create the table
 
 # get "1" if the database exist : tr get only the integer, cut only the first integer (the second is the number of row affected)
-data=$(/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P $SA_PASSWORD -Q "SELECT COUNT(*)  FROM master.dbo.sysdatabases WHERE name = N'$DB_NAME'" | tr -dc '0-9'| cut -c1 )
-if [ ${data} -eq "0" ]; then
+data=$($SQLCMD_PATH -S localhost -U SA -P $SA_PASSWORD -C -Q "SELECT COUNT(*)  FROM master.dbo.sysdatabases WHERE name = N'$DB_NAME'" | tr -dc '0-9'| cut -c1 )
+if [[ ${data} -eq "0" ]]; then
         echo 'download full demo database'
         echo 'create database user'
-        /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P $SA_PASSWORD -Q "CREATE LOGIN $DB_USER WITH PASSWORD='${SA_PASSWORD}', CHECK_POLICY = OFF"
+        $SQLCMD_PATH -S localhost -U SA -P $SA_PASSWORD -C -Q "CREATE LOGIN $DB_USER WITH PASSWORD='${SA_PASSWORD}', CHECK_POLICY = OFF"
         echo "merging files"
         ./concatenate_files.sh
         echo 'create database'
         #/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P $SA_PASSWORD -Q "DROP DATABASE IF EXISTS $DB_NAME"
-        /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P $SA_PASSWORD -Q "CREATE DATABASE $DB_NAME"
+        $SQLCMD_PATH -S localhost -U SA -P $SA_PASSWORD -C -Q "CREATE DATABASE $DB_NAME"
 
         if [ "$DEMO_DATASET" ]; then
                 /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P $SA_PASSWORD -i output/fullDemoDatabase.sql -d $DB_NAME | grep . | uniq -c
         else
-                /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P $SA_PASSWORD -i output/fullEmptyDatabase.sql -d $DB_NAME | grep . | uniq -c
+                $SQLCMD_PATH -S localhost -U SA -P $SA_PASSWORD -C -i output/fullEmptyDatabase.sql -d $DB_NAME | grep . | uniq -c
         fi
         echo ' give to the user the access to the database'
-        /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P $SA_PASSWORD -Q "EXEC sp_changedbowner '$DB_USER'" -d $DB_NAME
+        $SQLCMD_PATH -S localhost -U SA -P $SA_PASSWORD -C -Q  "EXEC sp_changedbowner '$DB_USER'" -d $DB_NAME
 else
         echo "database already existing, nothing to do"
 fi

sql/base/5_base_data.sql

@@ -341,8 +341,16 @@ INSERT [dbo].[tblRoleRight] ([RoleRightID], [RoleID], [RightID], [ValidityFrom],
 INSERT [dbo].[tblRoleRight] ([RoleRightID], [RoleID], [RightID], [ValidityFrom], [ValidityTo], [AuditUserId], [LegacyID]) VALUES (193, 6, 131107, CURRENT_TIMESTAMP, NULL, NULL, NULL)
 SET IDENTITY_INSERT [dbo].[tblRoleRight] OFF
 SET IDENTITY_INSERT [dbo].[tblUsers] ON 
-
-INSERT [dbo].[tblUsers] ([UserID], [UserUUID], [LanguageID], [LastName], [OtherNames], [Phone], [LoginName], [RoleID], [HFID], [ValidityFrom], [ValidityTo], [LegacyID], [AuditUserID], [password], [DummyPwd], [EmailId], [PrivateKey], [StoredPassword], [PasswordValidity], [IsAssociated]) VALUES (1, newid(), N'en', N'Admin', N'Admin', N'', N'Admin', 1023, 0, CURRENT_TIMESTAMP, NULL, NULL, 0, 0x001699E55A06FA79F4CA0D06EF15096C02000000DF691E2CE66AA7ABDF65B3E6210C1C04CAAE1A3B1FEE5E266B5FAF4F7D4E95109C92E3205F0145CC, NULL, NULL, N'C1C224B03CD9BC7B6A86D77F5DACE40191766C485CD55DC48CAF9AC873335D6F', N'59E66831C680C19E8736751D5480A7C3291BD8775DF47C19C4D0361FBC1C3438', NULL, NULL)
+DECLARE @AdminPassword VARCHAR(MAX) = 'admin123'
+DECLARE @AdminPrivateKey VARCHAR(MAX) = 'Admin'
+INSERT [dbo].[tblUsers] ([UserID], [LanguageID], [LastName], [OtherNames], [Phone], [LoginName], [RoleID], [HFID], [ValidityFrom],
+	[ValidityTo], [LegacyID], [AuditUserID], [PrivateKey], [StoredPassword], [PasswordValidity], [IsAssociated]) 
+VALUES (1, N'en', N'Admin', N'Admin', N'', N'Admin', 1023, 0, CURRENT_TIMESTAMP, NULL, NULL, 0,  
+	-- PrivateKey
+	CONVERT(varchar(max),HASHBYTES('SHA2_256', @AdminPrivateKey),2), 
+	-- [StoredPassword]
+	CONVERT(varchar(max),HASHBYTES('SHA2_256',CONCAT(@AdminPassword,CONVERT(varchar(max),HASHBYTES('SHA2_256',@AdminPrivateKey),2))),2), 
+	NULL, NULL)  
 SET IDENTITY_INSERT [dbo].[tblUsers] OFF
 SET IDENTITY_INSERT [dbo].[tblUserRole] ON