From c90bcf2051c4fbdeffe93d0e716a928bcd0a4216 Mon Sep 17 00:00:00 2001
From: CorvusYe <CorvusY@foxmail.com>
Date: Wed, 15 Nov 2023 03:10:20 +0800
Subject: [PATCH 1/4] fix: disable automatic space switching when the current
 space is null

---
 .../ye/weicheng/ngbatis/demo/repository/DropSpaceDao.java | 6 ++++--
 ngbatis-demo/src/main/resources/mapper/DropSpaceDao.xml   | 8 ++++++--
 .../ngbatis/demo/repository/DropSpaceDaoTest.java         | 6 +++---
 .../org/nebula/contrib/ngbatis/proxy/MapperProxy.java     | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/repository/DropSpaceDao.java b/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/repository/DropSpaceDao.java
index b03a4da..adc8329 100644
--- a/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/repository/DropSpaceDao.java
+++ b/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/repository/DropSpaceDao.java
@@ -14,9 +14,11 @@
  */
 public interface DropSpaceDao {
   
-  void createSpace(String name);
+  void useTestSpace();
   
-  void dropSpace(String name);
+  void createSpace();
+  
+  void dropSpace();
   
   List<String> showTags();
   
diff --git a/ngbatis-demo/src/main/resources/mapper/DropSpaceDao.xml b/ngbatis-demo/src/main/resources/mapper/DropSpaceDao.xml
index d503396..b1f068f 100644
--- a/ngbatis-demo/src/main/resources/mapper/DropSpaceDao.xml
+++ b/ngbatis-demo/src/main/resources/mapper/DropSpaceDao.xml
@@ -6,11 +6,15 @@
 <mapper namespace="ye.weicheng.ngbatis.demo.repository.DropSpaceDao" space="test_drop">
   
   <delete id="dropSpace">
-    drop space ${ p0 };
+    drop space test_drop;
   </delete>
   
+  <select id="useTestSpace" space="test">
+    RETURN 1;
+  </select>
+  
   <select id="createSpace" space="null">
-    create space ${ p0 } ( vid_type  = INT64 );
+    create space test_drop ( vid_type  = INT64 );
   </select>
   
   <select id="showTags" resultType="java.lang.String">
diff --git a/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/repository/DropSpaceDaoTest.java b/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/repository/DropSpaceDaoTest.java
index a061879..d2abbd8 100644
--- a/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/repository/DropSpaceDaoTest.java
+++ b/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/repository/DropSpaceDaoTest.java
@@ -22,14 +22,14 @@ class DropSpaceDaoTest {
   
   @Test
   void dropSpace() throws InterruptedException {
-    String spaceName = "test_drop";
-    dao.createSpace(spaceName);
+    dao.useTestSpace();
+    dao.createSpace();
     Thread.sleep(10 * 1000);
     
     List<String> tags = dao.showTags();
     System.out.println(tags);
     
-    dao.dropSpace(spaceName);
+    dao.dropSpace();
   }
 
 }
diff --git a/src/main/java/org/nebula/contrib/ngbatis/proxy/MapperProxy.java b/src/main/java/org/nebula/contrib/ngbatis/proxy/MapperProxy.java
index ed6ea02..fcceae1 100644
--- a/src/main/java/org/nebula/contrib/ngbatis/proxy/MapperProxy.java
+++ b/src/main/java/org/nebula/contrib/ngbatis/proxy/MapperProxy.java
@@ -319,7 +319,7 @@ private static String[] qlWithSpace(LocalSession localSession, String gql, Strin
     gql = gql.trim();
     String sessionSpace = localSession.getCurrentSpace();
     boolean sameSpace = Objects.equals(sessionSpace, currentSpace);
-    if (!sameSpace) {
+    if (!sameSpace && currentSpace !=  null) {
       qlAndSpace[0] = currentSpace;
       Session session = localSession.getSession();
       ResultSet execute = session.execute(String.format("USE `%s`", currentSpace));

From 0fb7704921e06993de769361e912e8a7a24af19b Mon Sep 17 00:00:00 2001
From: CorvusYe <CorvusY@foxmail.com>
Date: Wed, 15 Nov 2023 04:14:26 +0800
Subject: [PATCH 2/4] v1.2.0-beta

---
 CHANGELOG.md                                           | 10 +++++++++-
 README.md                                              |  2 +-
 ngbatis-demo/pom.xml                                   |  2 +-
 pom.xml                                                |  2 +-
 .../nebula/contrib/ngbatis/proxy/NebulaDaoBasic.java   |  6 +++---
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc70090..21c4c04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,7 @@ This source code is licensed under Apache 2.0 License.
 
 - [ ] Springboot 3.x support.
 
-# NEXT
+# 1.2.0-beta
 
 ## Dependencies upgrade
 
@@ -34,6 +34,13 @@ This source code is licensed under Apache 2.0 License.
 - beetl: 3.1.8-RELEASE -> 3.15.10.RELEASE
 - antlr4: 4.7.2 -> 4.11.1
 
+## Feature
+
+- feat: support `<nGQL>` include query pieces. ([#212](https://github.com/nebula-contrib/ngbatis/pull/212), via [dieyi](https://github.com/1244453393))
+- feat: extending `NgPath`, when 'with prop' is used in nGQL, edge attributes can be obtained from NgPath. ([#212](https://github.com/nebula-contrib/ngbatis/pull/212), via [dieyi](https://github.com/1244453393))
+- feat: expanding the `insertEdgeBatch` interface in `NebulaDaoBasic`. ([#244](https://github.com/nebula-contrib/ngbatis/pull/244), via [Sunhb](https://github.com/shbone))
+- feat: expanding the `deleteByIdBatch` interface in `NebulaDaoBasic`. ([#247](https://github.com/nebula-contrib/ngbatis/pull/244), via [Sunhb](https://github.com/shbone))
+
 ## Bugfix
 
 - fix: support methods in mapper tags to set space to null.
@@ -55,6 +62,7 @@ This source code is licensed under Apache 2.0 License.
 - fix: when DAO/Mapper method has `Page` type param with `@Param`, the param name can not be use.
   > 如原来项目中分页相关接口，用了不起作用的 `@Param`, 但 xml 还是使用 p0, p1...
   > 需要将 `@Param` 移除，或者将 xml 中的参数名改成 注解的参数名，以保证参数名统一
+- fix:class 'ResultSetUtil.java' parse datetime type error. ([#241](https://github.com/nebula-contrib/ngbatis/pull/241), via [爱吃辣条的Jerry](https://github.com/bobobod))
 
 ## Develop behavior change
 
diff --git a/README.md b/README.md
index 5908293..435a551 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This source code is licensed under Apache 2.0 License.
 </p>
 
 - [Ngbatis Docs](https://nebula-contrib.github.io/ngbatis/)
-- [Ngbatis 文档](https://corvusye.github.io/ngbatis-docs/)
+- [Ngbatis 文档](https://graph-cn.github.io/ngbatis-docs/)
 
 ## What is NGBATIS
 
diff --git a/ngbatis-demo/pom.xml b/ngbatis-demo/pom.xml
index 1cbe2a6..631b797 100644
--- a/ngbatis-demo/pom.xml
+++ b/ngbatis-demo/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.nebula-contrib</groupId>
 			<artifactId>ngbatis</artifactId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.2.0-beta</version>
 		</dependency>
 	</dependencies>
 
diff --git a/pom.xml b/pom.xml
index ea97f61..d237a2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <name>ngbatis</name>
     <groupId>org.nebula-contrib</groupId>
     <artifactId>ngbatis</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-beta</version>
 
     <developers>
         <developer>
diff --git a/src/main/java/org/nebula/contrib/ngbatis/proxy/NebulaDaoBasic.java b/src/main/java/org/nebula/contrib/ngbatis/proxy/NebulaDaoBasic.java
index 571c96c..993b74b 100644
--- a/src/main/java/org/nebula/contrib/ngbatis/proxy/NebulaDaoBasic.java
+++ b/src/main/java/org/nebula/contrib/ngbatis/proxy/NebulaDaoBasic.java
@@ -291,7 +291,7 @@ default int deleteLogicById(I id) {
    * @param id 表记录主键
    * @return 是否执行成功，成功 1 ，失败 0
    */
-  default int deleteWithEdgeById(I id) {
+  default Integer deleteWithEdgeById(I id) {
     MethodModel methodModel = getMethodModel();
     methodModel.setReturnType(ResultSet.class);
     methodModel.setResultType(ResultSet.class);
@@ -306,7 +306,7 @@ default int deleteWithEdgeById(I id) {
    * @param id 表记录主键
    * @return 是否删除成功，成功 1，失败 0
    */
-  default int deleteById(I id) {
+  default Integer deleteById(I id) {
     MethodModel methodModel = getMethodModel();
     methodModel.setReturnType(ResultSet.class);
     methodModel.setResultType(ResultSet.class);
@@ -322,7 +322,7 @@ default int deleteById(I id) {
    * @param ids 表记录主键列表
    * @return 是否删除成功，成功 1，失败 0
    */
-  default int deleteByIdBatch(Collection<I> ids) {
+  default Integer deleteByIdBatch(Collection<I> ids) {
     MethodModel methodModel = getMethodModel();
     methodModel.setReturnType(ResultSet.class);
     methodModel.setResultType(ResultSet.class);

From 9fd0589e26c61532aafe7ecb2356fd4998156708 Mon Sep 17 00:00:00 2001
From: CorvusYe <CorvusY@foxmail.com>
Date: Wed, 15 Nov 2023 04:19:01 +0800
Subject: [PATCH 3/4] v1.2.0-beta

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21c4c04..63c2b06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ This source code is licensed under Apache 2.0 License.
 - [ ] Expand the function of NebulaDaoBasic
   - [ ] Add batch interface:
     - [ ] insertTripletBatch
-    - [ ] insertEdgeBatch
+    - [x] insertEdgeBatch
     - [ ] ...
   - [ ] Schema support:
     - [ ] show metas

From 4ecec684dd3eef738ba4dcab9d20d24f461f6ae6 Mon Sep 17 00:00:00 2001
From: CorvusYe <CorvusY@foxmail.com>
Date: Wed, 15 Nov 2023 04:28:44 +0800
Subject: [PATCH 4/4] v1.2.0-beta

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63c2b06..949bc1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,7 @@ This source code is licensed under Apache 2.0 License.
 ## Feature
 
 - feat: support `<nGQL>` include query pieces. ([#212](https://github.com/nebula-contrib/ngbatis/pull/212), via [dieyi](https://github.com/1244453393))
-- feat: extending `NgPath`, when 'with prop' is used in nGQL, edge attributes can be obtained from NgPath. ([#212](https://github.com/nebula-contrib/ngbatis/pull/212), via [dieyi](https://github.com/1244453393))
+- feat: extending `NgPath`, when 'with prop' is used in nGQL, edge attributes can be obtained from NgPath. ([#228](https://github.com/nebula-contrib/ngbatis/pull/228), via [dieyi](https://github.com/1244453393))
 - feat: expanding the `insertEdgeBatch` interface in `NebulaDaoBasic`. ([#244](https://github.com/nebula-contrib/ngbatis/pull/244), via [Sunhb](https://github.com/shbone))
 - feat: expanding the `deleteByIdBatch` interface in `NebulaDaoBasic`. ([#247](https://github.com/nebula-contrib/ngbatis/pull/244), via [Sunhb](https://github.com/shbone))