Skip to content
Snippets Groups Projects
Unverified Commit 6da3a025 authored by Chris Truter's avatar Chris Truter Committed by GitHub
Browse files

Hide non-qualified fields from query validator (#46587)

parent a4df4eb7
Branches
Tags
No related merge requests found
......@@ -53,18 +53,28 @@
;; QFs not to include:
;; - Field is still active
:model/QueryField {} {:card_id card-1
:analysis_id qa-3
:analysis_id qa-1
:table "ORDERS"
:column "tax"
:table_id (mt/id :orders)
:field_id (mt/id :orders :tax)}
;; - Implicit reference
:model/QueryField {} {:card_id card-2
:analysis_id qa-3
:analysis_id qa-2
:table "T1"
:column "FA"
:table_id table-1
:field_id field-1
:explicit_reference false}
;; - No resolved table, probably an imaginary column due to Macaw bugs
:model/QueryField {} {:card_id card-3
:analysis_id qa-3
:table nil
:column "FALSE"
:table_id nil
:field_id nil
:explicit_reference true}
;; QFs to include:
:model/QueryField {} {:card_id card-1
:analysis_id qa-1
......
......@@ -28,7 +28,8 @@
[(t2/table-name :model/QueryField) :qf]
[:and
[:= :qf.card_id :c.id]
[:= :qf.explicit_reference true]])
[:= :qf.explicit_reference true]
[:not= :qf.table nil]])
(sql.helpers/left-join
[(t2/table-name :model/Field) :f]
[:= :qf.field_id :f.id])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment