Fix broken backward compatibility for gh-1604

Author: kazuki43zoo

src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java

@@ -116,16 +116,11 @@ public BoundSql getBoundSql(Object parameterObject) {
 
   private SqlSource createSqlSource(Object parameterObject) {
     try {
-      int bindParameterCount = providerMethodParameterTypes.length - (providerContext == null ? 0 : 1);
       String sql;
       if (parameterObject instanceof Map) {
-        if (bindParameterCount == 1 && providerMethodParameterTypes[0] == Map.class) {
-          sql = invokeProviderMethod(extractProviderMethodArguments(parameterObject));
-        } else {
-          @SuppressWarnings("unchecked")
-          Map<String, Object> params = (Map<String, Object>) parameterObject;
-          sql = invokeProviderMethod(extractProviderMethodArguments(params, providerMethodArgumentNames));
-        }
+        @SuppressWarnings("unchecked")
+        Map<String, Object> params = (Map<String, Object>) parameterObject;
+        sql = invokeProviderMethod(extractProviderMethodArguments(params, providerMethodArgumentNames, providerMethodParameterTypes));
       } else if (providerMethodParameterTypes.length == 0) {
         sql = invokeProviderMethod();
       } else if (providerMethodParameterTypes.length == 1) {
@@ -170,11 +165,13 @@ private Object[] extractProviderMethodArguments(Object parameterObject) {
     }
   }
 
-  private Object[] extractProviderMethodArguments(Map<String, Object> params, String[] argumentNames) {
+  private Object[] extractProviderMethodArguments(Map<String, Object> params, String[] argumentNames, Class<?>[] argumentTypes) {
     Object[] args = new Object[argumentNames.length];
     for (int i = 0; i < args.length; i++) {
       if (providerContextIndex != null && providerContextIndex == i) {
         args[i] = providerContext;
+      } else if(argumentTypes[i].isAssignableFrom(params.getClass())) {
+        args[i] = params;
       } else {
         args[i] = params.get(argumentNames[i]);
       }

src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java

@@ -32,6 +32,7 @@
 import org.apache.ibatis.annotations.DeleteProvider;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.binding.MapperMethod;
 import org.apache.ibatis.builder.BuilderException;
 import org.apache.ibatis.builder.annotation.ProviderContext;
 import org.apache.ibatis.builder.annotation.ProviderSqlSource;
@@ -619,6 +620,24 @@ void staticMethodOneArgumentAndProviderContext() {
     }
   }
 
+  @Test
+  void mapAndProviderContext() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      StaticMethodSqlProviderMapper mapper =
+        sqlSession.getMapper(StaticMethodSqlProviderMapper.class);
+      assertEquals("mybatis", mapper.mapAndProviderContext("mybatis"));
+    }
+  }
+
+  @Test
+  void providerContextAndMap() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      StaticMethodSqlProviderMapper mapper =
+        sqlSession.getMapper(StaticMethodSqlProviderMapper.class);
+      assertEquals("mybatis", mapper.providerContextAndParamMap("mybatis"));
+    }
+  }
+
   public interface ErrorMapper {
     @SelectProvider(type = ErrorSqlBuilder.class, method = "methodNotFound")
     void methodNotFound();
@@ -716,6 +735,12 @@ public interface StaticMethodSqlProviderMapper {
     @SelectProvider(type = SqlProvider.class, method = "oneArgumentAndProviderContext")
     String oneArgumentAndProviderContext(Integer value);
 
+    @SelectProvider(type = SqlProvider.class, method = "mapAndProviderContext")
+    String mapAndProviderContext(@Param("value") String value);
+
+    @SelectProvider(type = SqlProvider.class, method = "providerContextAndParamMap")
+    String providerContextAndParamMap(@Param("value") String value);
+
     @SuppressWarnings("unused")
     class SqlProvider {
 
@@ -793,6 +818,14 @@ public static String oneArgumentAndProviderContext(Integer value, ProviderContex
             + "' FROM INFORMATION_SCHEMA.SYSTEM_USERS";
       }
 
+      public static String mapAndProviderContext(Map<String, Object> map, ProviderContext context) {
+        return "SELECT '" + map.get("value") + "' FROM INFORMATION_SCHEMA.SYSTEM_USERS";
+      }
+
+      public static String providerContextAndParamMap(ProviderContext context, MapperMethod.ParamMap<Object> map) {
+        return "SELECT '" + map.get("value") + "' FROM INFORMATION_SCHEMA.SYSTEM_USERS";
+      }
+
     }
 
   }