Combine column and value sql methods for direct selects

Author: bor3ham

attributes/a_bool.go

@@ -17,12 +17,9 @@ func (b Bool) GetKey() string {
 	return b.Key
 }
 
-func (b Bool) GetSelectDirectColumns() []string {
-	return []string{b.ColumnName}
-}
-func (b Bool) GetSelectDirectVariables() []interface{} {
+func (b Bool) GetSelectDirect() ([]string, []interface{}) {
 	var destination *bool
-	return []interface{}{
+	return []string{b.ColumnName}, []interface{}{
 		&destination,
 	}
 }

attributes/a_date.go

@@ -20,12 +20,9 @@ func (d Date) GetKey() string {
 	return d.Key
 }
 
-func (d Date) GetSelectDirectColumns() []string {
-	return []string{d.ColumnName}
-}
-func (d Date) GetSelectDirectVariables() []interface{} {
+func (d Date) GetSelectDirect() ([]string, []interface{}) {
 	var destination *time.Time
-	return []interface{}{
+	return []string{d.ColumnName}, []interface{}{
 		&destination,
 	}
 }

attributes/a_datetime.go

@@ -18,12 +18,9 @@ func (dt Datetime) GetKey() string {
 	return dt.Key
 }
 
-func (dt Datetime) GetSelectDirectColumns() []string {
-	return []string{dt.ColumnName}
-}
-func (dt Datetime) GetSelectDirectVariables() []interface{} {
+func (dt Datetime) GetSelectDirect() ([]string, []interface{}) {
 	var destination *time.Time
-	return []interface{}{
+	return []string{dt.ColumnName}, []interface{}{
 		&destination,
 	}
 }

attributes/a_decimal.go

@@ -19,12 +19,9 @@ func (d Decimal) GetKey() string {
 	return d.Key
 }
 
-func (d Decimal) GetSelectDirectColumns() []string {
-	return []string{d.ColumnName}
-}
-func (d Decimal) GetSelectDirectVariables() []interface{} {
+func (d Decimal) GetSelectDirect() ([]string, []interface{}) {
 	var destination *decimal.Decimal
-	return []interface{}{
+	return []string{d.ColumnName}, []interface{}{
 		&destination,
 	}
 }

attributes/a_integer.go

@@ -17,12 +17,9 @@ func (i Integer) GetKey() string {
 	return i.Key
 }
 
-func (i Integer) GetSelectDirectColumns() []string {
-	return []string{i.ColumnName}
-}
-func (i Integer) GetSelectDirectVariables() []interface{} {
+func (i Integer) GetSelectDirect() ([]string, []interface{}) {
 	var destination *int
-	return []interface{}{
+	return []string{i.ColumnName}, []interface{}{
 		&destination,
 	}
 }

attributes/a_text.go

@@ -20,12 +20,9 @@ func (t Text) GetKey() string {
 	return t.Key
 }
 
-func (t Text) GetSelectDirectColumns() []string {
-	return []string{t.ColumnName}
-}
-func (t Text) GetSelectDirectVariables() []interface{} {
+func (t Text) GetSelectDirect() ([]string, []interface{}) {
 	var destination *string
-	return []interface{}{
+	return []string{t.ColumnName}, []interface{}{
 		&destination,
 	}
 }

relationships/relationship.go

@@ -103,12 +103,6 @@ func pointerSetFromPage(val interface{}) PointerSet {
 
 type RelationshipStub struct{}
 
-func (stub RelationshipStub) GetSelectDirectColumns() []string {
-	return []string{}
-}
-func (stub RelationshipStub) GetSelectDirectVariables() []interface{} {
-	return []interface{}{}
-}
 func (stub RelationshipStub) GetSelectExtraColumns() []string {
 	return []string{}
 }

schema/attribute.go

@@ -3,8 +3,7 @@ package schema
 type Attribute interface {
 	GetKey() string
 
-	GetSelectDirectColumns() []string
-	GetSelectDirectVariables() []interface{}
+	GetSelectDirect() ([]string, []interface{})
 
 	GetOrderMap() map[string]string
 

schema/model.go

@@ -16,25 +16,15 @@ type Model struct {
 	Manager       Manager
 }
 
-func (m Model) FieldColumns() []string {
-	var columns []string
-	for _, attribute := range m.Attributes {
-		columns = append(columns, attribute.GetSelectDirectColumns()...)
-	}
-	for _, relationship := range m.Relationships {
-		columns = append(columns, relationship.GetSelectDirectColumns()...)
-	}
-	return columns
-}
-func (m Model) FieldVariables() []interface{} {
-	var fields []interface{}
+func (m Model) DirectFields() ([]string, []interface{}) {
+	var allColumns []string
+	var allVars []interface{}
 	for _, attribute := range m.Attributes {
-		fields = append(fields, attribute.GetSelectDirectVariables()...)
+		columns, vars := attribute.GetSelectDirect()
+		allColumns = append(allColumns, columns...)
+		allVars = append(allVars, vars...)
 	}
-	for _, relationship := range m.Relationships {
-		fields = append(fields, relationship.GetSelectDirectVariables()...)
-	}
-	return fields
+	return allColumns, allVars
 }
 
 func (m Model) ExtraColumns() []string {

schema/relationship.go

@@ -4,8 +4,6 @@ type Relationship interface {
 	GetKey() string
 	GetType() string
 
-	GetSelectDirectColumns() []string
-	GetSelectDirectVariables() []interface{}
 	GetSelectExtraColumns() []string
 	GetSelectExtraVariables() []interface{}