Merge pull request #31 from viant/handler_gen

work in progress - abstracted out plugin info/artifact
viant · Jun 23, 2023 · b368b33 · b368b33
2 parents 0305678 + 3e20750
commit b368b33
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/cmd/datly/datly.go b/cmd/datly/datly.go
@@ -42,6 +42,25 @@ func main() {
 			log.Fatal(err)
 		}
 	}()
+
+	os.Args = []string{
+		"",
+		"gen",
+		"-o=patch",
+		"-g=campaign",
+		"-p=/Users/awitas/go/src/github.com/viant/datly/poc",
+		"-s=/Users/awitas/go/src/github.com/viant/datly/poc/dsql/campaign/init/campaign_patch.sql",
+		"-c=ci_ads|mysql|root:dev@tcp(127.0.0.1:3306)/ci_ads?parseTime=true",
+
+		/*
+			"",
+			"dsql",
+			"-p=/Users/awitas/go/src/github.com/viant/datly/poc",
+			"-s=/Users/awitas/go/src/github.com/viant/datly/poc/dsql/campaign/campaign_patch.sql",
+			"-c=ci_ads|mysql|root:dev@tcp(127.0.0.1:3306)/ci_ads?parseTime=true",
+		*/
+
+	}
 	server, err := cmd.New(Version, os.Args[1:], &ConsoleWriter{})
 	if err != nil {
 		log.Fatal(err)

diff --git a/internal/codegen/spec.go b/internal/codegen/spec.go
@@ -257,10 +257,17 @@ func NewSpec(ctx context.Context, db *sql.DB, table, SQL string) (*Spec, error)
 }
 
 func isAuxiliary(SQL string) bool {
-	SQL = strings.Trim(strings.TrimSpace(SQL), "()")
+	SQL = strings.TrimSpace(SQL)
+
 	if SQL == "" {
 		return false
 	}
+	if SQL[0] == '(' {
+		SQL = SQL[1:]
+	}
+	if SQL[len(SQL)-1] == '(' {
+		SQL = SQL[:len(SQL)-2]
+	}
 	query, _ := sqlparser.ParseQuery(SQL)
 	if query == nil {
 		return true

diff --git a/internal/codegen/tag.go b/internal/codegen/tag.go
@@ -93,6 +93,9 @@ func (t *Tags) buildRelation(info *Spec, relation *Relation) {
 	if join == nil {
 		return
 	}
+	if relation.KeyField == nil {
+		return
+	}
 	datlyTag := TagValue{}
 	datlyTag.Append(fmt.Sprintf("ralName=%s", join.Alias))
 	datlyTag.Append(fmt.Sprintf("relColumn=%s", relation.ParentField.Column.Name))

diff --git a/internal/codegen/template.go b/internal/codegen/template.go
@@ -155,7 +155,7 @@ func (t *Template) modifyRecords(options *Options, structPathPrefix string, spec
 		recordPath := t.RecordName(spec.Type.Name)
 		forEach := ast.NewForEach(ast.NewIdent(recordPath), ast.NewIdent(structPath), ast.Block{})
 
-		if rel != nil {
+		if rel != nil && rel.KeyField != nil {
 			parentSelector := structPathPrefix + "." + rel.ParentField.Name
 			holder := recordPath + "." + rel.KeyField.Name
 			assignKey := ast.NewAssign(ast.NewIdent(holder), ast.NewIdent(parentSelector))