admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-09-10 18:02:50 +00:00
parent d0b5bf8ceb
commit 1efa1a147b
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -52,7 +52,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

31
server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -151,7 +151,7 @@ namespace AyaNova.DataList
bool ForceToLower = false; bool ForceToLower = false;
//Force to LOWER case if it's a text data type and filter case sensitive is false //Force to LOWER case if it's a text data type and filter case sensitive is false
if (ServerGlobalBizSettings.Cache.FilterCaseSensitive) if (!ServerGlobalBizSettings.Cache.FilterCaseSensitive)
{ {
switch (DataType) switch (DataType)
{ {
@@ -169,27 +169,16 @@ namespace AyaNova.DataList
//Handle nulls and also insert the column name into the query in case sensitive fashion //Handle nulls and also insert the column name into the query in case sensitive fashion
switch (sOperator) switch (sOperator)
{ {
case DataListFilterComparisonOperator.Equality: //case DataListFilterComparisonOperator.Equality: //no specific addition on equals for nulls, let default handle it
//no specific addition on equals for nulls, just column name for below //case DataListFilterComparisonOperator.GreaterThan:
if (ForceToLower)
sb.Append($"lower('{SqlColumnNameToFilter}') ");
else
sb.Append($"{SqlColumnNameToFilter} ");
break;
case DataListFilterComparisonOperator.GreaterThan:
//no specific addition on greater than for nulls //no specific addition on greater than for nulls
//(nulls are going to be assumed to be always at the //(nulls are going to be assumed to be always at the
//less than end of the scale) so just include column name //less than end of the scale) so let default handle it
break; //case DataListFilterComparisonOperator.GreaterThanOrEqualTo:
case DataListFilterComparisonOperator.GreaterThanOrEqualTo:
//no change on greater than for nulls //no change on greater than for nulls
//(nulls are going to be assumed to be always at the //(nulls are going to be assumed to be always at the
//less than end of the scale) //less than end of the scale) let default case handle it
if (ForceToLower)
sb.Append($"lower('{SqlColumnNameToFilter}') ");
else
sb.Append($"{SqlColumnNameToFilter} ");
break;
case DataListFilterComparisonOperator.LessThan: case DataListFilterComparisonOperator.LessThan:
sb.Append($"{SqlColumnNameToFilter} "); sb.Append($"{SqlColumnNameToFilter} ");
sb.Append("Is Null OR "); sb.Append("Is Null OR ");
@@ -218,6 +207,12 @@ namespace AyaNova.DataList
sb.Append(SqlColumnNameToFilter); sb.Append(SqlColumnNameToFilter);
sb.Append(" "); sb.Append(" ");
break; break;
default:
if (ForceToLower)
sb.Append($"lower('{SqlColumnNameToFilter}') ");
else
sb.Append($"{SqlColumnNameToFilter} ");
break;
} }