Add clean operand where

Author: bonkzero404

jql.go

@@ -52,6 +52,12 @@ func cleanSpaces(input string) string {
 	return result
 }
 
+func cleanWhereCond(input string) string {
+	re := regexp.MustCompile(`(?i)where\s*and|where or`)
+	cleanedInput := re.ReplaceAllString(input, "WHERE")
+	return cleanedInput
+}
+
 func sanitizeInjection(input string) string {
 	re := regexp.MustCompile(`(?i)[;]|--|drop\s*table|@@\s*version|insert\s*into|if\s*\(|sleep\s*\(|"|\/\*|\*\/|\\0|\\'|\\"|\\b|\\n|\\r|\\t|\\Z|\\\\|\\%|\\_`)
 	cleanedInput := re.ReplaceAllString(input, "")
@@ -239,7 +245,7 @@ func (jql *Json2Sql) GenerateWhere() string {
 	var sql = ""
 
 	if jql.sqlJson.Conditions != nil {
-		sql += " WHERE " + jql.GenerateConditions(*jql.sqlJson.Conditions...)
+		sql += cleanWhereCond(" WHERE " + jql.GenerateConditions(*jql.sqlJson.Conditions...))
 	}
 
 	return sql

jql_test.go

@@ -377,6 +377,35 @@ func TestBetweenWithOperand(t *testing.T) {
 	assert.Equal(t, strings.TrimSpace(strExpected), strings.TrimSpace(str))
 }
 
+func TestWhereIs(t *testing.T) {
+	var sqlTest = `
+		{
+			"conditions": [
+				{
+          "operand": "or",
+					"clause": "a",
+					"datatype": "STRING",
+					"operator": "is not null",
+					"value": null
+				},
+				{
+          "operand": "and",
+					"clause": "b",
+					"datatype": "STRING",
+					"operator": "is null",
+					"value": null
+				}
+			]
+		}
+	`
+
+	strExpected := `WHERE a IS NOT NULL AND b IS NULL`
+	jql, _ := NewJson2Sql([]byte(sqlTest), &Json2SqlConf{})
+	str := jql.GenerateWhere()
+
+	assert.Equal(t, strings.TrimSpace(strExpected), strings.TrimSpace(str))
+}
+
 func TestCompositeWithoutOperand(t *testing.T) {
 	var sqlTest = `
 		{