Fix the version comparison query SQL. (#12858)

Fix the version comparison query SQL.
alibaba · Nov 18, 2024 · aeaaded · aeaaded
1 parent fb68b7e
commit aeaaded
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...rce/src/main/java/com/alibaba/nacos/plugin/datasource/mapper/HistoryConfigInfoMapper.java b/...rce/src/main/java/com/alibaba/nacos/plugin/datasource/mapper/HistoryConfigInfoMapper.java
@@ -107,8 +107,8 @@ default MapperResult findConfigHistoryFetchRows(MapperContext context) {
      */
     default MapperResult detailPreviousConfigHistory(MapperContext context) {
         return new MapperResult(
-                "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,gmt_modified,encrypted_data_key "
-                        + "FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)",
+                "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,publish_type,ext_info,gmt_create"
+                        + ",gmt_modified,encrypted_data_key FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)",
                 Collections.singletonList(context.getWhereParameter(FieldConstant.ID)));
     }
 

diff --git a/...va/com/alibaba/nacos/plugin/datasource/impl/derby/HistoryConfigInfoMapperByDerbyTest.java b/...va/com/alibaba/nacos/plugin/datasource/impl/derby/HistoryConfigInfoMapperByDerbyTest.java
@@ -109,8 +109,9 @@ void testDetailPreviousConfigHistory() {
         Object id = "1";
         context.putWhereParameter(FieldConstant.ID, id);
         MapperResult mapperResult = historyConfigInfoMapperByDerby.detailPreviousConfigHistory(context);
-        assertEquals(mapperResult.getSql(), "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,"
-                + "gmt_modified,encrypted_data_key FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)");
+        assertEquals(mapperResult.getSql(), "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,publish_type"
+                + ",ext_info,gmt_create,gmt_modified,encrypted_data_key "
+                + "FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)");
         assertArrayEquals(new Object[] {id}, mapperResult.getParamList().toArray());
     }
 

diff --git a/...va/com/alibaba/nacos/plugin/datasource/impl/mysql/HistoryConfigInfoMapperByMySqlTest.java b/...va/com/alibaba/nacos/plugin/datasource/impl/mysql/HistoryConfigInfoMapperByMySqlTest.java
@@ -107,8 +107,9 @@ void testDetailPreviousConfigHistory() {
         Object id = "1";
         context.putWhereParameter(FieldConstant.ID, id);
         MapperResult mapperResult = historyConfigInfoMapperByMySql.detailPreviousConfigHistory(context);
-        assertEquals(mapperResult.getSql(), "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,"
-                + "gmt_modified,encrypted_data_key FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)");
+        assertEquals(mapperResult.getSql(), "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,publish_type"
+                + ",ext_info,gmt_create,gmt_modified,encrypted_data_key "
+                + "FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)");
         assertArrayEquals(new Object[] {id}, mapperResult.getParamList().toArray());
     }