Retract previous version with broken and query, fix and query

Author: CADawg

and_query.go

@@ -95,3 +95,7 @@ func (query *AndQuery) Depth() (int, error) {
 	// Remember this is another layer
 	return maxDepth + 1, nil
 }
+
+func (query *AndQuery) GetColumnName() (bool, string) {
+	return false, ""
+}

go.mod

@@ -2,6 +2,9 @@ module github.com/CADawg/GormQueryFromJson
 
 go 1.22
 
+// v0.1.1 had an issue with parsing "and" queries, and so is not recommended
+retract v0.1.1
+
 require (
 	github.com/goccy/go-json v0.10.3
 	gorm.io/gorm v1.25.11
@@ -10,5 +13,5 @@ require (
 require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 )

go.sum

@@ -6,5 +6,7 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg=
 gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=

query.go

@@ -15,6 +15,8 @@ func GetQueryType(id TypeIdentifier) BaseQuery {
 		return &StrictStringQuery{}
 	case TypeOr:
 		return &OrQuery{}
+	case TypeAnd:
+		return &AndQuery{}
 	default:
 		return nil
 	}