Merge remote-tracking branch 'origin/master' into 4.2

# Conflicts:
#	hsweb-easy-orm-rdb/src/test/resources/logback.xml

Author: zhou-hao

hsweb-easy-orm-core/src/test/resources/logback.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <logger name="io.netty" level="warn"/>
+    <logger name="io.r2dbc" level="warn"/>
+    <logger name="reactor" level="warn"/>
+    <logger name="com.github" level="warn"/>
+    <logger name="dev.miku" level="warn"/>
+    <logger name="org.testcontainers" level="info"/>
+    <logger name="org.hswebframework" level="debug"/>
+    <logger name="org.hswebframework.ezorm" level="info"/>
+    <logger name="org.apache" level="info"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            　　　　　　　　　
+            <pattern>%-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
+            　　　　　
+        </encoder>
+    </appender>
+
+    <root level="debug">
+        　
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/jdbc/JdbcSqlExecutor.java

@@ -61,6 +61,9 @@ protected int doUpdate(Logger logger, Connection connection, SqlRequest request)
                 }
             }
             return count;
+        }catch (Throwable e) {
+            logger.error("==>      Error: {}", request.toNativeSql(), e);
+            throw e;
         } finally {
             if (null != statement) {
                 releaseStatement(statement);
@@ -96,6 +99,9 @@ protected void doExecute(Logger logger, Connection connection, SqlRequest reques
                     }
                 }
             }
+        } catch (Throwable e) {
+            logger.error("==>      Error: {}", request.toNativeSql(), e);
+            throw e;
         } finally {
             if (null != statement) {
                 releaseStatement(statement);
@@ -151,7 +157,7 @@ protected <T, R> R doSelect(Logger logger,
 
             Disposable disposable = () -> {
                 try {
-                    if(logger.isDebugEnabled()) {
+                    if (logger.isDebugEnabled()) {
                         logger.debug("==>    Cancel: {}", request.toNativeSql());
                     }
                     releaseStatement(statement);
@@ -190,6 +196,9 @@ protected <T, R> R doSelect(Logger logger,
             logger.debug("==>    Results: {}", index);
             releaseResultSet(resultSet);
             return wrapper.getResult();
+        } catch (Throwable e) {
+            logger.error("==>      Error: {}", request.toNativeSql(), e);
+            throw e;
         } finally {
             releaseStatement(statement);
         }

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/mapping/defaults/DefaultRepository.java

@@ -184,11 +184,11 @@ protected InsertResultOperator doInsert(E data) {
 
         return EventResultOperator.create(
             () -> {
-                for (Map.Entry<String, String> entry : mapping.getColumnPropertyMapping().entrySet()) {
-                    String column = entry.getKey();
-                    String property = entry.getValue();
-                    insert.value(column, getInsertColumnValue(data, property));
-                }
+                insert.columns(getProperties());
+                insert.values(Stream
+                                  .of(getProperties())
+                                  .map(property -> getInsertColumnValue(data, property))
+                                  .toArray());
                 return insert.execute();
             },
             InsertResultOperator.class,

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/mapping/defaults/DefaultSyncRepository.java

@@ -86,7 +86,7 @@ public void insert(E data) {
 
     @Override
     public int insertBatch(Collection<E> batch) {
-        if (batch.size() == 0) {
+        if (batch.isEmpty()) {
             return 0;
         }
         return doInsert(batch).sync();

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/metadata/AbstractTableOrViewMetadata.java

@@ -130,6 +130,10 @@ public void removeColumn(String name) {
         if (metadata != null) {
             allColumns.remove(metadata.getAlias());
         }
+        metadata = allColumns.remove(name.toUpperCase());
+        if (metadata != null) {
+            allColumns.remove(metadata.getAlias());
+        }
     }
 
     @Override
@@ -142,6 +146,9 @@ public RDBSchemaMetadata getSchema() {
     public void addColumn(RDBColumnMetadata column) {
         columnCache = null;
         column.setOwner(this);
+        if (getDialect().isColumnToUpperCase()) {
+            allColumns.put(column.getName().toUpperCase(), column);
+        }
         allColumns.put(column.getName(), column);
         allColumns.put(column.getAlias(), column);
         allColumns.put(column.getRealName(), column);
@@ -196,7 +203,7 @@ public Optional<RDBColumnMetadata> findColumn(String name) {
         }
         Optional<RDBColumnMetadata> col = this.getColumn(name);
 
-        if(col.isPresent()){
+        if (col.isPresent()) {
             return col;
         }
 
@@ -210,7 +217,7 @@ private Optional<RDBColumnMetadata> findNestColumn(String name) {
         }
 
         if (name.contains(".")) {
-            String[] arr = StringUtils.getPlainName(StringUtils.split(name,'.'));
+            String[] arr = StringUtils.getPlainName(StringUtils.split(name, '.'));
             if (arr.length == 2) {  //table.name
                 return findColumnFromSchema(schema, arr[0], arr[1]);
 
@@ -241,11 +248,11 @@ private Optional<RDBColumnMetadata> findColumnFromSchema(RDBSchemaMetadata schem
         Optional<RDBColumnMetadata> col =
             schema.getTableOrView(tableName)
                   .flatMap(meta -> meta.getColumn(column));
-        if(col.isPresent()){
+        if (col.isPresent()) {
             return col;
         }
         return getForeignKey(tableName) //查找外键关联信息
-                                 .flatMap(key -> key.getTarget().getColumn(column));
+                                        .flatMap(key -> key.getTarget().getColumn(column));
 
     }
 

hsweb-easy-orm-rdb/src/test/resources/logback.xml

@@ -4,12 +4,11 @@
     <logger name="io.r2dbc" level="warn"/>
     <logger name="reactor" level="warn"/>
     <logger name="com.github" level="warn"/>
-    <logger name="dev.miku" level="warn"/>
+    <logger name="io.asyncer" level="warn"/>
     <logger name="org.testcontainers" level="info"/>
     <logger name="org.hswebframework" level="debug"/>
-    <logger name="org.hswebframework.ezorm" level="info"/>
-    <logger name="org.apache.commons" level="warn"/>
-    <logger name="io.asyncer" level="warn"/>
+    <logger name="org.hswebframework.ezorm" level="debug"/>
+    <logger name="org.apache" level="info"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

pom.xml

@@ -256,7 +256,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.14.0</version>
+                <version>3.18.0</version>
             </dependency>
 
 <!--            <dependency>-->