Fix KeyColumn require and operators properties not being set to defau…

…lt if a TableMapFunc is used. Closes #206

plugin/key_column.go

@@ -61,7 +61,6 @@ func (k *KeyColumn) Validate() []string {
 	// first set default operator and convert "!=" to "<>"
 	k.InitialiseOperators()
 	// ensure operators are valid
-
 	validOperators := []string{"=", "<>", "<", "<=", ">", ">="}
 	validRequire := []string{Required, Optional, AnyOf}
 	var res []string

plugin/plugin.go

@@ -105,11 +105,6 @@ func (p *Plugin) SetConnectionConfig(connectionName, connectionConfigString stri
 		}
 	}()
 
-	// first validate the plugin
-	if validationErrors := p.Validate(); validationErrors != "" {
-		return fmt.Errorf("plugin %s validation failed: \n%s", p.Name, validationErrors)
-	}
-
 	// create connection object
 	p.Connection = &Connection{Name: connectionName}
 
@@ -154,6 +149,12 @@ func (p *Plugin) initialiseTables(ctx context.Context) (err error) {
 	for _, table := range p.TableMap {
 		table.Plugin = p
 	}
+	// now validate the plugin
+	// NOTE: must do this after calling TableMapFunc
+	if validationErrors := p.Validate(); validationErrors != "" {
+		return fmt.Errorf("plugin %s validation failed: \n%s", p.Name, validationErrors)
+	}
+
 	return nil
 }
 

plugin/table_schema.go

@@ -26,7 +26,6 @@ func (t Table) GetSchema() *proto.TableSchema {
 		if len(t.List.KeyColumns) > 0 {
 			schema.ListCallKeyColumnList = t.List.KeyColumns.ToProtobuf()
 		}
-
 	}
 
 	return schema

plugin/table_validate.go

@@ -18,7 +18,8 @@ func (t *Table) validate(name string, requiredColumns []*Column) []string {
 	// verify all required columns exist
 	validationErrors = t.validateRequiredColumns(requiredColumns)
 
-	// validated list config
+	// validated list and get config
+	// NOTE: this also sets key column require and operators to default value if not specified
 	validationErrors = append(validationErrors, t.validateListAndGetConfig()...)
 
 	// verify hydrate dependencies are valid
@@ -74,6 +75,8 @@ func columnTypeToString(columnType proto.ColumnType) string {
 	}
 }
 
+// validate list and get config
+// NOTE: this initialises key column properties to their defaults
 func (t *Table) validateListAndGetConfig() []string {
 	var validationErrors []string
 	// either get or list must be defined
@@ -96,6 +99,7 @@ func (t *Table) validateListAndGetConfig() []string {
 	}
 
 	// verify any key columns defined for GET only use '=' operators
+	// also set key column require and operators to default value if not specified
 	validationErrors = append(validationErrors, t.validateKeyColumns()...)
 
 	return validationErrors
@@ -122,6 +126,7 @@ func (t *Table) validateHydrateDependencies() []string {
 	}
 	return validationErrors
 }
+
 func (t *Table) detectCyclicHydrateDependencies() string {
 	var dependencies = topsort.NewGraph()
 	dependencies.AddNode("root")
@@ -147,6 +152,8 @@ func (t *Table) detectCyclicHydrateDependencies() string {
 	return ""
 }
 
+// validate key columns
+// also set key column require and operators to default value if not specified
 func (t *Table) validateKeyColumns() []string {
 	// get key columns should only have equals operators
 	var getValidationErrors []string