Fix select * is not supported for associated query

jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtils.java

@@ -26,6 +26,7 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * Utility class for {@link ShardingSphereResultSet}.
@@ -43,8 +44,28 @@ public final class ShardingSphereResultSetUtils {
      */
     public static Map<String, Integer> createColumnLabelAndIndexMap(final SQLStatementContext sqlStatementContext, final ResultSetMetaData resultSetMetaData) throws SQLException {
         if (sqlStatementContext instanceof SelectStatementContext && ((SelectStatementContext) sqlStatementContext).containsDerivedProjections()) {
-            return ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getColumnLabelAndIndexMap();
+            return createColumnLabelAndIndexMapWithExpandProjections(
+                    ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getColumnLabelAndIndexMap(), resultSetMetaData);
         }
+        return createColumnLabelAndIndexMapFromMetaData(resultSetMetaData);
+    }
+
+    private static Map<String, Integer> createColumnLabelAndIndexMapWithExpandProjections(final Map<String, Integer> expandedMap,
+                                                                                          final ResultSetMetaData resultSetMetaData) throws SQLException {
+        if (null == resultSetMetaData || expandedMap.size() == resultSetMetaData.getColumnCount()) {
+            return expandedMap;
+        }
+        Map<String, Integer> result = new CaseInsensitiveMap<>(resultSetMetaData.getColumnCount(), 1F);
+        for (int columnIndex = resultSetMetaData.getColumnCount(); columnIndex > 0; columnIndex--) {
+            result.put(resultSetMetaData.getColumnLabel(columnIndex), columnIndex);
+        }
+        for (Entry<String, Integer> entry : expandedMap.entrySet()) {
+            result.putIfAbsent(entry.getKey(), entry.getValue());
+        }
+        return result;
+    }
+
+    private static Map<String, Integer> createColumnLabelAndIndexMapFromMetaData(final ResultSetMetaData resultSetMetaData) throws SQLException {
         Map<String, Integer> result = new CaseInsensitiveMap<>(resultSetMetaData.getColumnCount(), 1F);
         for (int columnIndex = resultSetMetaData.getColumnCount(); columnIndex > 0; columnIndex--) {
             result.put(resultSetMetaData.getColumnLabel(columnIndex), columnIndex);

jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilsTest.java

@@ -65,4 +65,21 @@ void assertCreateColumnLabelAndIndexMapWithSelectWithExpandProjections() throws
         Map<String, Integer> actual = ShardingSphereResultSetUtils.createColumnLabelAndIndexMap(selectStatementContext, null);
         assertThat(actual, is(expected));
     }
+
+    @Test
+    void assertCreateColumnLabelAndIndexMapWhenExpandMapSizeMismatchMetaData() throws SQLException {
+        SelectStatementContext selectStatementContext = mock(SelectStatementContext.class);
+        when(selectStatementContext.containsDerivedProjections()).thenReturn(true);
+        List<Projection> projections = new ArrayList<>(1);
+        projections.add(new ColumnProjection(null, "status_new", null, mock(DatabaseType.class)));
+        ProjectionsContext projectionsContext = new ProjectionsContext(0, 0, false, projections);
+        when(selectStatementContext.getProjectionsContext()).thenReturn(projectionsContext);
+        ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class);
+        when(resultSetMetaData.getColumnCount()).thenReturn(2);
+        when(resultSetMetaData.getColumnLabel(1)).thenReturn("order_id");
+        when(resultSetMetaData.getColumnLabel(2)).thenReturn("status_new");
+        Map<String, Integer> actual = ShardingSphereResultSetUtils.createColumnLabelAndIndexMap(selectStatementContext, resultSetMetaData);
+        assertThat(actual.get("order_id"), is(1));
+        assertThat(actual.get("status_new"), is(2));
+    }
 }

test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/GeneralDQLE2EIT.java

@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.test.e2e.sql.it.sql.dql;
 
+import org.apache.shardingsphere.infra.hint.HintManager;
 import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
 import org.apache.shardingsphere.test.e2e.sql.cases.value.SQLValue;
 import org.apache.shardingsphere.test.e2e.sql.framework.SQLE2EITArgumentsProvider;
@@ -39,11 +40,17 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @SQLE2EITSettings(SQLCommandType.DQL)
 class GeneralDQLE2EIT extends BaseDQLE2EIT {
 
+    // HintManager DATA_SOURCE_NAME keeps logic table name (no rewrite);
+    // bare labels from T.* must remain accessible via getObject(columnLabel).
+    private static final String SHORTHAND_ALIAS_SQL =
+            "SELECT T.*, T.status status_new FROM t_order T WHERE T.order_id = 1000";
+
     @ParameterizedTest(name = "{0}")
     @Execution(ExecutionMode.CONCURRENT)
     @EnabledIf("isEnabled")
@@ -258,6 +265,55 @@ private void assertExecuteForPreparedStatement(final SQLE2EITContext context, fi
         }
     }
 
+    @ParameterizedTest(name = "{0}")
+    @Execution(ExecutionMode.SAME_THREAD)
+    @EnabledIf("isEnabled")
+    @ArgumentsSource(HintManagerColumnLabelArgumentsProvider.class)
+    void assertColumnLabelWithHintManager(final AssertionTestParameter testParam) throws SQLException, IOException, JAXBException {
+        SQLE2EITContext context = new SQLE2EITContext(testParam);
+        executeDQL(context, () -> {
+            init(testParam, context);
+            assertDoesNotThrow(() -> executeShorthandAliasQueryWithoutDataSourceHint(),
+                    "Without data-source hint + T.*, T.status status_new should succeed");
+            assertDoesNotThrow(() -> executeShorthandAliasQueryWithDataSourceHint(),
+                    "HintManager.setDataSourceName + SELECT T.*, T.status status_new "
+                            + "should allow getObject by bare column label from T.*");
+        });
+    }
+
+    private void executeShorthandAliasQueryWithoutDataSourceHint() throws SQLException {
+        try (
+                Connection connection = getEnvironmentEngine().getTargetDataSource().getConnection();
+                Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery(SHORTHAND_ALIAS_SQL)) {
+            assertTrue(resultSet.next(), "Expected row for order_id=1000");
+            assertBareColumnLabelsFromShorthandAccessible(resultSet);
+        }
+    }
+
+    private void executeShorthandAliasQueryWithDataSourceHint() throws SQLException {
+        try (
+                HintManager hintManager = HintManager.getInstance();
+                Connection connection = getEnvironmentEngine().getTargetDataSource().getConnection();
+                Statement statement = connection.createStatement()) {
+            hintManager.setDataSourceName("tbl");
+            try (ResultSet resultSet = statement.executeQuery(SHORTHAND_ALIAS_SQL)) {
+                assertTrue(resultSet.next(), "Expected row for order_id=1000 on physical tbl.t_order");
+                assertBareColumnLabelsFromShorthandAccessible(resultSet);
+            }
+        }
+    }
+
+    private void assertBareColumnLabelsFromShorthandAccessible(final ResultSet resultSet) throws SQLException {
+        // Look up bare labels by name (same pattern as MyBatis automatic mapping).
+        // Do not iterate ResultSetMetaData labels: when containsDerivedProjections()=true,
+        // ShardingSphereResultSetMetaData.getColumnLabel() also comes from expandProjections.
+        resultSet.getObject("order_id");
+        resultSet.getObject("user_id");
+        resultSet.getObject("status");
+        resultSet.getObject("status_new");
+    }
+
     private static boolean isEnabled() {
         return E2ETestEnvironment.getInstance().isValid();
     }

test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/sql/dql/HintManagerColumnLabelArgumentsProvider.java

@@ -0,0 +1,64 @@
+/*
+ * 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.test.e2e.sql.it.sql.dql;
+
+import com.google.common.base.Preconditions;
+import org.apache.shardingsphere.test.e2e.sql.framework.param.array.E2ETestParameterFactory;
+import org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLExecuteType;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.support.ParameterDeclarations;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Arguments provider for HintManager column label DQL cases.
+ */
+public final class HintManagerColumnLabelArgumentsProvider implements ArgumentsProvider {
+
+    private static final String JOIN_SHORTHAND_SQL_PREFIX = "SELECT o.user_id, i.* FROM t_order o JOIN t_order_item i";
+
+    @Override
+    public Stream<? extends Arguments> provideArguments(final ParameterDeclarations parameters, final ExtensionContext context) {
+        Collection<AssertionTestParameter> matched = E2ETestParameterFactory.getAssertionTestParameters(SQLCommandType.DQL).stream()
+                .filter(HintManagerColumnLabelArgumentsProvider::isTargetCase)
+                .collect(Collectors.toList());
+        Preconditions.checkState(!matched.isEmpty(),
+                "HintManager column label case not found. Check e2e-dql-select-join.xml contains "
+                        + "`SELECT o.user_id, i.* FROM t_order o JOIN t_order_item i ...` "
+                        + "and e2e-env.properties is tbl + MySQL + jdbc.");
+        return matched.stream().map(Arguments::of);
+    }
+
+    private static boolean isTargetCase(final AssertionTestParameter testParam) {
+        if (null == testParam.getTestCaseContext() || null == testParam.getTestCaseContext().getTestCase().getSql()) {
+            return false;
+        }
+        String sql = testParam.getTestCaseContext().getTestCase().getSql();
+        return sql.contains(JOIN_SHORTHAND_SQL_PREFIX)
+                && "MySQL".equals(testParam.getDatabaseType().getType())
+                && "jdbc".equals(testParam.getAdapter())
+                && "tbl".equals(testParam.getScenario())
+                && SQLExecuteType.PLACEHOLDER == testParam.getSqlExecuteType();
+    }
+}

test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-join.xml

@@ -132,4 +132,10 @@
     <test-case sql="SELECT * FROM t_order o LEFT JOIN t_order_item m ON o.order_id = m.order_id AND o.user_id = m.user_id order by o.order_id, m.item_id" db-types="MySQL" scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
         <assertion expected-data-source-name="read_dataset" />
     </test-case>
+
+    <test-case sql="SELECT o.user_id, i.* FROM t_order o JOIN t_order_item i ON o.order_id = i.order_id WHERE o.order_id = ?"
+               db-types="MySQL,PostgreSQL,openGauss"
+               scenario-types="db,tbl,dbtbl_with_readwrite_splitting">
+        <assertion parameters="1000:int" expected-data-source-name="read_dataset" />
+    </test-case>
 </e2e-test-cases>