fix: table alias can not find column

Author: nusr

.gitignore

@@ -2,6 +2,7 @@
 __pycache__
 .DS_Store
 .*.swp
+.vscode
 
 # Devenv
 .envrc

internal/compiler/output_columns.go

@@ -656,7 +656,11 @@ func outputColumnRefs(res *ast.ResTarget, tables []*Table, node *ast.ColumnRef)
 		if schema != "" && t.Rel.Schema != schema {
 			continue
 		}
-		if alias != "" && t.Rel.Name != alias {
+		originTableName := ""
+		if len(t.Columns) > 0 && t.Columns[0] != nil && t.Columns[0].Table != nil {
+			originTableName = t.Columns[0].Table.Name
+		}
+		if alias != "" && t.Rel.Name != alias && originTableName != alias {
 			continue
 		}
 		for _, c := range t.Columns {

internal/endtoend/testdata/alias_join/mysql/go/db.go

@@ -0,0 +1,19 @@
+-- name: RetrieveAllWithDeprecation :many
+select
+  arn,
+  name,
+  aws_rds_databases.engine
+from
+  aws_rds_databases r
+  natural join aws_rds_databases_engines
+;
+
+-- name: RetrieveAllWithDeprecationOther :many
+select
+  arn,
+  name,
+  r.engine
+from
+  aws_rds_databases r
+  natural join aws_rds_databases_engines
+;

internal/endtoend/testdata/alias_join/mysql/go/models.go

@@ -0,0 +1,21 @@
+CREATE TABLE IF NOT EXISTS aws_rds_databases (
+  account_id TEXT NOT NULL,
+  region TEXT NOT NULL,
+  arn TEXT NOT NULL,
+  name TEXT NOT NULL,
+  engine TEXT NOT NULL,
+  engine_version TEXT NOT NULL,
+
+  -- tags is a JSON object
+  tags TEXT NOT NULL,
+
+  UNIQUE (account_id, region, arn) 
+);
+
+CREATE TABLE IF NOT EXISTS aws_rds_databases_engines (
+  engine TEXT NOT NULL,
+  engine_version TEXT NOT NULL,
+  deprecation TEXT NOT NULL,
+
+  UNIQUE (engine, engine_version) 
+);

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

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

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

@@ -0,0 +1,19 @@
+-- name: RetrieveAllWithDeprecation :many
+select
+  arn,
+  name,
+  aws_rds_databases.engine
+from
+  aws_rds_databases r
+  natural join aws_rds_databases_engines
+;
+
+-- name: RetrieveAllWithDeprecationOther :many
+select
+  arn,
+  name,
+  r.engine
+from
+  aws_rds_databases r
+  natural join aws_rds_databases_engines
+;

internal/endtoend/testdata/alias_join/mysql/schema.sql

@@ -0,0 +1,21 @@
+CREATE TABLE IF NOT EXISTS aws_rds_databases (
+  account_id TEXT NOT NULL,
+  region TEXT NOT NULL,
+  arn TEXT NOT NULL,
+  name TEXT NOT NULL,
+  engine TEXT NOT NULL,
+  engine_version TEXT NOT NULL,
+
+  -- tags is a JSON object
+  tags TEXT NOT NULL,
+
+  UNIQUE (account_id, region, arn)
+);
+
+CREATE TABLE IF NOT EXISTS aws_rds_databases_engines (
+  engine TEXT NOT NULL,
+  engine_version TEXT NOT NULL,
+  deprecation TEXT NOT NULL,
+
+  UNIQUE (engine, engine_version)
+);