You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2026/08/27 10:22:19 UTC

(shardingsphere) branch master updated: Use database default schema in encrypt duplicate-key rewriter (#39602)

This is an automated email from the ASF dual-hosted git repository.

menghaoranss 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 d67a25dd983 Use database default schema in encrypt duplicate-key rewriter (#39602)
d67a25dd983 is described below

commit d67a25dd98361c26d3f2526341eaa46e6e96d2d5
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Thu Aug 27 18:22:10 2026 +0800

    Use database default schema in encrypt duplicate-key rewriter (#39602)
    
    * Use database default schema in encrypt duplicate-key rewriter
    
    * Use database default schema in encrypt duplicate-key rewriter
---
 .../EncryptParameterRewritersRegistry.java         |  2 +-
 ...OnDuplicateKeyUpdateValueParameterRewriter.java | 12 +--
 ...plicateKeyUpdateValueParameterRewriterTest.java | 88 ++++++++++++++++++++++
 3 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
index 5d4b299b9a0..122fc71e6e7 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
@@ -52,6 +52,6 @@ public final class EncryptParameterRewritersRegistry implements ParameterRewrite
                 new EncryptPredicateParameterRewriter(rule, encryptConditions),
                 new EncryptInsertPredicateParameterRewriter(rule, encryptConditions),
                 new EncryptInsertValueParameterRewriter(rule, databaseName),
-                new EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter(rule, databaseName));
+                new EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter(rule, sqlRewriteContext.getDatabase()));
     }
 }
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
index fa1a4016553..d3002a7353b 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
@@ -18,12 +18,12 @@
 package org.apache.shardingsphere.encrypt.rewrite.parameter.rewriter;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
 import org.apache.shardingsphere.infra.binder.context.segment.insert.values.OnDuplicateUpdateContext;
 import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
 import org.apache.shardingsphere.infra.binder.context.statement.type.dml.InsertStatementContext;
+import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.rewrite.parameter.builder.ParameterBuilder;
 import org.apache.shardingsphere.infra.rewrite.parameter.builder.impl.GroupedParameterBuilder;
 import org.apache.shardingsphere.infra.rewrite.parameter.builder.impl.StandardParameterBuilder;
@@ -43,7 +43,7 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
     
     private final EncryptRule rule;
     
-    private final String databaseName;
+    private final ShardingSphereDatabase database;
     
     @Override
     public boolean isNeedRewrite(final SQLStatementContext sqlStatementContext) {
@@ -60,7 +60,7 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
                 : ((GroupedParameterBuilder) paramBuilder).getAfterGenericParameterBuilder();
         OnDuplicateUpdateContext onDuplicateKeyUpdateValueContext = insertStatementContext.getOnDuplicateKeyUpdateValueContext();
         String schemaName = insertStatementContext.getTablesContext().getSchemaName()
-                .orElseGet(() -> new DatabaseTypeRegistry(insertStatementContext.getSqlStatement().getDatabaseType()).getDefaultSchemaName(databaseName));
+                .orElseGet(database::getDefaultSchemaName);
         int onDuplicateKeyParameterMarkerIndex = 0;
         for (int index = 0; index < onDuplicateKeyUpdateValueContext.getValueExpressions().size(); index++) {
             String logicColumnName = onDuplicateKeyUpdateValueContext.getColumn(index).getIdentifier().getValue();
@@ -74,7 +74,7 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
             }
             int parameterIndex = getParameterMarkerIndex(paramBuilder, (ParameterMarkerExpressionSegment) valueExpression, onDuplicateKeyParameterMarkerIndex++);
             Object plainValue = onDuplicateKeyUpdateValueContext.getValue(index);
-            Object cipherColumnValue = encryptColumn.getCipher().encrypt(databaseName, schemaName, tableName, logicColumnName, plainValue);
+            Object cipherColumnValue = encryptColumn.getCipher().encrypt(database.getName(), schemaName, tableName, logicColumnName, plainValue);
             standardParamBuilder.addReplacedParameters(parameterIndex, cipherColumnValue);
             Collection<Object> addedParams = buildAddedParams(schemaName, tableName, encryptColumn, logicColumnName, plainValue);
             if (!addedParams.isEmpty()) {
@@ -93,10 +93,10 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
     private Collection<Object> buildAddedParams(final String schemaName, final String tableName, final EncryptColumn encryptColumn, final String logicColumnName, final Object plainValue) {
         Collection<Object> result = new LinkedList<>();
         if (encryptColumn.getAssistedQuery().isPresent()) {
-            result.add(encryptColumn.getAssistedQuery().get().encrypt(databaseName, schemaName, tableName, logicColumnName, plainValue));
+            result.add(encryptColumn.getAssistedQuery().get().encrypt(database.getName(), schemaName, tableName, logicColumnName, plainValue));
         }
         if (encryptColumn.getLikeQuery().isPresent()) {
-            result.add(encryptColumn.getLikeQuery().get().encrypt(databaseName, schemaName, tableName, logicColumnName, plainValue));
+            result.add(encryptColumn.getLikeQuery().get().encrypt(database.getName(), schemaName, tableName, logicColumnName, plainValue));
         }
         return result;
     }
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriterTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriterTest.java
new file mode 100644
index 00000000000..78e9909c879
--- /dev/null
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriterTest.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.encrypt.rewrite.parameter.rewriter;
+
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import org.apache.shardingsphere.encrypt.rule.EncryptRule;
+import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
+import org.apache.shardingsphere.encrypt.rule.column.item.CipherColumnItem;
+import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
+import org.apache.shardingsphere.infra.binder.context.segment.insert.values.OnDuplicateUpdateContext;
+import org.apache.shardingsphere.infra.binder.context.statement.type.dml.InsertStatementContext;
+import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
+import org.apache.shardingsphere.infra.rewrite.parameter.builder.impl.StandardParameterBuilder;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.InsertStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.Optional;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriterTest {
+    
+    @Test
+    void assertRewriteWithDefaultSchema() {
+        ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
+        when(database.getName()).thenReturn("foo_db");
+        when(database.getDefaultSchemaName()).thenReturn("foo_default_schema");
+        CipherColumnItem cipherColumnItem = mock(CipherColumnItem.class);
+        when(cipherColumnItem.encrypt("foo_db", "foo_default_schema", "foo_table", "foo_column", "foo_value")).thenReturn("foo_cipher_value");
+        EncryptRule rule = mockEncryptRule(cipherColumnItem);
+        StandardParameterBuilder paramBuilder = new StandardParameterBuilder(Collections.singletonList("foo_value"));
+        new EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter(rule, database)
+                .rewrite(paramBuilder, createSQLStatementContext(), Collections.singletonList("foo_value"));
+        assertThat(paramBuilder.getParameters(), is(Collections.singletonList("foo_cipher_value")));
+    }
+    
+    private EncryptRule mockEncryptRule(final CipherColumnItem cipherColumnItem) {
+        EncryptColumn encryptColumn = new EncryptColumn("foo_column", cipherColumnItem);
+        EncryptTable encryptTable = mock(EncryptTable.class);
+        when(encryptTable.isEncryptColumn("foo_column")).thenReturn(true);
+        when(encryptTable.getEncryptColumn("foo_column")).thenReturn(encryptColumn);
+        EncryptRule result = mock(EncryptRule.class);
+        when(result.findEncryptTable("foo_table")).thenReturn(Optional.of(encryptTable));
+        when(result.getEncryptTable("foo_table")).thenReturn(encryptTable);
+        return result;
+    }
+    
+    private InsertStatementContext createSQLStatementContext() {
+        DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
+        InsertStatement insertStatement = InsertStatement.builder().databaseType(databaseType)
+                .table(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_table")))).build();
+        InsertStatementContext result = mock(InsertStatementContext.class, RETURNS_DEEP_STUBS);
+        when(result.getSqlStatement()).thenReturn(insertStatement);
+        when(result.getTablesContext().getSchemaName()).thenReturn(Optional.empty());
+        OnDuplicateUpdateContext onDuplicateUpdateContext = mock(OnDuplicateUpdateContext.class);
+        when(onDuplicateUpdateContext.getValueExpressions()).thenReturn(Collections.singletonList(new ParameterMarkerExpressionSegment(0, 0, 0)));
+        when(onDuplicateUpdateContext.getColumn(0)).thenReturn(new ColumnSegment(0, 0, new IdentifierValue("foo_column")));
+        when(onDuplicateUpdateContext.getValue(0)).thenReturn("foo_value");
+        when(result.getOnDuplicateKeyUpdateValueContext()).thenReturn(onDuplicateUpdateContext);
+        return result;
+    }
+}