Release v1.17.10

- Fix a bug when loading views from cache.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## Version 1.17.10
+
+Released on Aug 14, 2022
+
+- Fix a bug when loading views from cache.
+
 ## Version 1.17.9
 
 Released on Aug 14, 2022

docs/changelog.md

@@ -5,6 +5,12 @@ title: Change Log - csvq
 
 # Change Log
 
+## Version 1.17.10
+
+Released on Aug 14, 2022
+
+- Fix a bug when loading views from cache.
+
 ## Version 1.17.9
 
 Released on Aug 14, 2022

docs/index.md

@@ -13,10 +13,10 @@ In the multiple operations, you can use variables, cursors, temporary tables, an
 
 ## Latest Release
 
-Version 1.17.9
+Version 1.17.10
 : Released on Aug 14, 2022
 
-  <a class="waves-effect waves-light btn" href="https://github.com/mithrandie/csvq/releases/tag/v1.17.9">
+  <a class="waves-effect waves-light btn" href="https://github.com/mithrandie/csvq/releases/tag/v1.17.10">
     <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>2022-08-14T06:12:34+00:00</lastmod>
+        <lastmod>2022-08-14T07:45:53+00:00</lastmod>
     </url>
     <url>
         <loc>https://mithrandie.github.io/csvq/reference.html</loc>
@@ -182,7 +182,7 @@
     </url>
     <url>
         <loc>https://mithrandie.github.io/csvq/changelog.html</loc>
-        <lastmod>2022-08-14T06:12:34+00:00</lastmod>
+        <lastmod>2022-08-14T07:45:53+00:00</lastmod>
     </url>
     <url>
         <loc>https://mithrandie.github.io/csvq/license.html</loc>

lib/query/built_in_command.go

@@ -481,7 +481,7 @@ func ShowObjects(scope *ReferenceScope, expr parser.ShowObjects) (string, error)
 			createdFiles, updatedFiles := scope.Tx.UncommittedViews.UncommittedFiles()
 
 			for _, key := range keys {
-				if view, ok := scope.Tx.CachedViews.Load(key); ok {
+				if view, ok := scope.Tx.CachedViews.Load(strings.ToUpper(key)); ok {
 					fields := view.Header.TableColumnNames()
 					info := view.FileInfo
 					ufpath := strings.ToUpper(info.Path)

lib/query/load_view.go

@@ -885,7 +885,7 @@ func cacheViewFromFile(
 
 	filePath, view, isCached, err := func() (string, *View, bool, error) {
 		if p, ok := scope.LoadFilePath(fileIdentifier.Literal); ok {
-			if v, ok := scope.Tx.CachedViews.Load(p); ok {
+			if v, ok := scope.Tx.CachedViews.Load(strings.ToUpper(p)); ok {
 				return p, v, true, nil
 			}
 		}
@@ -904,7 +904,7 @@ func cacheViewFromFile(
 		if e != nil {
 			return "", nil, false, e
 		}
-		v, ok := scope.Tx.CachedViews.Load(p)
+		v, ok := scope.Tx.CachedViews.Load(strings.ToUpper(p))
 		return p, v, ok, nil
 	}()
 	if err != nil {

lib/query/load_view_test.go

@@ -20,6 +20,7 @@ import (
 
 var loadViewTests = []struct {
 	Name               string
+	TestCache          bool
 	Encoding           text.Encoding
 	NoHeader           bool
 	From               parser.FromClause
@@ -144,6 +145,47 @@ var loadViewTests = []struct {
 			},
 		}}, time.Time{}, nil),
 	},
+	{
+		Name:      "LoadView from Cached View",
+		TestCache: true,
+		From: parser.FromClause{
+			Tables: []parser.QueryExpression{
+				parser.Table{
+					Object: parser.Identifier{Literal: "table1"},
+				},
+			},
+		},
+		ForUpdate: true,
+		Result: &View{
+			Header: NewHeader("table1", []string{"column1", "column2"}),
+			RecordSet: []Record{
+				NewRecord([]value.Primary{
+					value.NewString("1"),
+					value.NewString("str1"),
+				}),
+				NewRecord([]value.Primary{
+					value.NewString("2"),
+					value.NewString("str2"),
+				}),
+				NewRecord([]value.Primary{
+					value.NewString("3"),
+					value.NewString("str3"),
+				}),
+			},
+			FileInfo: &FileInfo{
+				Path:      "table1.csv",
+				Delimiter: ',',
+				Encoding:  text.UTF8,
+				LineBreak: text.LF,
+				ForUpdate: true,
+			},
+		},
+		ResultScope: GenerateReferenceScope(nil, []map[string]map[string]interface{}{{
+			scopeNameAliases: {
+				"TABLE1": strings.ToUpper(GetTestFilePath("table1.csv")),
+			},
+		}}, time.Time{}, nil),
+	},
 	{
 		Name: "LoadView File with UTF-8 BOM",
 		From: parser.FromClause{
@@ -3189,6 +3231,10 @@ func TestLoadView(t *testing.T) {
 
 		queryScope := v.Scope.CreateNode()
 		view, err := LoadView(ctx, queryScope, v.From.Tables, v.ForUpdate, v.UseInternalId)
+		if v.TestCache {
+			queryScope.nodes[len(queryScope.nodes)-1].Clear()
+			view, err = LoadView(ctx, queryScope, v.From.Tables, v.ForUpdate, v.UseInternalId)
+		}
 
 		if err != nil {
 			if len(v.Error) < 1 {

lib/query/version.go

@@ -1,3 +1,3 @@
 package query
 
-var Version = "v1.17.9"
+var Version = "v1.17.10"

lib/terminal/completer_readline.go

@@ -2129,7 +2129,7 @@ func (c *Completer) SearchAllTables(line string, _ string, _ int) readline.Candi
 	items := make([]string, 0, len(tableKeys)+len(files)+len(c.viewList))
 	tablePath := make(map[string]bool)
 	for _, k := range tableKeys {
-		if view, ok := c.scope.Tx.CachedViews.Load(k); ok {
+		if view, ok := c.scope.Tx.CachedViews.Load(strings.ToUpper(k)); ok {
 			lpath := view.FileInfo.Path
 			tablePath[lpath] = true
 			if filepath.Dir(lpath) == defaultDir {