Merge pull request #172 from erizocosmico/fix/rels-no-inverse-insert

ensure all virtual columns are added in inserts and updates

Author: Miguel Molina

model.go

@@ -79,6 +79,10 @@ func (m *Model) ClearVirtualColumns() {
 	m.virtualColumns = make(map[string]Identifier)
 }
 
+func (m *Model) getVirtualColumns() map[string]Identifier {
+	return m.virtualColumns
+}
+
 // AddVirtualColumn adds a new virtual column with the given name and value.
 // This method is only intended for internal use. It is only exposed for
 // technical reasons.
@@ -164,6 +168,7 @@ type VirtualColumnContainer interface {
 	AddVirtualColumn(string, Identifier)
 	// VirtualColumn returns the virtual column with the given column name.
 	VirtualColumn(string) Identifier
+	getVirtualColumns() map[string]Identifier
 }
 
 // RecordValues returns the values of a record at the given columns in the same

store.go

@@ -158,6 +158,10 @@ func (s *Store) Insert(schema Schema, record Record) error {
 		return err
 	}
 
+	virtualCols, virtualColValues := virtualColumns(record, cols)
+	cols = append(cols, virtualCols...)
+	values = append(values, virtualColValues...)
+
 	builder := s.builder.
 		Insert(schema.Table()).
 		Columns(cols...).
@@ -213,6 +217,10 @@ func (s *Store) Update(schema Schema, record Record, cols ...SchemaField) (int64
 		return 0, err
 	}
 
+	virtualCols, virtualColValues := virtualColumns(record, columnNames)
+	columnNames = append(columnNames, virtualCols...)
+	values = append(values, virtualColValues...)
+
 	var clauses = make(map[string]interface{}, len(cols))
 	for i, col := range columnNames {
 		clauses[col] = values[i]
@@ -418,3 +426,29 @@ type RecordWithSchema struct {
 	Schema Schema
 	Record Record
 }
+
+func virtualColumns(r Record, columns []string) (cols []string, vals []interface{}) {
+	c, ok := r.(VirtualColumnContainer)
+	if !ok {
+		return
+	}
+
+	vcols := c.getVirtualColumns()
+	for col, val := range vcols {
+		if !containsString(columns, col) {
+			cols = append(cols, col)
+			vals = append(vals, val)
+		}
+	}
+
+	return
+}
+
+func containsString(strs []string, str string) bool {
+	for _, s := range strs {
+		if s == str {
+			return true
+		}
+	}
+	return false
+}