batch test

Author: xlorne

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.codingapi.dbstream</groupId>
     <artifactId>dbstream-driver</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.9</version>
 
     <url>https://github.com/codingapi/dbstream-driver</url>
     <name>dbstream-driver</name>
@@ -34,8 +34,7 @@
         <lombok.version>1.18.42</lombok.version>
 
         <!-- test dependencies properties-->
-        <springboot.version>2.7.18</springboot.version>
-        <h2.version>2.2.222</h2.version>
+        <springboot.version>3.5.7</springboot.version>
     </properties>
 
     <dependencies>
@@ -55,7 +54,14 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
+            <version>2.2.222</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.7.3</version>
             <scope>test</scope>
         </dependency>
 

scripts/.gitignore

@@ -0,0 +1 @@
+data

scripts/db.yaml

@@ -0,0 +1,23 @@
+version: "3.9"
+
+services:
+  postgres:
+    image: postgres:15
+    container_name: postgres-db
+    restart: always
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: 123456
+      POSTGRES_DB: demo
+      TZ: Asia/Shanghai
+    ports:
+      - "5432:5432"
+    volumes:
+      # 数据持久化路径
+      - ./data:/var/lib/postgresql/data
+    networks:
+      - pg-network
+
+networks:
+  pg-network:
+    driver: bridge

src/main/java/com/codingapi/dbstream/interceptor/SQLExecuteState.java

@@ -216,10 +216,12 @@ public List<Map<String, Object>> getStatementGenerateKeys(DbTable dbTable) {
                     Map<String, Object> map = new HashMap<>();
                     ResultSetMetaData resultSetMetaData = rs.getMetaData();
                     int columnCount = resultSetMetaData.getColumnCount();
-                    List<DbColumn> primaryKeyColumns = dbTable.getPrimaryColumns();
                     for (int i = 1; i <= columnCount; i++) {
-                        DbColumn dbColumn = primaryKeyColumns.get(i - 1);
-                        map.put(dbColumn.getName(), rs.getObject(i));
+                        String columName = resultSetMetaData.getColumnName(i);
+                        DbColumn dbColumn = dbTable.getColumnByName(columName);
+                        if(dbColumn!=null) {
+                            map.put(dbColumn.getName(), rs.getObject(i));
+                        }
                     }
                     list.add(map);
                 }

src/main/java/com/codingapi/dbstream/proxy/PreparedStatementProxy.java

@@ -163,6 +163,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException {
 
     @Override
     public boolean execute() throws SQLException {
+        System.out.println("execute:"+this.executeState.getSql());
         SQLRunningContext.getInstance().before(this.executeState);
         boolean result = preparedStatement.execute();
         SQLRunningContext.getInstance().after(this.executeState, result);
@@ -171,6 +172,7 @@ public boolean execute() throws SQLException {
 
     @Override
     public void addBatch() throws SQLException {
+        System.out.println("addBatch:"+this.executeState.getSql());
         preparedStatement.addBatch();
     }
 
@@ -390,6 +392,7 @@ public ResultSet executeQuery(String sql) throws SQLException {
     @Override
     public int executeUpdate(String sql) throws SQLException {
         this.executeState.setSql(sql);
+        System.out.println("executeUpdate:"+sql);
         SQLRunningContext.getInstance().before(this.executeState);
         int result = preparedStatement.executeUpdate(sql);
         SQLRunningContext.getInstance().after(this.executeState, result);

src/test/java/com/example/dbstream/entity/User1.java

@@ -1,17 +1,18 @@
 package com.example.dbstream.entity;
 
+import jakarta.persistence.*;
 import lombok.Data;
 
-import javax.persistence.*;
 
 @Data
 @Entity
 @Table(name = "m_user_1")
 public class User1 {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "user_seq")
+    @SequenceGenerator(name = "user_seq", sequenceName = "user_seq", allocationSize = 50)
+    private Long id;
 
     private String username;
 

src/test/java/com/example/dbstream/entity/User2.java

@@ -2,7 +2,7 @@
 
 import lombok.Data;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Data
 @Entity

src/test/java/com/example/dbstream/repository/User2Repository.java

@@ -25,7 +25,7 @@ public interface User2Repository extends JpaRepository<User2, Long> {
     int counts();
 
     @Modifying
-    @Query("update User2 set password = now() where username = ?1")
+    @Query("update User2 set password = '123' where username = ?1")
     int resetPasswordByUsername1(String username);
 
     @Modifying

src/test/java/com/example/dbstream/tests/User1RepositoryTest.java

@@ -2,21 +2,17 @@
 
 
 import com.codingapi.dbstream.DBStreamContext;
-import com.codingapi.dbstream.stream.DBEvent;
-import com.codingapi.dbstream.stream.DBEventPusher;
 import com.example.dbstream.entity.User1;
 import com.example.dbstream.listener.MySQLListener;
 import com.example.dbstream.repository.User1Repository;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
 
-import javax.transaction.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 
@@ -26,15 +22,18 @@ class User1RepositoryTest {
     @Autowired
     private User1Repository userRepository;
 
+    @Autowired
+    private EntityManager entityManager;
+
 
     @BeforeEach
     void setUp() {
-        DBStreamContext.getInstance().addEventPusher(new DBEventPusher() {
-            @Override
-            public void push(List<DBEvent> events) {
-                System.out.println(events);
-            }
-        });
+//        DBStreamContext.getInstance().addEventPusher(new DBEventPusher() {
+//            @Override
+//            public void push(List<DBEvent> events) {
+//                System.out.println(events);
+//            }
+//        });
     }
 
     /**
@@ -171,32 +170,19 @@ void test7() {
      */
     @Test
     @Transactional
-    @Rollback(false)
+    @Rollback(value = false)
     void test8() {
-
-        DBStreamContext.getInstance().addListener(new MySQLListener());
-
-        List<User1> list = new ArrayList<>();
-
-
+        entityManager.createQuery("DELETE FROM User1").executeUpdate();
         for (int i=0;i<10;i++){
             User1 user1 = new User1();
             user1.setUsername("admin1");
             user1.setPassword("admin1");
             user1.setEmail("admin1@example.com");
             user1.setNickname("admin1");
-            list.add(user1);
-
-            User1 user2 = new User1();
-            user2.setUsername("admin2");
-            user2.setPassword("admin2");
-            user2.setEmail("admin2@example.com");
-            user2.setNickname("admin2");
-            list.add(user2);
+            entityManager.persist(user1);
         }
-
-        userRepository.saveAll(list);
-
+        entityManager.flush();
+        entityManager.clear();
 
     }
 

src/test/java/com/example/dbstream/tests/User2RepositoryTest.java

@@ -5,12 +5,12 @@
 import com.example.dbstream.entity.User2;
 import com.example.dbstream.listener.MySQLListener;
 import com.example.dbstream.repository.User2Repository;
+import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
 
-import javax.transaction.Transactional;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;