Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Added type static hierarchy to allow compatible types (#15470)

Browse Source 
* fix: Added type static hierarchy to allow compatible types

* Removed unnecessary logging
This commit is contained in:
Nidhi 2022-07-29 08:43:23 +05:30 committed by GitHub
parent ed90490005
commit 82ed999d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/server/appsmith-interfaces/src/main/java/com/appsmith/external/services/ce/FilterDataServiceCE.java vendored
View File

@ -78,6 +78,17 @@ public class FilterDataServiceCE implements IFilterDataServiceCE {
ConditionalOperator.NOT_IN, "NOT IN"
);
private static final Map<DataType, Set<DataType>> datatypeCompatibilityMap = Map.of(
DataType.INTEGER, Set.of(),
DataType.LONG, Set.of(DataType.INTEGER),
DataType.FLOAT, Set.of(DataType.INTEGER, DataType.LONG),
DataType.DOUBLE, Set.of(DataType.INTEGER, DataType.LONG, DataType.FLOAT),
DataType.BOOLEAN, Set.of(),
DataType.STRING, Set.of(DataType.INTEGER, DataType.LONG, DataType.FLOAT, DataType.DOUBLE, DataType.BOOLEAN, DataType.DATE, DataType.TIME, DataType.TIMESTAMP),
DataType.DATE, Set.of(),
DataType.TIMESTAMP, Set.of()
);
public FilterDataServiceCE() {
objectMapper = new ObjectMapper();
@ -119,7 +130,7 @@ public class FilterDataServiceCE implements IFilterDataServiceCE {
insertAllData(tableName, items, schema, dataTypeConversionMap);
// Filter the data
List<Map<String, Object>> finalResults = executeFilterQueryNew(tableName, schema, uqiDataFilterParams);
List<Map<String, Object>> finalResults = executeFilterQueryNew(tableName, schema, uqiDataFilterParams, dataTypeConversionMap);
// Now that the data has been filtered. Clean Up. Drop the table
dropTable(tableName);
@ -130,7 +141,8 @@ public class FilterDataServiceCE implements IFilterDataServiceCE {
}
private List<Map<String, Object>> executeFilterQueryNew(String tableName, Map<String, DataType> schema,
UQIDataFilterParams uqiDataFilterParams) {
UQIDataFilterParams uqiDataFilterParams,
Map<DataType, DataType> dataTypeConversionMap) {
Condition condition = uqiDataFilterParams.getCondition();
List<String> projectionColumns = uqiDataFilterParams.getProjectionColumns();
@ -187,7 +199,7 @@ public class FilterDataServiceCE implements IFilterDataServiceCE {
PreparedStatementValueDTO dataInfo = iterator.next();
String value = dataInfo.getValue();
DataType dataType = dataInfo.getDataType();
setValueInStatement(preparedStatement, i + 1, value, dataType);
setValueInStatement(preparedStatement, i + 1, value, dataType, null);
}
ResultSet resultSet = preparedStatement.executeQuery();
@ -659,8 +671,7 @@ public class FilterDataServiceCE implements IFilterDataServiceCE {
dataType = DataType.NULL;
}
//We are setting incompatible datatypes of each row to Null, rather allowing it and exit with error.
if (dataTypeConversionMap != null && inputDataType != dataType) {
log.debug("DataType Error : [" + inputDataType + "] " + value + " is not of type " + dataType + " which is the datatype of the column, hence ignored in filter.");
if (dataTypeConversionMap != null && inputDataType != dataType && !datatypeCompatibilityMap.getOrDefault(dataType, Set.of()).contains(inputDataType)) {
dataType = DataType.NULL;
}
}

8
app/server/appsmith-interfaces/src/test/java/com/appsmith/external/services/FilterDataServiceTest.java vendored
View File

@ -734,7 +734,7 @@ public class FilterDataServiceTest {
" \"email id\": \"michael.lawson@reqres.in\",\n" +
" \"userName\": \"Michael Lawson\",\n" +
" \"productName\": \"Chicken Sandwich\",\n" +
" \"orderAmount\": 4.99,\n" +
" \"orderAmount\": \"USD 4.99\",\n" +
" \"date\": \"2021-09-01\"\n" +
" },\n" +
" {\n" +
@ -770,9 +770,11 @@ public class FilterDataServiceTest {
Condition condition = parseWhereClause(unparsedWhereClause);
ArrayNode filteredData = filterDataService.filterDataNew(items, new UQIDataFilterParams(condition, null,
null, null));
null, null), new HashMap<>());
assertEquals(filteredData.size(), 3);
assertEquals(3, filteredData.size());
assertEquals("USD 4.99", filteredData.get(0).get("orderAmount").asText());
assertEquals("9.99", filteredData.get(1).get("orderAmount").asText());
} catch (IOException e) {
e.printStackTrace();