Merge pull request #8 from LithWang/master

release/2.5.0

Author: LithWang

Publish/DevOps3/README.md

@@ -1,5 +1,5 @@
 
-# DevOps 3.7
+# DevOps 3.8
 
 
 # build-bash
@@ -24,6 +24,11 @@ if this file exists, will not need approval for jenkins build.
 ----------------------------------------------
 # ReleaseLog
 
+-----------------------
+# 3.8
+> 2024-12-19
+- upgrade net to 8.0
+
 -----------------------
 # 3.7
 > 2024-09-21

Publish/DevOps3/build-bash/10.Test.bash

@@ -37,7 +37,7 @@ docker run -i --rm \
 -v $NUGET_PATH:/root/.nuget \
 -v "$basePath":/root/code \
 -v "$basePath":"$basePath" \
-serset/dotnet:sdk-6.0 \
+serset/dotnet:sdk-8.0 \
 bash -c "
 set -e
 

Publish/DevOps3/build-bash/30.nuget-pack.sh

@@ -22,7 +22,7 @@ docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $NUGET_PATH:/root/.nuget \
 -v $basePath:/root/code \
-serset/dotnet:sdk-6.0 \
+serset/dotnet:sdk-8.0 \
 bash -c "
 
 publishPath=/root/code/Publish/release/release/nuget

Publish/DevOps3/build-bash/40.Station-publish.sh

@@ -23,7 +23,7 @@ docker run -i --rm \
 -v $NUGET_PATH:/root/.nuget \
 -v "$basePath":/root/code \
 -v "$basePath":"$basePath" \
-serset/dotnet:sdk-6.0 \
+serset/dotnet:sdk-8.0 \
 bash -c "
 set -e
 

Publish/DevOps3/release-bash/72.nuget-push.sh

@@ -25,7 +25,7 @@ fi
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $basePath:/root/code \
-serset/dotnet:sdk-6.0 \
+serset/dotnet:sdk-8.0 \
 bash -c "
 for file in /root/code/Publish/release/release/nuget/*.nupkg
 do

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

@@ -13,19 +13,27 @@ export basePath=/root/temp
 
 #---------------------------------------------------------------------
 echo '#build-bash__10.Test__#1.InitEnv.sh -> #1 start MongoDB container'
+
+
+docker rm vitorm-mongodb2 -f || true
 docker rm vitorm-mongodb -f || true
-docker run -d \
---name vitorm-mongodb \
--p 27017:27017 \
--e MONGO_INITDB_ROOT_USERNAME=mongoadmin \
--e MONGO_INITDB_ROOT_PASSWORD=mongoadminsecret \
-mongo:4.4.29
+
+docker run -d --net host --name vitorm-mongodb  mongo:4.4.29 mongod --replSet my-mongo-set
+docker run -d --net host --name vitorm-mongodb2 mongo:4.4.29 mongod --port 27018 --replSet my-mongo-set
+
+
+#---------------------------------------------------------------------
+echo '#build-bash__10.Test__#1.InitEnv.sh -> #2 wait for MongoDB to init'
+docker run -t --rm --net host mongo:4.4.29 timeout 120 sh -c "until (echo 'use db_orm;' | mongo); do echo waiting for MongoDB; sleep 2; done;"
+
+docker run -t --rm --net host mongo:4.4.29 timeout 120 sh -c "until (echo 'use db_orm;' | mongo --host localhost --port 27018); do echo waiting for MongoDB; sleep 2; done;"
 
 
 #---------------------------------------------------------------------
-echo '#build-bash__10.Test__#1.InitEnv.sh -> #8 wait for MongoDB to init'
-docker run -t --rm --link vitorm-mongodb mongo:4.4.29 timeout 120 sh -c "until (echo 'use db_dev' | mongo --host vitorm-mongodb -u mongoadmin -p mongoadminsecret); do echo waiting for MongoDB; sleep 2; done;"
+echo '#build-bash__10.Test__#1.InitEnv.sh -> #3 start replica set'
+docker run -t --rm --net host mongo:4.4.29 sh -c "echo 'rs.initiate({\"_id\":\"my-mongo-set\",\"members\":[{\"_id\":0,\"host\":\"localhost:27017\"},{\"_id\":1,\"host\":\"localhost:27018\"}]})' | mongo"
 
+docker run -t --rm --net host mongo:4.4.29 timeout 120 sh -c "until (echo 'use db_orm;\nuse db_orm2;' | mongo); do echo waiting for MongoDB; sleep 2; done;"
 
 
 #---------------------------------------------------------------------

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

@@ -16,7 +16,7 @@ echo '#build-bash__10.Test_#3.CleanEnv.sh'
 
 
 echo '#build-bash__10.Test_#3.CleanEnv.sh -> #1 remove MongoDB'
+docker rm vitorm-mongodb2 -f || true
 docker rm vitorm-mongodb -f || true
 
 
-

doc/ReleaseNotes.md

@@ -1 +1,13 @@
 # Vitorm.MongoDB ReleaseNotes
+
+-----------------------
+# 2.4.0
+- support Transaction
+- upgrade net to 8.0
+- support group query
+- support PlainDistinctSearch
+- support Count
+- support ToListAsync
+- support ToExecuteString
+- support FirstOrDefault
+

src/Versions.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
-        <Version>2.3.0-develop</Version>
-        <Vitorm_Version>[2.3.0, 2.4.0)</Vitorm_Version>
+        <Version>2.5.0</Version>
+        <Vitorm_Version>[2.5.0, 2.6.0)</Vitorm_Version>
     </PropertyGroup>
 
     <PropertyGroup>

src/Vitorm.MongoDB/DbConfig.cs

@@ -7,13 +7,9 @@ namespace Vitorm.MongoDB
 {
     public class DbConfig
     {
-        public DbConfig(string connectionString, int? commandTimeout = null)
-        {
-            this.connectionString = connectionString;
-            this.commandTimeout = commandTimeout;
-        }
-        public DbConfig(string connectionString, string readOnlyConnectionString, int? commandTimeout = null)
+        public DbConfig(string database, string connectionString, string readOnlyConnectionString = null, int? commandTimeout = null)
         {
+            this.database = database;
             this.connectionString = connectionString;
             this.readOnlyConnectionString = readOnlyConnectionString;
             this.commandTimeout = commandTimeout;
@@ -35,31 +31,35 @@ public DbConfig(Dictionary<string, object> config)
             if (config.TryGetValue("commandTimeout", out value) && value is Int32 commandTimeout)
                 this.commandTimeout = commandTimeout;
         }
-        public string database { get; set; }
+        public string database { get; protected set; }
 
-        public string connectionString { get; set; }
-        public string readOnlyConnectionString { get; set; }
-        public int? commandTimeout { get; set; }
+        public string connectionString { get; protected set; }
+        public string readOnlyConnectionString { get; protected set; }
+        public int? commandTimeout { get; protected set; }
 
-        MongoClient client;
-        MongoClient readOnlyClient;
+        protected MongoClient client;
+        protected MongoClient readOnlyClient;
 
-        MongoClient Client => client ??= new MongoClient(connectionString);
-        MongoClient ReadOnlyClient => readOnlyClient ??= new MongoClient(readOnlyConnectionString);
+        public virtual MongoClient Client => client ??= new MongoClient(connectionString);
+        public virtual MongoClient ReadOnlyClient => readOnlyClient ??= new MongoClient(readOnlyConnectionString);
 
-        public IMongoDatabase GetDatabase() => Client.GetDatabase(database);
-        public IMongoDatabase GetReadOnlyDatabase() => ReadOnlyClient.GetDatabase(database);
+        public virtual IMongoDatabase GetDatabase() => Client.GetDatabase(database);
+        public virtual IMongoDatabase GetReadOnlyDatabase() => ReadOnlyClient.GetDatabase(database);
 
 
+        public virtual DbConfig WithDatabase(string databaseName)
+        {
+            return new(databaseName, connectionString, readOnlyConnectionString, commandTimeout);
+        }
 
 
-        internal string dbHashCode => connectionString.GetHashCode().ToString();
+        internal string dbHashCode => connectionString.GetHashCode().ToString() + "::" + database;
 
 
 
         /// <summary>
         /// to identify whether contexts are from the same database
         /// </summary>
-        public virtual string dbGroupName => "DbSet_" + dbHashCode;
+        public virtual string dbGroupName => "MongoDb_DbSet_" + dbHashCode;
     }
 }