Support for nullable fields in joins

examples/booktest/postgresql/db_test.go

@@ -139,7 +139,7 @@ func TestBooks(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, ab := range res {
-		t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tags: '%v'\n", ab.BookID, ab.Title, ab.Name, ab.Isbn, ab.Tags)
+		t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tags: '%v'\n", ab.BookID, ab.Title, ab.Name.String, ab.Isbn, ab.Tags)
 	}
 
 	// TODO: call say_hello(varchar)

examples/kotlin/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt

@@ -23,7 +23,7 @@ WHERE tags && ?::varchar[]
 data class BooksByTagsRow (
   val bookId: Int,
   val title: String,
-  val name: String,
+  val name: String?,
   val isbn: String,
   val tags: List<String>
 )

examples/python/src/booktest/query.py

@@ -27,7 +27,7 @@
 class BooksByTagsRow:
     book_id: int
     title: str
-    name: str
+    name: Optional[str]
     isbn: str
     tags: List[str]
 

internal/compiler/output_columns.go

@@ -206,9 +206,57 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) {
 		}
 	}
 
+	if n, ok := node.(*ast.SelectStmt); ok {
+		for _, col := range cols {
+			if !col.NotNull || col.Table == nil {
+				continue
+			}
+			for _, f := range n.FromClause.Items {
+				if res := isTableRequired(f, col.Table.Name, tableRequired); res != tableNotFound {
+					col.NotNull = res == tableRequired
+					break
+				}
+			}
+		}
+	}
+
 	return cols, nil
 }
 
+const (
+	tableNotFound = iota
+	tableRequired
+	tableOptional
+)
+
+func isTableRequired(n ast.Node, tableName string, prior int) int {
+	switch n := n.(type) {
+	case *ast.RangeVar:
+		if *n.Relname == tableName {
+			return prior
+		}
+	case *ast.JoinExpr:
+		helper := func(l, r int) int {
+			if res := isTableRequired(n.Larg, tableName, l); res != tableNotFound {
+				return res
+			}
+			if res := isTableRequired(n.Rarg, tableName, r); res != tableNotFound {
+				return res
+			}
+			return tableNotFound
+		}
+		switch n.Jointype {
+		case ast.JoinTypeLeft:
+			return helper(tableRequired, tableOptional)
+		case ast.JoinTypeRight:
+			return helper(tableOptional, tableRequired)
+		case ast.JoinTypeFull:
+			return helper(tableOptional, tableOptional)
+		}
+	}
+	return tableNotFound
+}
+
 // Compute the output columns for a statement.
 //
 // Return an error if column references are ambiguous

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

@@ -0,0 +1,8 @@
+CREATE TABLE foo (id serial not null, bar_id int references bar(id));
+CREATE TABLE bar (id serial not null);
+
+-- name: FullJoin :many
+SELECT f.id, f.bar_id, b.id
+FROM foo f
+FULL OUTER JOIN bar b ON b.id = f.bar_id
+WHERE f.id = $1;

internal/endtoend/testdata/join_full/mysql/sqlc.json

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

internal/endtoend/testdata/join_full/postgresql/query.sql

@@ -0,0 +1,8 @@
+CREATE TABLE foo (id serial not null, bar_id int references bar(id));
+CREATE TABLE bar (id serial not null);
+
+-- name: FullJoin :many
+SELECT f.id, f.bar_id, b.id
+FROM foo f
+FULL OUTER JOIN bar b ON b.id = f.bar_id
+WHERE f.id = $1;

internal/endtoend/testdata/join_full/postgresql/sqlc.json

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