Release v1.12.5

- Ignore all leading and trailing white spaces of the field name when specifying a field name.

.travis.yml

@@ -5,6 +5,7 @@ go:
   - 1.11.x
   - 1.12.x
   - 1.13.x
+  - 1.14.x
 
 install: true
 
@@ -34,7 +35,7 @@ deploy:
     on:
       tags: true
       condition: $TRAVIS_TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
-      go: '1.13.x'
+      go: '1.14.x'
   - provider: releases
     api_key: $GITHUB_API_TOKEN
     skip_cleanup: true
@@ -45,4 +46,4 @@ deploy:
     on:
       tags: true
       condition: $TRAVIS_TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+\-pr\.[0-9]+$
-      go: '1.13.x'
+      go: '1.14.x'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## Version 1.12.5
+
+Released on April 11, 2020
+
+- Ignore all leading and trailing white spaces of the field name when specifying a field name.
+
 ## Version 1.12.4
 
 Released on February 4, 2020

docs/changelog.md

@@ -5,6 +5,12 @@ title: Change Log - csvq
 
 # Change Log
 
+## Version 1.12.5
+
+Released on April 11, 2020
+
+- Ignore all leading and trailing white spaces of the field name when specifying a field name.
+
 ## Version 1.12.4
 
 Released on February 4, 2020

docs/index.md

@@ -13,10 +13,10 @@ In the multiple operations, you can use variables, cursors, temporary tables, an
 
 ## Latest Release
 
-Version 1.12.4
-: Released on February 4, 2019
+Version 1.12.5
+: Released on April 11, 2019
 
-  <a class="waves-effect waves-light btn" href="https://github.com/mithrandie/csvq/releases/tag/v1.12.4">
+  <a class="waves-effect waves-light btn" href="https://github.com/mithrandie/csvq/releases/tag/v1.12.5">
     <i class="material-icons left">file_download</i>download
   </a>
 

docs/sitemap.xml

@@ -6,7 +6,7 @@
             http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
     <url>
         <loc>https://mithrandie.github.io/csvq/</loc>
-        <lastmod>2020-02-04T14:39:45+00:00</lastmod>
+        <lastmod>2020-04-11T02:22:24+00:00</lastmod>
     </url>
     <url>
         <loc>https://mithrandie.github.io/csvq/reference.html</loc>
@@ -178,7 +178,7 @@
     </url>
     <url>
         <loc>https://mithrandie.github.io/csvq/changelog.html</loc>
-        <lastmod>2020-02-04T14:39:45+00:00</lastmod>
+        <lastmod>2020-04-11T02:22:24+00:00</lastmod>
     </url>
     <url>
         <loc>https://mithrandie.github.io/csvq/license.html</loc>

lib/query/header.go

@@ -179,17 +179,18 @@ func (h Header) FieldIndex(fieldRef parser.FieldReference) (int, error) {
 	if 0 < len(fieldRef.View.Literal) {
 		view = fieldRef.View.Literal
 	}
-	column := fieldRef.Column.Literal
+	column := strings.TrimSpace(fieldRef.Column.Literal)
 
 	idx := -1
 
 	for i := range h {
+		hcol := strings.TrimSpace(h[i].Column)
 		if 0 < len(view) {
-			if !strings.EqualFold(h[i].View, view) || !strings.EqualFold(h[i].Column, column) {
+			if !strings.EqualFold(h[i].View, view) || !strings.EqualFold(hcol, column) {
 				continue
 			}
 		} else {
-			isEqual := strings.EqualFold(h[i].Column, column)
+			isEqual := strings.EqualFold(hcol, column)
 			if isEqual && h[i].IsJoinColumn {
 				idx = i
 				break

lib/query/header_test.go

@@ -285,6 +285,18 @@ var headerFieldIndexTests = []struct {
 		},
 		Result: 5,
 	},
+	{
+		Ref: parser.FieldReference{
+			Column: parser.Identifier{Literal: " c4 "},
+		},
+		Result: 5,
+	},
+	{
+		Ref: parser.FieldReference{
+			Column: parser.Identifier{Literal: "c5"},
+		},
+		Result: 6,
+	},
 	{
 		Ref: parser.FieldReference{
 			Column: parser.Identifier{Literal: "c1"},
@@ -333,6 +345,11 @@ func TestHeader_FieldIndex(t *testing.T) {
 			IsFromTable:  true,
 			IsJoinColumn: true,
 		},
+		{
+			View:        "t4",
+			Column:      "  c5  ",
+			IsFromTable: true,
+		},
 	}
 
 	for _, v := range headerFieldIndexTests {

lib/query/version.go

@@ -1,3 +1,3 @@
 package query
 
-var Version = "v1.12.4"
+var Version = "v1.12.5"