#92 : Delete FilterCondition specification in if-condition

Author: s-takeuchi

src/restapi/DbMariaDbAccessor.cpp

@@ -46,7 +46,7 @@ int DbMariaDbAccessor::GetNumOfRecords(wchar_t* TableName, FilteringCondition* F
 	while (CurFilCond) {
 		SqlEncoding(CurFilCond->GetColumnName(), ColumnNameCnv[Loop], TYPE_KEY);
 		OpeType[Loop] = CurFilCond->GetOpeType();
-		if (FilterSwitch && (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11)) {
+		if (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11) {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_LIKE_VALUE);
 		} else {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_VALUE);
@@ -226,7 +226,7 @@ int DbMariaDbAccessor::GetRecordsByTableName(wchar_t* TableName, FilteringCondit
 	while (CurFilCond) {
 		SqlEncoding(CurFilCond->GetColumnName(), ColumnNameCnv[Loop], TYPE_KEY);
 		OpeType[Loop] = CurFilCond->GetOpeType();
-		if (FilterSwitch && (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11)) {
+		if (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11) {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_LIKE_VALUE);
 		} else {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_VALUE);

src/restapi/DbMySqlAccessor.cpp

@@ -46,7 +46,7 @@ int DbMySqlAccessor::GetNumOfRecords(wchar_t* TableName, FilteringCondition* Fil
 	while (CurFilCond) {
 		SqlEncoding(CurFilCond->GetColumnName(), ColumnNameCnv[Loop], TYPE_KEY);
 		OpeType[Loop] = CurFilCond->GetOpeType();
-		if (FilterSwitch && (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11)) {
+		if (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11) {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_LIKE_VALUE);
 		} else {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_VALUE);
@@ -216,7 +216,7 @@ int DbMySqlAccessor::GetRecordsByTableName(wchar_t* TableName, FilteringConditio
 	while (CurFilCond) {
 		SqlEncoding(CurFilCond->GetColumnName(), ColumnNameCnv[Loop], TYPE_KEY);
 		OpeType[Loop] = CurFilCond->GetOpeType();
-		if (FilterSwitch && (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11)) {
+		if (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11) {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_LIKE_VALUE);
 		} else {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_VALUE);

src/restapi/DbPostgreSqlAccessor.cpp

@@ -46,7 +46,7 @@ int DbPostgreSqlAccessor::GetNumOfRecords(wchar_t* TableName, FilteringCondition
 	while (CurFilCond) {
 		SqlEncoding(CurFilCond->GetColumnName(), ColumnNameCnv[Loop], TYPE_KEY);
 		OpeType[Loop] = CurFilCond->GetOpeType();
-		if (FilterSwitch && (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11)) {
+		if (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11) {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_LIKE_VALUE);
 		} else {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_VALUE);
@@ -225,7 +225,7 @@ int DbPostgreSqlAccessor::GetRecordsByTableName(wchar_t* TableName, FilteringCon
 	while (CurFilCond) {
 		SqlEncoding(CurFilCond->GetColumnName(), ColumnNameCnv[Loop], TYPE_KEY);
 		OpeType[Loop] = CurFilCond->GetOpeType();
-		if (FilterSwitch && (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11)) {
+		if (CurFilCond->GetOpeType() == 10 || CurFilCond->GetOpeType() == 11) {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_LIKE_VALUE);
 		} else {
 			SqlEncoding(CurFilCond->GetColumnVal(), ValueCnv[Loop], TYPE_VALUE);