Skip to content

Commit c76cfb7

Browse files
committed
Added version parameter for route validate and generate sql functions
1 parent 8d6c346 commit c76cfb7

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func handler(route *Route) func(http.ResponseWriter, *http.Request, httprouter.P
4545
urlParams[urlParam.Key] = urlParam.Value
4646
}
4747
params, err := getRequestParams(r, urlParams)
48-
sql, err := route.Sql(params)
48+
sql, err := route.Sql(params, 0)
4949
if err != nil && sql != "" {
5050
w.WriteHeader(http.StatusBadRequest)
5151
fmt.Fprint(w, sql)

route.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ type Route struct {
2020
SqlTemplate *template.Template
2121
}
2222

23-
func (self *Route) validate(params map[string]interface{}) (string, error) {
23+
type RouteVersion struct {
24+
Version int
25+
Schema *gojsonschema.Schema
26+
SqlTemplate *template.Template
27+
}
28+
29+
func (self *Route) validate(params map[string]interface{}, version int) (string, error) {
2430
if self.Schema == nil {
2531
return "", nil
2632
}
@@ -43,9 +49,9 @@ func (self *Route) validate(params map[string]interface{}) (string, error) {
4349
return "", nil
4450
}
4551

46-
func (self *Route) Sql(params map[string]interface{}) (string, error) {
52+
func (self *Route) Sql(params map[string]interface{}, version int) (string, error) {
4753
var out bytes.Buffer
48-
response, err := self.validate(params)
54+
response, err := self.validate(params, version)
4955
if err != nil {
5056
return "", err
5157
}

route_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestRouteSql(t *testing.T) {
3434
}
3535
params := make(map[string]interface{})
3636
params["id"] = 23
37-
sql, err := route.Sql(params)
37+
sql, err := route.Sql(params, 0)
3838
if err != nil {
3939
t.Errorf("Expected not to get error, but got: %v", err)
4040
}

0 commit comments

Comments
 (0)