Merge pull request #155 from amorenoz/fix_import

Make enum expansion optional

modelgen/table_test.go

@@ -41,7 +41,7 @@ func TestNewTableTemplate(t *testing.T) {
 
 	test := []struct {
 		name      string
-		extend    func(tmpl *template.Template, data map[string]interface{})
+		extend    func(tmpl *template.Template, data TableTemplateData)
 		expected  string
 		err       bool
 		formatErr bool
@@ -74,13 +74,35 @@ type AtomicTable struct {
 	Protocol  []AtomicTableProtocol ` + "`" + `ovsdb:"protocol"` + "`" + `
 	Str       string                ` + "`" + `ovsdb:"str"` + "`" + `
 }
+`,
+		},
+		{
+			name: "no enums",
+			extend: func(tmpl *template.Template, data TableTemplateData) {
+				data.WithEnumTypes(false)
+			},
+			expected: `// Code generated by "libovsdb.modelgen"
+// DO NOT EDIT.
+
+package test
+
+// AtomicTable defines an object in atomicTable table
+type AtomicTable struct {
+	UUID      string   ` + "`" + `ovsdb:"_uuid"` + "`" + `
+	EventType string   ` + "`" + `ovsdb:"event_type"` + "`" + `
+	Float     float64  ` + "`" + `ovsdb:"float"` + "`" + `
+	Int       int      ` + "`" + `ovsdb:"int"` + "`" + `
+	Protocol  []string ` + "`" + `ovsdb:"protocol"` + "`" + `
+	Str       string   ` + "`" + `ovsdb:"str"` + "`" + `
+}
 `,
 		},
 		{
 			name: "add fields using same data",
-			extend: func(tmpl *template.Template, data map[string]interface{}) {
-				extra := `{{ define "extraFields" }} {{ range index . "Fields" }}	Other{{ .Name }}  {{ .Type }}
-{{end}} {{end}}`
+			extend: func(tmpl *template.Template, data TableTemplateData) {
+				extra := `{{ define "extraFields" }} {{- $tableName := index . "TableName" }} {{ range $field := index . "Fields"  }}	Other{{ FieldName $field.Column }}  {{ FieldType $tableName $field.Column $field.Schema }}
+{{ end }}
+{{- end }}`
 				_, err := tmpl.Parse(extra)
 				if err != nil {
 					panic(err)
@@ -113,17 +135,17 @@ type AtomicTable struct {
 	Str       string                ` + "`" + `ovsdb:"str"` + "`" + `
 
 	OtherUUID      string
-	OtherEventType AtomicTableEventType
+	OtherEventType string
 	OtherFloat     float64
 	OtherInt       int
-	OtherProtocol  []AtomicTableProtocol
+	OtherProtocol  []string
 	OtherStr       string
 }
 `,
 		},
 		{
 			name: "add extra functions using extra data",
-			extend: func(tmpl *template.Template, data map[string]interface{}) {
+			extend: func(tmpl *template.Template, data TableTemplateData) {
 				extra := `{{ define "postStructDefinitions" }}
 func {{ index . "TestName" }} () string {
     return "{{ index . "StructName" }}"
@@ -170,7 +192,7 @@ func TestFunc() string {
 		{
 			name:      "add bad code",
 			formatErr: true,
-			extend: func(tmpl *template.Template, data map[string]interface{}) {
+			extend: func(tmpl *template.Template, data TableTemplateData) {
 				extra := `{{ define "preStructDefinitions" }}
 WRONG FORMAT
 {{ end }}