DevOps3

Publish/DevOps3/environment/build-bash__10.Test__#1.InitEnv.sh

@@ -13,11 +13,11 @@ export basePath=/root/temp
 
 #---------------------------------------------------------------------
 echo '#build-bash__10.Test__#1.InitEnv.sh -> #1 start MySql container'
-docker rm dev-mysql -f || true
+docker rm orm-mysql -f || true
 docker run -d \
---name dev-mysql \
+--name orm-mysql \
 -p 3306:3306 \
--e MYSQL_DATABASE=dev-orm \
+-e MYSQL_DATABASE=db_orm \
 -e MYSQL_ROOT_PASSWORD=123456 \
 mysql:8.0.26
 
@@ -25,9 +25,9 @@ mysql:8.0.26
 
 #---------------------------------------------------------------------
 echo '#build-bash__10.Test__#1.InitEnv.sh -> #2 start SqlServer container'
-docker rm dev-mssql -f || true
+docker rm orm-mssql -f || true
 docker run -d \
---name dev-mssql \
+--name orm-mssql \
 -p 1433:1433 \
 -e 'ACCEPT_EULA=Y' \
 -e 'SA_PASSWORD=Admin0123' \
@@ -49,11 +49,11 @@ echo '#build-bash__10.Test__#1.InitEnv.sh -> #8 wait for containers to init'
 
 
 echo '#build-bash__10.Test__#1.InitEnv.sh -> #8.1 wait for MySql to init' 
-docker run -t --rm --link dev-mysql:dev-mysql mysql:8.0.26 timeout 120 sh -c 'until mysql -h dev-mysql -u root -p123456 -e "SELECT 1"; do echo waiting for mysql; sleep 2; done;  mysql -h dev-mysql -u root -p123456 -e "create database \`dev-orm2\`"'
+docker run -t --rm --link orm-mysql mysql:8.0.26 timeout 120 sh -c 'until mysql -h orm-mysql -u root -p123456 -e "SELECT 1"; do echo waiting for mysql; sleep 2; done;  mysql -h orm-mysql -u root -p123456 -e "create database db_orm2"'
 
 
 echo '#build-bash__10.Test__#1.InitEnv.sh -> #8.2 wait for SqlServer to init' 
-docker run -t --rm --link dev-mssql:dev-mssql mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04 timeout 120 sh -c 'until /opt/mssql-tools/bin/sqlcmd -S "dev-mssql" -U SA -P "Admin0123" -Q "SELECT 1"; do echo waiting for mysql; sleep 2; done;  /opt/mssql-tools/bin/sqlcmd -S "dev-mssql" -U SA -P "Admin0123" -Q "CREATE DATABASE [dev-orm]";  /opt/mssql-tools/bin/sqlcmd -S "dev-mssql" -U SA -P "Admin0123" -Q "CREATE DATABASE [dev-orm2]";    '
+docker run -t --rm --link orm-mssql mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04 timeout 120 sh -c 'until /opt/mssql-tools/bin/sqlcmd -S "orm-mssql" -U SA -P "Admin0123" -Q "SELECT 1"; do echo waiting for mysql; sleep 2; done;  /opt/mssql-tools/bin/sqlcmd -S "orm-mssql" -U SA -P "Admin0123" -Q "CREATE DATABASE db_orm";  /opt/mssql-tools/bin/sqlcmd -S "orm-mssql" -d "db_orm" -U SA -P "Admin0123" -Q "CREATE Schema orm";  /opt/mssql-tools/bin/sqlcmd -S "orm-mssql" -U SA -P "Admin0123" -Q "CREATE DATABASE db_orm2";    '
 
 
 #---------------------------------------------------------------------

Publish/DevOps3/environment/build-bash__10.Test__#3.CleanEnv.sh

@@ -12,8 +12,12 @@ export basePath=/root/temp
 
 
 #---------------------------------------------------------------------
-echo '#build-bash__10.Test_3.CleanEnv.sh'
+echo '#build-bash__10.Test_#3.CleanEnv.sh'
 
 
-echo '#build-bash__10.Test_3.CleanEnv.sh -> #1 remove mysql'
-docker rm dev-mysql -f || true
+echo '#build-bash__10.Test_#3.CleanEnv.sh -> #1 remove MySql'
+docker rm orm-mysql -f || true
+
+
+echo '#build-bash__10.Test_#3.CleanEnv.sh -> #2 remove SqlServer'
+docker rm orm-mssql -f || true

test/IssuesTest/Vitorm.MsTest.Issue000_099/appsettings.json

@@ -4,17 +4,17 @@
       {
         "provider": "Sqlite",
         "namespace": "Vitorm.MsTest.Sqlite",
-        "connectionString": "data source=sqlite.db;"
+        "connectionString": "data source=db_orm.sqlite.db;"
       },
       {
         "provider": "MySql",
         "namespace": "Vitorm.MsTest.MySql",
-        "connectionString": "Data Source=localhost;Port=3306;Database=dev-orm;SslMode=none;User Id=root;Password=123456;CharSet=utf8;allowPublicKeyRetrieval=true;"
+        "connectionString": "Data Source=localhost;Port=3306;Database=db_orm;SslMode=none;User Id=root;Password=123456;CharSet=utf8;allowPublicKeyRetrieval=true;"
       },
       {
         "provider": "SqlServer",
         "namespace": "Vitorm.MsTest.SqlServer",
-        "connectionString": "Server=localhost;Database=dev-orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
+        "connectionString": "Server=localhost;Database=db_orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
       }
 
     ]

test/Vitorm.Data.Benchmark/appsettings.json

@@ -9,12 +9,12 @@
       {
         "provider": "MySql",
         "namespace": "App",
-        "connectionString": "Data Source=localhost;Port=13306;Database=dev-orm;SslMode=none;User Id=root;Password=123456;CharSet=utf8;allowPublicKeyRetrieval=true;"
+        "connectionString": "Data Source=localhost;Port=3306;Database=db_orm;SslMode=none;User Id=root;Password=123456;CharSet=utf8;allowPublicKeyRetrieval=true;"
       },
       {
         "provider": "SqlServer",
         "namespace": "App",
-        "connectionString": "Server=localhost;Database=dev-orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
+        "connectionString": "Server=localhost;Database=db_orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
       }
     ]
   }

test/Vitorm.Data.MsTest/appsettings.json

@@ -14,7 +14,7 @@
 
         "namespace": "Vitorm.MsTest.MySql",
         "//commandTimeout": 60,
-        "connectionString": "Data Source=localhost;Port=3306;Database=dev-orm;SslMode=none;User Id=root;Password=123456;CharSet=utf8;allowPublicKeyRetrieval=true;"
+        "connectionString": "Data Source=localhost;Port=3306;Database=db_orm;SslMode=none;User Id=root;Password=123456;CharSet=utf8;allowPublicKeyRetrieval=true;"
       },
       {
         "provider": "Vitorm.SqlServer.DataProvider",
@@ -22,7 +22,7 @@
 
         "namespace": "Vitorm.MsTest.SqlServer",
         "//commandTimeout": 60,
-        "connectionString": "Server=localhost;Database=dev-orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
+        "connectionString": "Server=localhost;Database=db_orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
       },
       {
         "provider": "Sqlite",

test/Vitorm.EntityGenerate.MsTest/appsettings.json

@@ -9,7 +9,7 @@
       {
         "provider": "SqlServer",
         "namespace": "Vitorm.MsTest.SqlServer",
-        "connectionString": "Server=localhost;Database=dev-orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
+        "connectionString": "Server=localhost;Database=db_orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
       }
 
     ]

test/Vitorm.MySql.MsTest/appsettings.json

@@ -1,7 +1,7 @@
 {
   "Vitorm": {
     "MySql": {
-      "connectionString": "Data Source=localhost;Port=3306;Database=dev-orm;SslMode=none;User Id=root;Password=123456;CharSet=utf8;allowPublicKeyRetrieval=true;GuidFormat=Binary16;"
+      "connectionString": "Data Source=localhost;Port=3306;Database=db_orm;SslMode=none;User Id=root;Password=123456;CharSet=utf8;allowPublicKeyRetrieval=true;GuidFormat=Binary16;"
     }
   }
 }

test/Vitorm.SqlServer.MsTest/DataSource.cs

@@ -4,7 +4,7 @@ using Vitorm.Sql;
 
 namespace Vitorm.MsTest
 {
-    [System.ComponentModel.DataAnnotations.Schema.Table("User", Schema = "dev_orm")]
+    [System.ComponentModel.DataAnnotations.Schema.Table("User", Schema = "orm")]
     public class User
     {
         [System.ComponentModel.DataAnnotations.Key]

test/Vitorm.SqlServer.MsTest/appsettings.json

@@ -1,7 +1,7 @@
 {
   "Vitorm": {
     "SqlServer": {
-      "connectionString": "Server=localhost;Database=dev-orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
+      "connectionString": "Server=localhost;Database=db_orm;User ID=sa;Password=Admin0123;TrustServerCertificate=true;"
     }
   }
 }

test/Vitorm.Sqlite.MsTest/CommonTest/EntityLoader_CustomLoader_Test.cs

@@ -55,7 +55,7 @@ namespace Vitorm.MsTest.CommonTest
 
 
         [Property(name = "TableName", value = "User")]
-        //[Property(name = "Schema", value = "dev_orm")]
+        //[Property(name = "Schema", value = "orm")]
         public class CustomUser
         {
             [Label("Key")]