This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new da35ce48195 Fix insert statement assert exception with encrypt feature
(#28410)
da35ce48195 is described below
commit da35ce481958250bb6297eb1a67793c720100170
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Mon Sep 11 17:22:11 2023 +0800
Fix insert statement assert exception with encrypt feature (#28410)
* Fix insert statement assert exception with encrypt feature
* Fix insert statement assert exception with encrypt feature
---
.../shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java | 6 +++++-
.../e2e/sql/src/test/resources/cases/dml/dml-integration-insert.xml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
index 6473263866c..c1dc45a7633 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
@@ -148,7 +148,11 @@ public abstract class BaseDMLE2EIT {
} else if (Arrays.asList(Types.TIME,
Types.TIME_WITH_TIMEZONE).contains(actual.getMetaData().getColumnType(columnIndex)))
{
assertThat(timeFormatter.format(actual.getTime(columnIndex).toLocalTime()),
is(expected));
} else if (Arrays.asList(Types.TIMESTAMP,
Types.TIMESTAMP_WITH_TIMEZONE).contains(actual.getMetaData().getColumnType(columnIndex)))
{
-
assertThat(timestampFormatter.format(actual.getTimestamp(columnIndex).toLocalDateTime()),
is(expected));
+ if ("Oracle".equals(testParam.getDatabaseType().getType()) &&
"DATE".equalsIgnoreCase(actual.getMetaData().getColumnTypeName(columnIndex))) {
+
assertThat(dateFormatter.format(actual.getDate(columnIndex).toLocalDate()),
is(expected));
+ } else {
+
assertThat(timestampFormatter.format(actual.getTimestamp(columnIndex).toLocalDateTime()),
is(expected));
+ }
} else if (Types.CHAR ==
actual.getMetaData().getColumnType(columnIndex)
&& ("PostgreSQL".equals(testParam.getDatabaseType().getType())
|| "openGauss".equals(testParam.getDatabaseType().getType())
||
"Oracle".equals(testParam.getDatabaseType().getType()))) {
diff --git
a/test/e2e/sql/src/test/resources/cases/dml/dml-integration-insert.xml
b/test/e2e/sql/src/test/resources/cases/dml/dml-integration-insert.xml
index 43fb4afcbc1..a922c24f819 100644
--- a/test/e2e/sql/src/test/resources/cases/dml/dml-integration-insert.xml
+++ b/test/e2e/sql/src/test/resources/cases/dml/dml-integration-insert.xml
@@ -145,7 +145,7 @@
<assertion parameters="5000:int, 6000:int"
expected-data-file="batch_insert_without_auto_generate_key_column.xml"
expected-generated-key-data-file="batch_insert_without_auto_generate_key_column_generated_key_data.xml"
/>
</test-case>
- <test-case sql="INSERT INTO t_user (user_id, user_name, password, email,
telephone, creation_date) VALUES (?, ?, '123456', '[email protected]',
'12341234123', '2018-08-08'), (?, ?, '23456', '[email protected]', '23452345456',
'2019-08-08')" scenario-types="encrypt">
+ <test-case sql="INSERT INTO t_user (user_id, user_name, password, email,
telephone, creation_date) VALUES (?, ?, '123456', '[email protected]',
'12341234123', '2018-08-08'), (?, ?, '23456', '[email protected]', '23452345456',
'2019-08-08')" scenario-types="encrypt" db-types="MySQL,PostgreSQL,openGauss">
<assertion parameters="40:int, tomas:String, 41:int, mike:String"
expected-data-file="batch_insert_into_user_table.xml" />
</test-case>
