fix(compiler): Fix between expression handling of table references (#1268)

Author: timstudd

internal/compiler/resolve.go

@@ -204,7 +204,8 @@ func resolveCatalogRefs(c *catalog.Catalog, qc *QueryCatalog, rvs []*ast.RangeVa
 
 			var key string
 			if ref, ok := n.Expr.(*ast.ColumnRef); ok {
-				if str, ok := ref.Fields.Items[0].(*ast.String); ok {
+				itemsCount := len(ref.Fields.Items)
+				if str, ok := ref.Fields.Items[itemsCount-1].(*ast.String); ok {
 					key = str.Str
 				}
 			}

internal/endtoend/testdata/between_args/mysql/go/query.sql.go

@@ -9,3 +9,13 @@ CREATE TABLE products (
 SELECT  *
 FROM    products
 WHERE   price BETWEEN ? AND ?;
+
+-- name: GetBetweenPricesTable :many
+SELECT  *
+FROM    products
+WHERE   products.price BETWEEN ? AND ?;
+
+-- name: GetBetweenPricesTableAlias :many
+SELECT  *
+FROM    products as p
+WHERE   p.price BETWEEN ? AND ?;

internal/endtoend/testdata/between_args/mysql/query.sql

@@ -1,12 +1,12 @@
 {
 	"version": "1",
 	"packages": [
-	  {
-		"path": "go",
-		"engine": "mysql",
-		"name": "querytest",
-		"schema": "query.sql",
-		"queries": "query.sql"
-	  }
+		{
+			"path": "go",
+			"engine": "mysql",
+			"name": "querytest",
+			"schema": "query.sql",
+			"queries": "query.sql"
+	  	}
 	]
 }