From 27d7454e0a8872ffa93fd8d543a853b2a8fd0d3f Mon Sep 17 00:00:00 2001
From: Axel Almquist <axel.almquist@flowertech.se>
Date: Tue, 7 Oct 2025 09:41:12 +0200
Subject: [PATCH 1/6] fix: inherits now uses the schema of the inherited table
 and not the table that inherits

---
 .../postgresql/pgx/v4/go/db.go                | 32 +++++++
 .../postgresql/pgx/v4/go/models.go            | 36 +++++++
 .../postgresql/pgx/v4/go/query.sql.go         | 87 +++++++++++++++++
 .../postgresql/pgx/v4/query.sql               |  8 ++
 .../postgresql/pgx/v4/schema.sql              | 13 +++
 .../postgresql/pgx/v4/sqlc.json               | 13 +++
 .../postgresql/pgx/v5/go/db.go                | 32 +++++++
 .../postgresql/pgx/v5/go/models.go            | 34 +++++++
 .../postgresql/pgx/v5/go/query.sql.go         | 87 +++++++++++++++++
 .../postgresql/pgx/v5/query.sql               |  8 ++
 .../postgresql/pgx/v5/schema.sql              | 13 +++
 .../postgresql/pgx/v5/sqlc.json               | 13 +++
 .../postgresql/stdlib/go/db.go                | 31 ++++++
 .../postgresql/stdlib/go/models.go            | 36 +++++++
 .../postgresql/stdlib/go/query.sql.go         | 96 +++++++++++++++++++
 .../postgresql/stdlib/query.sql               |  8 ++
 .../postgresql/stdlib/schema.sql              | 18 ++++
 .../postgresql/stdlib/sqlc.json               | 12 +++
 internal/sql/catalog/table.go                 |  8 +-
 19 files changed, 584 insertions(+), 1 deletion(-)
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/db.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/sqlc.json
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/db.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/sqlc.json
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/db.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
 create mode 100644 internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/sqlc.json

diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/db.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/db.go
new file mode 100644
index 0000000000..3895084dc3
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgconn"
+	"github.com/jackc/pgx/v4"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go
new file mode 100644
index 0000000000..87aff71db6
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go
@@ -0,0 +1,36 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+package querytest
+
+import (
+	"database/sql"
+
+	"github.com/google/uuid"
+)
+
+type Llc struct {
+	PartyID           uuid.UUID
+	Name              string
+	LegalName         string
+	IncorporationDate sql.NullTime
+}
+
+type Organisation struct {
+	PartyID   uuid.UUID
+	Name      string
+	LegalName string
+}
+
+type Party struct {
+	PartyID uuid.UUID
+	Name    string
+}
+
+type Person struct {
+	PartyID   uuid.UUID
+	Name      string
+	FirstName string
+	LastName  string
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go
new file mode 100644
index 0000000000..4caab44ccb
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go
@@ -0,0 +1,87 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const getAllOrganisations = `-- name: GetAllOrganisations :many
+SELECT party_id, name, legal_name FROM organisation
+`
+
+func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, error) {
+	rows, err := q.db.Query(ctx, getAllOrganisations)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Organisation
+	for rows.Next() {
+		var i Organisation
+		if err := rows.Scan(&i.PartyID, &i.Name, &i.LegalName); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getAllParties = `-- name: GetAllParties :many
+SELECT party_id, name FROM party
+`
+
+func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
+	rows, err := q.db.Query(ctx, getAllParties)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Party
+	for rows.Next() {
+		var i Party
+		if err := rows.Scan(&i.PartyID, &i.Name); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getAllPeople = `-- name: GetAllPeople :many
+SELECT party_id, name, first_name, last_name FROM person
+`
+
+func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) {
+	rows, err := q.db.Query(ctx, getAllPeople)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Person
+	for rows.Next() {
+		var i Person
+		if err := rows.Scan(
+			&i.PartyID,
+			&i.Name,
+			&i.FirstName,
+			&i.LastName,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
new file mode 100644
index 0000000000..30adbd9aa1
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
@@ -0,0 +1,8 @@
+-- name: GetAllParties :many
+SELECT * FROM party;
+
+-- name: GetAllPeople :many
+SELECT * FROM person;
+
+-- name: GetAllOrganisations :many
+SELECT * FROM organisation;
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql
new file mode 100644
index 0000000000..24300bb2d2
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql
@@ -0,0 +1,13 @@
+CREATE SCHEMA one;
+CREATE SCHEMA two;
+
+CREATE TABLE one.party (
+    party_id uuid PRIMARY KEY,
+    name text NOT NULL
+);
+
+CREATE TABLE two.person (
+    first_name text NOT NULL,
+    last_name text NOT NULL
+) INHERITS (one.party);
+
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/sqlc.json b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/sqlc.json
new file mode 100644
index 0000000000..d1244c9e7a
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/sqlc.json
@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v4",
+      "name": "querytest",
+      "schema": "schema.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/db.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/db.go
new file mode 100644
index 0000000000..1e00549714
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go
new file mode 100644
index 0000000000..2cbc4b68a6
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go
@@ -0,0 +1,34 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+package querytest
+
+import (
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type Llc struct {
+	PartyID           pgtype.UUID
+	Name              string
+	LegalName         string
+	IncorporationDate pgtype.Timestamp
+}
+
+type Organisation struct {
+	PartyID   pgtype.UUID
+	Name      string
+	LegalName string
+}
+
+type Party struct {
+	PartyID pgtype.UUID
+	Name    string
+}
+
+type Person struct {
+	PartyID   pgtype.UUID
+	Name      string
+	FirstName string
+	LastName  string
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go
new file mode 100644
index 0000000000..4caab44ccb
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go
@@ -0,0 +1,87 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const getAllOrganisations = `-- name: GetAllOrganisations :many
+SELECT party_id, name, legal_name FROM organisation
+`
+
+func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, error) {
+	rows, err := q.db.Query(ctx, getAllOrganisations)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Organisation
+	for rows.Next() {
+		var i Organisation
+		if err := rows.Scan(&i.PartyID, &i.Name, &i.LegalName); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getAllParties = `-- name: GetAllParties :many
+SELECT party_id, name FROM party
+`
+
+func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
+	rows, err := q.db.Query(ctx, getAllParties)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Party
+	for rows.Next() {
+		var i Party
+		if err := rows.Scan(&i.PartyID, &i.Name); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getAllPeople = `-- name: GetAllPeople :many
+SELECT party_id, name, first_name, last_name FROM person
+`
+
+func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) {
+	rows, err := q.db.Query(ctx, getAllPeople)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Person
+	for rows.Next() {
+		var i Person
+		if err := rows.Scan(
+			&i.PartyID,
+			&i.Name,
+			&i.FirstName,
+			&i.LastName,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
new file mode 100644
index 0000000000..30adbd9aa1
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
@@ -0,0 +1,8 @@
+-- name: GetAllParties :many
+SELECT * FROM party;
+
+-- name: GetAllPeople :many
+SELECT * FROM person;
+
+-- name: GetAllOrganisations :many
+SELECT * FROM organisation;
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql
new file mode 100644
index 0000000000..24300bb2d2
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql
@@ -0,0 +1,13 @@
+CREATE SCHEMA one;
+CREATE SCHEMA two;
+
+CREATE TABLE one.party (
+    party_id uuid PRIMARY KEY,
+    name text NOT NULL
+);
+
+CREATE TABLE two.person (
+    first_name text NOT NULL,
+    last_name text NOT NULL
+) INHERITS (one.party);
+
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/sqlc.json b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/sqlc.json
new file mode 100644
index 0000000000..32ede07158
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/sqlc.json
@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v5",
+      "name": "querytest",
+      "schema": "schema.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/db.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/db.go
new file mode 100644
index 0000000000..3b320aa168
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/db.go
@@ -0,0 +1,31 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go
new file mode 100644
index 0000000000..87aff71db6
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go
@@ -0,0 +1,36 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+package querytest
+
+import (
+	"database/sql"
+
+	"github.com/google/uuid"
+)
+
+type Llc struct {
+	PartyID           uuid.UUID
+	Name              string
+	LegalName         string
+	IncorporationDate sql.NullTime
+}
+
+type Organisation struct {
+	PartyID   uuid.UUID
+	Name      string
+	LegalName string
+}
+
+type Party struct {
+	PartyID uuid.UUID
+	Name    string
+}
+
+type Person struct {
+	PartyID   uuid.UUID
+	Name      string
+	FirstName string
+	LastName  string
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go
new file mode 100644
index 0000000000..fe4b5e86fa
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go
@@ -0,0 +1,96 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const getAllOrganisations = `-- name: GetAllOrganisations :many
+SELECT party_id, name, legal_name FROM organisation
+`
+
+func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, error) {
+	rows, err := q.db.QueryContext(ctx, getAllOrganisations)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Organisation
+	for rows.Next() {
+		var i Organisation
+		if err := rows.Scan(&i.PartyID, &i.Name, &i.LegalName); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getAllParties = `-- name: GetAllParties :many
+SELECT party_id, name FROM party
+`
+
+func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
+	rows, err := q.db.QueryContext(ctx, getAllParties)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Party
+	for rows.Next() {
+		var i Party
+		if err := rows.Scan(&i.PartyID, &i.Name); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getAllPeople = `-- name: GetAllPeople :many
+SELECT party_id, name, first_name, last_name FROM person
+`
+
+func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) {
+	rows, err := q.db.QueryContext(ctx, getAllPeople)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Person
+	for rows.Next() {
+		var i Person
+		if err := rows.Scan(
+			&i.PartyID,
+			&i.Name,
+			&i.FirstName,
+			&i.LastName,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
new file mode 100644
index 0000000000..30adbd9aa1
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
@@ -0,0 +1,8 @@
+-- name: GetAllParties :many
+SELECT * FROM party;
+
+-- name: GetAllPeople :many
+SELECT * FROM person;
+
+-- name: GetAllOrganisations :many
+SELECT * FROM organisation;
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
new file mode 100644
index 0000000000..2da6749754
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
@@ -0,0 +1,18 @@
+CREATE TABLE party (
+    party_id uuid PRIMARY KEY,
+    name text NOT NULL
+);
+
+CREATE TABLE person (
+    first_name text NOT NULL,
+    last_name text NOT NULL
+) INHERITS (party);
+
+CREATE TABLE organisation (
+    legal_name text
+) INHERITS (party);
+
+CREATE TABLE llc (
+   incorporation_date timestamp,
+   legal_name text NOT NULL
+) INHERITS (organisation); 
\ No newline at end of file
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/sqlc.json
new file mode 100644
index 0000000000..f717ca2e66
--- /dev/null
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "name": "querytest",
+      "schema": "schema.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/sql/catalog/table.go b/internal/sql/catalog/table.go
index dc30acfa1e..dd92850abb 100644
--- a/internal/sql/catalog/table.go
+++ b/internal/sql/catalog/table.go
@@ -267,7 +267,13 @@ func (c *Catalog) createTable(stmt *ast.CreateTableStmt) error {
 	coltype := make(map[string]ast.TypeName) // used to check for duplicate column names
 	seen := make(map[string]bool)            // used to check for duplicate column names
 	for _, inheritTable := range stmt.Inherits {
-		t, _, err := schema.getTable(inheritTable)
+
+		inheritSchema, err := c.getSchema(inheritTable.Schema)
+		if err != nil {
+			return err
+		}
+
+		t, _, err := inheritSchema.getTable(inheritTable)
 		if err != nil {
 			return err
 		}

From 2e22a8f420162170d1ac5dd86da484059a3a6589 Mon Sep 17 00:00:00 2001
From: Axel Almquist <axel.almquist@flowertech.se>
Date: Tue, 7 Oct 2025 09:49:21 +0200
Subject: [PATCH 2/6] fix: wrong schema in postgresql/stdlib/schema.sql

---
 .../postgresql/stdlib/schema.sql                | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
index 2da6749754..24300bb2d2 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
@@ -1,18 +1,13 @@
-CREATE TABLE party (
+CREATE SCHEMA one;
+CREATE SCHEMA two;
+
+CREATE TABLE one.party (
     party_id uuid PRIMARY KEY,
     name text NOT NULL
 );
 
-CREATE TABLE person (
+CREATE TABLE two.person (
     first_name text NOT NULL,
     last_name text NOT NULL
-) INHERITS (party);
-
-CREATE TABLE organisation (
-    legal_name text
-) INHERITS (party);
+) INHERITS (one.party);
 
-CREATE TABLE llc (
-   incorporation_date timestamp,
-   legal_name text NOT NULL
-) INHERITS (organisation); 
\ No newline at end of file

From 24de49e48a828994aad55fd2c1311b5338450f96 Mon Sep 17 00:00:00 2001
From: Axel Almquist <axel.almquist@flowertech.se>
Date: Tue, 7 Oct 2025 09:50:33 +0200
Subject: [PATCH 3/6] fix: fix queries in postgresql/stdlib/query.sql

---
 .../postgresql/stdlib/query.sql                             | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
index 30adbd9aa1..17511d3e13 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
@@ -1,8 +1,6 @@
 -- name: GetAllParties :many
-SELECT * FROM party;
+SELECT * FROM one.party;
 
 -- name: GetAllPeople :many
-SELECT * FROM person;
+SELECT * FROM two.person;
 
--- name: GetAllOrganisations :many
-SELECT * FROM organisation;

From d4162910a8cce1b5ab1bf43a261fb5088895a81f Mon Sep 17 00:00:00 2001
From: Axel Almquist <axel.almquist@flowertech.se>
Date: Tue, 7 Oct 2025 09:51:47 +0200
Subject: [PATCH 4/6] fix: updated all queries in tests

---
 .../postgresql/pgx/v4/query.sql                             | 6 ++----
 .../postgresql/pgx/v5/query.sql                             | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
index 30adbd9aa1..17511d3e13 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
@@ -1,8 +1,6 @@
 -- name: GetAllParties :many
-SELECT * FROM party;
+SELECT * FROM one.party;
 
 -- name: GetAllPeople :many
-SELECT * FROM person;
+SELECT * FROM two.person;
 
--- name: GetAllOrganisations :many
-SELECT * FROM organisation;
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
index 30adbd9aa1..17511d3e13 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
@@ -1,8 +1,6 @@
 -- name: GetAllParties :many
-SELECT * FROM party;
+SELECT * FROM one.party;
 
 -- name: GetAllPeople :many
-SELECT * FROM person;
+SELECT * FROM two.person;
 
--- name: GetAllOrganisations :many
-SELECT * FROM organisation;

From 2d4b83b4bd2b43701351f201e2e1d99d04b63395 Mon Sep 17 00:00:00 2001
From: Axel Almquist <axel.almquist@flowertech.se>
Date: Tue, 7 Oct 2025 10:07:57 +0200
Subject: [PATCH 5/6] chore: generate test files

---
 .../postgresql/pgx/v4/go/models.go            | 23 ++--------
 .../postgresql/pgx/v4/go/query.sql.go         | 40 ++++-------------
 .../postgresql/pgx/v4/query.sql               |  4 +-
 .../postgresql/pgx/v4/schema.sql              | 10 ++---
 .../postgresql/pgx/v5/go/models.go            | 21 ++-------
 .../postgresql/pgx/v5/go/query.sql.go         | 40 ++++-------------
 .../postgresql/pgx/v5/query.sql               |  4 +-
 .../postgresql/pgx/v5/schema.sql              | 10 ++---
 .../postgresql/stdlib/go/models.go            | 23 ++--------
 .../postgresql/stdlib/go/query.sql.go         | 43 ++++---------------
 .../postgresql/stdlib/query.sql               |  4 +-
 .../postgresql/stdlib/schema.sql              | 10 ++---
 12 files changed, 57 insertions(+), 175 deletions(-)

diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go
index 87aff71db6..a695cb0722 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/models.go
@@ -5,32 +5,17 @@
 package querytest
 
 import (
-	"database/sql"
-
 	"github.com/google/uuid"
 )
 
-type Llc struct {
-	PartyID           uuid.UUID
-	Name              string
-	LegalName         string
-	IncorporationDate sql.NullTime
-}
-
-type Organisation struct {
+type ChildPerson struct {
 	PartyID   uuid.UUID
 	Name      string
-	LegalName string
+	FirstName string
+	LastName  string
 }
 
-type Party struct {
+type ParentParty struct {
 	PartyID uuid.UUID
 	Name    string
 }
-
-type Person struct {
-	PartyID   uuid.UUID
-	Name      string
-	FirstName string
-	LastName  string
-}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go
index 4caab44ccb..77900b12cf 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/go/query.sql.go
@@ -9,43 +9,19 @@ import (
 	"context"
 )
 
-const getAllOrganisations = `-- name: GetAllOrganisations :many
-SELECT party_id, name, legal_name FROM organisation
-`
-
-func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, error) {
-	rows, err := q.db.Query(ctx, getAllOrganisations)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []Organisation
-	for rows.Next() {
-		var i Organisation
-		if err := rows.Scan(&i.PartyID, &i.Name, &i.LegalName); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getAllParties = `-- name: GetAllParties :many
-SELECT party_id, name FROM party
+SELECT party_id, name FROM parent.party
 `
 
-func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
+func (q *Queries) GetAllParties(ctx context.Context) ([]ParentParty, error) {
 	rows, err := q.db.Query(ctx, getAllParties)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []Party
+	var items []ParentParty
 	for rows.Next() {
-		var i Party
+		var i ParentParty
 		if err := rows.Scan(&i.PartyID, &i.Name); err != nil {
 			return nil, err
 		}
@@ -58,18 +34,18 @@ func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
 }
 
 const getAllPeople = `-- name: GetAllPeople :many
-SELECT party_id, name, first_name, last_name FROM person
+SELECT party_id, name, first_name, last_name FROM child.person
 `
 
-func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) {
+func (q *Queries) GetAllPeople(ctx context.Context) ([]ChildPerson, error) {
 	rows, err := q.db.Query(ctx, getAllPeople)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []Person
+	var items []ChildPerson
 	for rows.Next() {
-		var i Person
+		var i ChildPerson
 		if err := rows.Scan(
 			&i.PartyID,
 			&i.Name,
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
index 17511d3e13..cf26f5b25b 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/query.sql
@@ -1,6 +1,6 @@
 -- name: GetAllParties :many
-SELECT * FROM one.party;
+SELECT * FROM parent.party;
 
 -- name: GetAllPeople :many
-SELECT * FROM two.person;
+SELECT * FROM child.person;
 
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql
index 24300bb2d2..03dc55d755 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v4/schema.sql
@@ -1,13 +1,13 @@
-CREATE SCHEMA one;
-CREATE SCHEMA two;
+CREATE SCHEMA parent;
+CREATE SCHEMA child;
 
-CREATE TABLE one.party (
+CREATE TABLE parent.party (
     party_id uuid PRIMARY KEY,
     name text NOT NULL
 );
 
-CREATE TABLE two.person (
+CREATE TABLE child.person (
     first_name text NOT NULL,
     last_name text NOT NULL
-) INHERITS (one.party);
+) INHERITS (parent.party);
 
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go
index 2cbc4b68a6..76111e1d6f 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/models.go
@@ -8,27 +8,14 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
-type Llc struct {
-	PartyID           pgtype.UUID
-	Name              string
-	LegalName         string
-	IncorporationDate pgtype.Timestamp
-}
-
-type Organisation struct {
+type ChildPerson struct {
 	PartyID   pgtype.UUID
 	Name      string
-	LegalName string
+	FirstName string
+	LastName  string
 }
 
-type Party struct {
+type ParentParty struct {
 	PartyID pgtype.UUID
 	Name    string
 }
-
-type Person struct {
-	PartyID   pgtype.UUID
-	Name      string
-	FirstName string
-	LastName  string
-}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go
index 4caab44ccb..77900b12cf 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/go/query.sql.go
@@ -9,43 +9,19 @@ import (
 	"context"
 )
 
-const getAllOrganisations = `-- name: GetAllOrganisations :many
-SELECT party_id, name, legal_name FROM organisation
-`
-
-func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, error) {
-	rows, err := q.db.Query(ctx, getAllOrganisations)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []Organisation
-	for rows.Next() {
-		var i Organisation
-		if err := rows.Scan(&i.PartyID, &i.Name, &i.LegalName); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getAllParties = `-- name: GetAllParties :many
-SELECT party_id, name FROM party
+SELECT party_id, name FROM parent.party
 `
 
-func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
+func (q *Queries) GetAllParties(ctx context.Context) ([]ParentParty, error) {
 	rows, err := q.db.Query(ctx, getAllParties)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []Party
+	var items []ParentParty
 	for rows.Next() {
-		var i Party
+		var i ParentParty
 		if err := rows.Scan(&i.PartyID, &i.Name); err != nil {
 			return nil, err
 		}
@@ -58,18 +34,18 @@ func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
 }
 
 const getAllPeople = `-- name: GetAllPeople :many
-SELECT party_id, name, first_name, last_name FROM person
+SELECT party_id, name, first_name, last_name FROM child.person
 `
 
-func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) {
+func (q *Queries) GetAllPeople(ctx context.Context) ([]ChildPerson, error) {
 	rows, err := q.db.Query(ctx, getAllPeople)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []Person
+	var items []ChildPerson
 	for rows.Next() {
-		var i Person
+		var i ChildPerson
 		if err := rows.Scan(
 			&i.PartyID,
 			&i.Name,
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
index 17511d3e13..cf26f5b25b 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/query.sql
@@ -1,6 +1,6 @@
 -- name: GetAllParties :many
-SELECT * FROM one.party;
+SELECT * FROM parent.party;
 
 -- name: GetAllPeople :many
-SELECT * FROM two.person;
+SELECT * FROM child.person;
 
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql
index 24300bb2d2..03dc55d755 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/pgx/v5/schema.sql
@@ -1,13 +1,13 @@
-CREATE SCHEMA one;
-CREATE SCHEMA two;
+CREATE SCHEMA parent;
+CREATE SCHEMA child;
 
-CREATE TABLE one.party (
+CREATE TABLE parent.party (
     party_id uuid PRIMARY KEY,
     name text NOT NULL
 );
 
-CREATE TABLE two.person (
+CREATE TABLE child.person (
     first_name text NOT NULL,
     last_name text NOT NULL
-) INHERITS (one.party);
+) INHERITS (parent.party);
 
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go
index 87aff71db6..a695cb0722 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/models.go
@@ -5,32 +5,17 @@
 package querytest
 
 import (
-	"database/sql"
-
 	"github.com/google/uuid"
 )
 
-type Llc struct {
-	PartyID           uuid.UUID
-	Name              string
-	LegalName         string
-	IncorporationDate sql.NullTime
-}
-
-type Organisation struct {
+type ChildPerson struct {
 	PartyID   uuid.UUID
 	Name      string
-	LegalName string
+	FirstName string
+	LastName  string
 }
 
-type Party struct {
+type ParentParty struct {
 	PartyID uuid.UUID
 	Name    string
 }
-
-type Person struct {
-	PartyID   uuid.UUID
-	Name      string
-	FirstName string
-	LastName  string
-}
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go
index fe4b5e86fa..20f0a16369 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/go/query.sql.go
@@ -9,46 +9,19 @@ import (
 	"context"
 )
 
-const getAllOrganisations = `-- name: GetAllOrganisations :many
-SELECT party_id, name, legal_name FROM organisation
-`
-
-func (q *Queries) GetAllOrganisations(ctx context.Context) ([]Organisation, error) {
-	rows, err := q.db.QueryContext(ctx, getAllOrganisations)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []Organisation
-	for rows.Next() {
-		var i Organisation
-		if err := rows.Scan(&i.PartyID, &i.Name, &i.LegalName); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getAllParties = `-- name: GetAllParties :many
-SELECT party_id, name FROM party
+SELECT party_id, name FROM parent.party
 `
 
-func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
+func (q *Queries) GetAllParties(ctx context.Context) ([]ParentParty, error) {
 	rows, err := q.db.QueryContext(ctx, getAllParties)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []Party
+	var items []ParentParty
 	for rows.Next() {
-		var i Party
+		var i ParentParty
 		if err := rows.Scan(&i.PartyID, &i.Name); err != nil {
 			return nil, err
 		}
@@ -64,18 +37,18 @@ func (q *Queries) GetAllParties(ctx context.Context) ([]Party, error) {
 }
 
 const getAllPeople = `-- name: GetAllPeople :many
-SELECT party_id, name, first_name, last_name FROM person
+SELECT party_id, name, first_name, last_name FROM child.person
 `
 
-func (q *Queries) GetAllPeople(ctx context.Context) ([]Person, error) {
+func (q *Queries) GetAllPeople(ctx context.Context) ([]ChildPerson, error) {
 	rows, err := q.db.QueryContext(ctx, getAllPeople)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []Person
+	var items []ChildPerson
 	for rows.Next() {
-		var i Person
+		var i ChildPerson
 		if err := rows.Scan(
 			&i.PartyID,
 			&i.Name,
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
index 17511d3e13..cf26f5b25b 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/query.sql
@@ -1,6 +1,6 @@
 -- name: GetAllParties :many
-SELECT * FROM one.party;
+SELECT * FROM parent.party;
 
 -- name: GetAllPeople :many
-SELECT * FROM two.person;
+SELECT * FROM child.person;
 
diff --git a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
index 24300bb2d2..03dc55d755 100644
--- a/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
+++ b/internal/endtoend/testdata/ddl_create_table_inherits_cross_schema/postgresql/stdlib/schema.sql
@@ -1,13 +1,13 @@
-CREATE SCHEMA one;
-CREATE SCHEMA two;
+CREATE SCHEMA parent;
+CREATE SCHEMA child;
 
-CREATE TABLE one.party (
+CREATE TABLE parent.party (
     party_id uuid PRIMARY KEY,
     name text NOT NULL
 );
 
-CREATE TABLE two.person (
+CREATE TABLE child.person (
     first_name text NOT NULL,
     last_name text NOT NULL
-) INHERITS (one.party);
+) INHERITS (parent.party);
 

From d28b0110623f3b9ee40073ff17d23a68efae4f7e Mon Sep 17 00:00:00 2001
From: Axel Almquist <axel.almquist@flowertech.se>
Date: Tue, 7 Oct 2025 10:19:22 +0200
Subject: [PATCH 6/6] fix: fall back to default/public schema if no schema
 present

---
 internal/sql/catalog/table.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/internal/sql/catalog/table.go b/internal/sql/catalog/table.go
index dd92850abb..6b6add0768 100644
--- a/internal/sql/catalog/table.go
+++ b/internal/sql/catalog/table.go
@@ -268,15 +268,22 @@ func (c *Catalog) createTable(stmt *ast.CreateTableStmt) error {
 	seen := make(map[string]bool)            // used to check for duplicate column names
 	for _, inheritTable := range stmt.Inherits {
 
-		inheritSchema, err := c.getSchema(inheritTable.Schema)
-		if err != nil {
-			return err
+		var inheritTableSchema *Schema
+		if inheritTable.Schema == "" {
+			inheritTableSchema = schema
+		} else {
+			inheritSchema, err := c.getSchema(inheritTable.Schema)
+			if err != nil {
+				return err
+			}
+			inheritTableSchema = inheritSchema
 		}
 
-		t, _, err := inheritSchema.getTable(inheritTable)
+		t, _, err := inheritTableSchema.getTable(inheritTable)
 		if err != nil {
 			return err
 		}
+
 		// check and ignore duplicate columns
 		for _, col := range t.Columns {
 			if notNull, ok := seen[col.Name]; ok {