Fix upper/lower variable name casing (#146)

* Fix variable name casing * Fix custom separator
cube2222 · Sep 16, 2019 · 9ae1e01 · 9ae1e01
1 parent 4f23b3c
commit 9ae1e01
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/execution/requalifier.go b/execution/requalifier.go
@@ -68,7 +68,7 @@ func (stream *RequalifiedStream) Next() (*Record, error) {
  name = name[dotIndex+1:]
  }
  }
- qualifiedName := octosql.VariableName(fmt.Sprintf("%s.%s", stream.qualifier, name))
+ qualifiedName := octosql.NewVariableName(fmt.Sprintf("%s.%s", stream.qualifier, name))
 
  fields[i] = qualifiedName
  values[qualifiedName] = record.Value(oldFields[i].Name)

diff --git a/logical/logical.go b/logical/logical.go
@@ -22,7 +22,7 @@ func NewPhysicalPlanCreator(repo *physical.DataSourceRepository) *PhysicalPlanCr
 }
 
 func (creator *PhysicalPlanCreator) GetVariableName() (out octosql.VariableName) {
- out = octosql.VariableName(fmt.Sprintf("const_%d", creator.variableCounter))
+ out = octosql.NewVariableName(fmt.Sprintf("const_%d", creator.variableCounter))
  creator.variableCounter++
  return
 }

diff --git a/parser/parser.go b/parser/parser.go
@@ -414,7 +414,7 @@ func ParseAliasedExpression(expr *sqlparser.AliasedExpr) (logical.NamedExpressio
  }
  return nil, errors.Errorf("expressions in select statement and aggregate expressions must be named")
  }
- return logical.NewAliasedExpression(octosql.VariableName(expr.As.String()), subExpr), nil
+ return logical.NewAliasedExpression(octosql.NewVariableName(expr.As.String()), subExpr), nil
 }
 
 func ParseFunctionArgument(expr *sqlparser.AliasedExpr) (logical.Expression, error) {
@@ -479,7 +479,7 @@ func ParseExpression(expr sqlparser.Expr) (logical.Expression, error) {
  if !expr.Qualifier.Name.IsEmpty() {
  name = fmt.Sprintf("%s.%s", expr.Qualifier.Name.String(), name)
  }
- return logical.NewVariable(octosql.VariableName(name)), nil
+ return logical.NewVariable(octosql.NewVariableName(name)), nil
 
  case *sqlparser.Subquery:
  selectExpr, ok := expr.Select.(*sqlparser.Select)

diff --git a/storage/csv/datasource.go b/storage/csv/datasource.go
@@ -43,7 +43,7 @@ func NewDataSourceBuilderFactory() physical.DataSourceBuilderFactory {
  if err != nil {
  return nil, errors.Wrap(err, "couldn't get headerRow")
  }
- separator, err := config.GetString(dbConfig, "separator", config.WithDefault(','))
+ separator, err := config.GetString(dbConfig, "separator", config.WithDefault(","))
  if err != nil {
  return nil, errors.Wrap(err, "couldn't get separator")
  }
@@ -125,7 +125,7 @@ func (rs *RecordStream) initializeColumnsWithHeaderRow() error {
 
  rs.aliasedFields = make([]octosql.VariableName, len(columns))
  for i, c := range columns {
- rs.aliasedFields[i] = octosql.VariableName(fmt.Sprintf("%s.%s", rs.alias, c))
+ rs.aliasedFields[i] = octosql.NewVariableName(fmt.Sprintf("%s.%s", rs.alias, c))
  }
 
  rs.r.FieldsPerRecord = len(rs.aliasedFields)
@@ -149,7 +149,7 @@ func (rs *RecordStream) initializeColumnsWithoutHeaderRow() (*execution.Record,
 
  rs.aliasedFields = make([]octosql.VariableName, len(row))
  for i := range row {
- rs.aliasedFields[i] = octosql.VariableName(fmt.Sprintf("%s.col%d", rs.alias, i+1))
+ rs.aliasedFields[i] = octosql.NewVariableName(fmt.Sprintf("%s.col%d", rs.alias, i+1))
  }
 
  return execution.NewRecordFromSlice(rs.aliasedFields, parseDataTypes(row)), nil

diff --git a/storage/mysql/datasource.go b/storage/mysql/datasource.go
@@ -195,7 +195,7 @@ func (rs *RecordStream) Next() (*execution.Record, error) {
 
  fields := make([]octosql.VariableName, len(rs.columns))
  for i, columnName := range rs.columns {
- newName := octosql.VariableName(fmt.Sprintf("%s.%s", rs.alias, columnName))
+ newName := octosql.NewVariableName(fmt.Sprintf("%s.%s", rs.alias, columnName))
  fields[i] = newName
  resultMap[newName] = octosql.NormalizeType(cols[i])
  }

diff --git a/storage/postgres/datasource.go b/storage/postgres/datasource.go
@@ -208,7 +208,7 @@ func (rs *RecordStream) Next() (*execution.Record, error) {
 
  fields := make([]octosql.VariableName, len(rs.columns))
  for i, columnName := range rs.columns {
- newName := octosql.VariableName(fmt.Sprintf("%s.%s", rs.alias, columnName))
+ newName := octosql.NewVariableName(fmt.Sprintf("%s.%s", rs.alias, columnName))
  fields[i] = newName
  resultMap[newName] = octosql.NormalizeType(cols[i])
  }