Compare commits
13 Commits
6632570712
...
1.0.66
| Author | SHA1 | Date | |
|---|---|---|---|
| e340039a30 | |||
| 08768e3d42 | |||
| 6c9e6575ce | |||
| 5d11c4c92c | |||
| 25239d635b | |||
| 3bec6a6102 | |||
| 6444b300b3 | |||
| c529c8b8ea | |||
| 2f15ae3d41 | |||
| f8528aa85e | |||
| b6f383e700 | |||
| db5183930d | |||
| 6de75ba525 |
81
Cargo.lock
generated
81
Cargo.lock
generated
@ -55,6 +55,15 @@ version = "1.0.101"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea"
|
||||
|
||||
[[package]]
|
||||
name = "ar_archive_writer"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7eb93bbb63b9c227414f6eb3a0adfddca591a8ce1e9b60661bb08969b87e340b"
|
||||
dependencies = [
|
||||
"object",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.89"
|
||||
@ -874,6 +883,7 @@ dependencies = [
|
||||
"regex-syntax",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sqlparser",
|
||||
"url",
|
||||
"uuid",
|
||||
"xxhash-rust",
|
||||
@ -1040,6 +1050,15 @@ dependencies = [
|
||||
"objc2-core-foundation",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.37.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.21.3"
|
||||
@ -1377,6 +1396,16 @@ dependencies = [
|
||||
"unarray",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "psm"
|
||||
version = "0.1.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3852766467df634d74f0b2d7819bf8dc483a0eb2e3b0f50f756f9cfe8b0d18d8"
|
||||
dependencies = [
|
||||
"ar_archive_writer",
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "1.2.3"
|
||||
@ -1442,6 +1471,26 @@ dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "recursive"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e"
|
||||
dependencies = [
|
||||
"recursive-proc-macro-impl",
|
||||
"stacker",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "recursive-proc-macro-impl"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.5.18"
|
||||
@ -1669,12 +1718,35 @@ dependencies = [
|
||||
"windows-sys 0.60.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sqlparser"
|
||||
version = "0.61.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dbf5ea8d4d7c808e1af1cbabebca9a2abe603bcefc22294c5b95018d53200cb7"
|
||||
dependencies = [
|
||||
"log",
|
||||
"recursive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
|
||||
|
||||
[[package]]
|
||||
name = "stacker"
|
||||
version = "0.1.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d74a23609d509411d10e2176dc2a4346e3b4aea2e7b1869f19fdedbc71c013"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"psm",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stringprep"
|
||||
version = "0.1.5"
|
||||
@ -2323,6 +2395,15 @@ dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.59.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.60.2"
|
||||
|
||||
@ -23,6 +23,7 @@ indexmap = { version = "2.13.0", features = ["serde"] }
|
||||
moka = { version = "0.12.14", features = ["sync"] }
|
||||
xxhash-rust = { version = "0.8.15", features = ["xxh64"] }
|
||||
dashmap = "6.1.0"
|
||||
sqlparser = "0.61.0"
|
||||
|
||||
[dev-dependencies]
|
||||
pgrx-tests = "0.16.1"
|
||||
@ -38,6 +39,10 @@ crate-type = ["cdylib", "lib"]
|
||||
name = "pgrx_embed_jspg"
|
||||
path = "src/bin/pgrx_embed.rs"
|
||||
|
||||
[[bin]]
|
||||
name = "ast_explore"
|
||||
path = "src/bin/ast_explore.rs"
|
||||
|
||||
[features]
|
||||
default = ["pg18"]
|
||||
pg18 = ["pgrx/pg18", "pgrx-tests/pg18" ]
|
||||
|
||||
@ -81,6 +81,7 @@ The Merger provides an automated, high-performance graph synchronization engine
|
||||
* **The Archive Paradigm**: Data is never deleted in the Punc system. The Merger securely enforces referential integrity by toggling the `archived` Boolean flag on the base `entity` table rather than issuing SQL `DELETE` commands.
|
||||
* **Change Tracking & Reactivity**: The Merger diffs the incoming JSON against the existing database row (utilizing static, `DashMap`-cached `lk_` SELECT string templates). Every detected change is recorded into the `agreego.change` audit table, tracking the user mapping. It then natively uses `pg_notify` to broadcast a completely flat row-level diff out to the Go WebSocket server for O(1) routing.
|
||||
* **Flat Structural Beats (Unidirectional Flow)**: The Merger purposefully DOES NOT trace or hydrate outbound Foreign Keys or nested parent structures during writes. It emits completely flat, mathematically perfect structural deltas via `pg_notify` representing only the exact Postgres rows that changed. This guarantees the write-path remains O(1) lightning fast. It is the strict responsibility of the upstream Punc Framework (the Go `Speaker`) to intercept these flat beats, evaluate them against active Websocket Schema Topologies, and dynamically issue targeted `jspg_query` reads to hydrate the exact contextual subgraphs required by listening clients.
|
||||
* **Pre-Order Notification Traversal**: To support proper topological hydration on the upstream Go Framework, the Merger decouples the `pg_notify` execution from the physical database write execution. The engine collects structural changes and explicitly fires `pg_notify` SQL statements in strict **Pre-Order** (Parent -> Relations -> Children). This guarantees that WebSocket clients receive the parent entity `Beat` prior to any nested child entities, ensuring stable unidirectional data flows without hydration race conditions.
|
||||
* **Many-to-Many Graph Edge Management**: Operates seamlessly with the global `agreego.relationship` table, allowing the system to represent and merge arbitrary reified M:M relationships directionally between any two entities.
|
||||
* **Sparse Updates**: Empty JSON strings `""` are directly bound as explicit SQL `NULL` directives to clear data, whilst omitted (missing) properties skip UPDATE execution entirely, ensuring partial UI submissions do not wipe out sibling fields.
|
||||
* **Unified Return Structure**: To eliminate UI hydration race conditions and multi-user duplication, `jspg_merge` explicitly strips the response graph and returns only the root `{ "id": "uuid" }` (or an array of IDs for list insertions). External APIs can then explicitly call read APIs to fetch the resulting graph, while the UI relies 100% implicitly on the flat `pg_notify` pipeline for reactive state synchronization.
|
||||
|
||||
@ -1213,21 +1213,6 @@
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"date_of_birth\":\"2000-01-01\",",
|
||||
" \"first_name\":\"Bob\",",
|
||||
" \"id\":\"{{uuid:customer_id}}\",",
|
||||
" \"last_name\":\"Smith\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"type\":\"person\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
@ -1295,6 +1280,21 @@
|
||||
" \"type\":\"order\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"date_of_birth\":\"2000-01-01\",",
|
||||
" \"first_name\":\"Bob\",",
|
||||
" \"id\":\"{{uuid:customer_id}}\",",
|
||||
" \"last_name\":\"Smith\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"type\":\"person\"",
|
||||
" }",
|
||||
"}')"
|
||||
]
|
||||
]
|
||||
}
|
||||
@ -1409,21 +1409,6 @@
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:line_id}}\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"order_id\":\"abc\",",
|
||||
" \"price\":99.0,",
|
||||
" \"product\":\"Widget\",",
|
||||
" \"type\":\"order_line\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.change (",
|
||||
" changes,",
|
||||
@ -1457,6 +1442,21 @@
|
||||
" \"type\":\"order\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:line_id}}\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"order_id\":\"abc\",",
|
||||
" \"price\":99.0,",
|
||||
" \"product\":\"Widget\",",
|
||||
" \"type\":\"order_line\"",
|
||||
" }",
|
||||
"}')"
|
||||
]
|
||||
]
|
||||
}
|
||||
@ -1587,19 +1587,6 @@
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:phone1_id}}\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"number\":\"555-0001\",",
|
||||
" \"type\":\"phone_number\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
@ -1661,23 +1648,6 @@
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:contact1_id}}\",",
|
||||
" \"is_primary\":true,",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"source_id\":\"{{uuid:person_id}}\",",
|
||||
" \"source_type\":\"person\",",
|
||||
" \"target_id\":\"{{uuid:phone1_id}}\",",
|
||||
" \"target_type\":\"phone_number\",",
|
||||
" \"type\":\"contact\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
@ -1722,19 +1692,6 @@
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:phone2_id}}\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"number\":\"555-0002\",",
|
||||
" \"type\":\"phone_number\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
@ -1796,23 +1753,6 @@
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:contact2_id}}\",",
|
||||
" \"is_primary\":false,",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"source_id\":\"{{uuid:person_id}}\",",
|
||||
" \"source_type\":\"person\",",
|
||||
" \"target_id\":\"{{uuid:phone2_id}}\",",
|
||||
" \"target_type\":\"phone_number\",",
|
||||
" \"type\":\"contact\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
@ -1857,19 +1797,6 @@
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"address\":\"test@example.com\",",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:email1_id}}\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"type\":\"email_address\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
@ -1931,23 +1858,6 @@
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:contact3_id}}\",",
|
||||
" \"is_primary\":false,",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"source_id\":\"{{uuid:person_id}}\",",
|
||||
" \"source_type\":\"person\",",
|
||||
" \"target_id\":\"{{uuid:email1_id}}\",",
|
||||
" \"target_type\":\"email_address\",",
|
||||
" \"type\":\"contact\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.change (",
|
||||
" changes,",
|
||||
@ -1982,6 +1892,96 @@
|
||||
" \"type\":\"person\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:contact1_id}}\",",
|
||||
" \"is_primary\":true,",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"source_id\":\"{{uuid:person_id}}\",",
|
||||
" \"source_type\":\"person\",",
|
||||
" \"target_id\":\"{{uuid:phone1_id}}\",",
|
||||
" \"target_type\":\"phone_number\",",
|
||||
" \"type\":\"contact\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:phone1_id}}\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"number\":\"555-0001\",",
|
||||
" \"type\":\"phone_number\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:contact2_id}}\",",
|
||||
" \"is_primary\":false,",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"source_id\":\"{{uuid:person_id}}\",",
|
||||
" \"source_type\":\"person\",",
|
||||
" \"target_id\":\"{{uuid:phone2_id}}\",",
|
||||
" \"target_type\":\"phone_number\",",
|
||||
" \"type\":\"contact\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:phone2_id}}\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"number\":\"555-0002\",",
|
||||
" \"type\":\"phone_number\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:contact3_id}}\",",
|
||||
" \"is_primary\":false,",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"source_id\":\"{{uuid:person_id}}\",",
|
||||
" \"source_type\":\"person\",",
|
||||
" \"target_id\":\"{{uuid:email1_id}}\",",
|
||||
" \"target_type\":\"email_address\",",
|
||||
" \"type\":\"contact\"",
|
||||
" }",
|
||||
"}')"
|
||||
],
|
||||
[
|
||||
"SELECT pg_notify('entity', '{",
|
||||
" \"complete\":{",
|
||||
" \"address\":\"test@example.com\",",
|
||||
" \"created_at\":\"{{timestamp}}\",",
|
||||
" \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"id\":\"{{uuid:email1_id}}\",",
|
||||
" \"modified_at\":\"{{timestamp}}\",",
|
||||
" \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"type\":\"email_address\"",
|
||||
" }",
|
||||
"}')"
|
||||
]
|
||||
]
|
||||
}
|
||||
|
||||
@ -2,7 +2,17 @@
|
||||
{
|
||||
"description": "Queryer Execution",
|
||||
"database": {
|
||||
"puncs": [],
|
||||
"puncs": [
|
||||
{
|
||||
"name": "get_entities",
|
||||
"schemas": [
|
||||
{
|
||||
"$id": "get_entities.response",
|
||||
"$family": "entity"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"enums": [],
|
||||
"relations": [
|
||||
{
|
||||
@ -109,6 +119,9 @@
|
||||
"created_at": {
|
||||
"type": "string",
|
||||
"format": "date-time"
|
||||
},
|
||||
"created": {
|
||||
"type": "boolean"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -119,6 +132,18 @@
|
||||
"name",
|
||||
"archived",
|
||||
"created_at"
|
||||
],
|
||||
"variations": [
|
||||
"address",
|
||||
"contact",
|
||||
"email_address",
|
||||
"entity",
|
||||
"order",
|
||||
"order_line",
|
||||
"organization",
|
||||
"person",
|
||||
"phone_number",
|
||||
"relationship"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -237,6 +262,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"variations": [
|
||||
"person"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -289,6 +317,10 @@
|
||||
"$ref": "entity",
|
||||
"properties": {}
|
||||
}
|
||||
],
|
||||
"variations": [
|
||||
"contact",
|
||||
"relationship"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -351,6 +383,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"variations": [
|
||||
"contact"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -397,6 +432,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"variations": [
|
||||
"phone_number"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -443,6 +481,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"variations": [
|
||||
"email_address"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -489,6 +530,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"variations": [
|
||||
"address"
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -529,6 +573,7 @@
|
||||
"fields": [
|
||||
"id",
|
||||
"type",
|
||||
"name",
|
||||
"total",
|
||||
"customer_id",
|
||||
"created_at",
|
||||
@ -547,6 +592,7 @@
|
||||
"entity": [
|
||||
"id",
|
||||
"type",
|
||||
"name",
|
||||
"created_at",
|
||||
"created_by",
|
||||
"modified_at",
|
||||
@ -562,6 +608,7 @@
|
||||
"field_types": {
|
||||
"id": "uuid",
|
||||
"type": "text",
|
||||
"name": "text",
|
||||
"archived": "boolean",
|
||||
"total": "numeric",
|
||||
"customer_id": "uuid",
|
||||
@ -569,7 +616,10 @@
|
||||
"created_by": "uuid",
|
||||
"modified_at": "timestamptz",
|
||||
"modified_by": "uuid"
|
||||
}
|
||||
},
|
||||
"variations": [
|
||||
"order"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "order_line",
|
||||
@ -597,6 +647,7 @@
|
||||
"fields": [
|
||||
"id",
|
||||
"type",
|
||||
"name",
|
||||
"order_id",
|
||||
"product",
|
||||
"price",
|
||||
@ -617,6 +668,7 @@
|
||||
"entity": [
|
||||
"id",
|
||||
"type",
|
||||
"name",
|
||||
"created_at",
|
||||
"created_by",
|
||||
"modified_at",
|
||||
@ -630,6 +682,7 @@
|
||||
"field_types": {
|
||||
"id": "uuid",
|
||||
"type": "text",
|
||||
"name": "text",
|
||||
"archived": "boolean",
|
||||
"order_id": "uuid",
|
||||
"product": "text",
|
||||
@ -638,7 +691,73 @@
|
||||
"created_by": "uuid",
|
||||
"modified_at": "timestamptz",
|
||||
"modified_by": "uuid"
|
||||
},
|
||||
"variations": [
|
||||
"order_line"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "organization",
|
||||
"hierarchy": [
|
||||
"organization",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
"type",
|
||||
"name",
|
||||
"archived",
|
||||
"created_at"
|
||||
],
|
||||
"grouped_fields": {
|
||||
"entity": [
|
||||
"id",
|
||||
"type",
|
||||
"name",
|
||||
"archived",
|
||||
"created_at"
|
||||
],
|
||||
"organization": []
|
||||
},
|
||||
"field_types": {
|
||||
"id": "uuid",
|
||||
"type": "text",
|
||||
"archived": "boolean",
|
||||
"name": "text",
|
||||
"created_at": "timestamptz"
|
||||
},
|
||||
"lookup_fields": [
|
||||
"id"
|
||||
],
|
||||
"null_fields": [],
|
||||
"default_fields": [
|
||||
"id",
|
||||
"type",
|
||||
"created_at",
|
||||
"archived"
|
||||
],
|
||||
"variations": [
|
||||
"organization"
|
||||
]
|
||||
}
|
||||
],
|
||||
"schemas": [
|
||||
{
|
||||
"$id": "entity",
|
||||
"type": "object",
|
||||
"properties": {}
|
||||
},
|
||||
{
|
||||
"$id": "organization",
|
||||
"type": "object",
|
||||
"$ref": "entity",
|
||||
"properties": {}
|
||||
},
|
||||
{
|
||||
"$id": "person",
|
||||
"type": "object",
|
||||
"$ref": "base.person",
|
||||
"properties": {}
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -820,7 +939,7 @@
|
||||
" JOIN agreego.entity t1_obj_t2_addresses_t3_target_t2 ON t1_obj_t2_addresses_t3_target_t2.id = t1_obj_t2_addresses_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_addresses_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_addresses_t3_target_t1.parent_id = t1_obj_t2_addresses_t3.id",
|
||||
" AND t1_obj_t2_addresses_t3_target_t1.id = t1_obj_t2_addresses_t3.target_id",
|
||||
" ),",
|
||||
" 'type', t1_obj_t2_addresses_t3.type",
|
||||
" )), '[]'::jsonb)",
|
||||
@ -839,7 +958,54 @@
|
||||
" 'id', t1_obj_t2_contacts_t3.id,",
|
||||
" 'is_primary', t1_obj_t2_contacts_t1.is_primary,",
|
||||
" 'name', t1_obj_t2_contacts_t3.name,",
|
||||
" 'target', t1_obj_t2_contacts_t3.target,",
|
||||
" 'target', CASE",
|
||||
" WHEN t1_obj_t2_contacts_t3.target_type = 'phone_number' THEN",
|
||||
" ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t2_contacts_t3_target_t2.archived,",
|
||||
" 'created_at', t1_obj_t2_contacts_t3_target_t2.created_at,",
|
||||
" 'id', t1_obj_t2_contacts_t3_target_t2.id,",
|
||||
" 'name', t1_obj_t2_contacts_t3_target_t2.name,",
|
||||
" 'number', t1_obj_t2_contacts_t3_target_t1.number,",
|
||||
" 'type', t1_obj_t2_contacts_t3_target_t2.type",
|
||||
" )",
|
||||
" FROM agreego.phone_number t1_obj_t2_contacts_t3_target_t1",
|
||||
" JOIN agreego.entity t1_obj_t2_contacts_t3_target_t2 ON t1_obj_t2_contacts_t3_target_t2.id = t1_obj_t2_contacts_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_contacts_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_contacts_t3_target_t1.id = t1_obj_t2_contacts_t3.target_id",
|
||||
" ))",
|
||||
" WHEN t1_obj_t2_contacts_t3.target_type = 'email_address' THEN",
|
||||
" ((SELECT jsonb_build_object(",
|
||||
" 'address', t1_obj_t2_contacts_t3_target_t1.address,",
|
||||
" 'archived', t1_obj_t2_contacts_t3_target_t2.archived,",
|
||||
" 'created_at', t1_obj_t2_contacts_t3_target_t2.created_at,",
|
||||
" 'id', t1_obj_t2_contacts_t3_target_t2.id,",
|
||||
" 'name', t1_obj_t2_contacts_t3_target_t2.name,",
|
||||
" 'type', t1_obj_t2_contacts_t3_target_t2.type",
|
||||
" )",
|
||||
" FROM agreego.email_address t1_obj_t2_contacts_t3_target_t1",
|
||||
" JOIN agreego.entity t1_obj_t2_contacts_t3_target_t2 ON t1_obj_t2_contacts_t3_target_t2.id = t1_obj_t2_contacts_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_contacts_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_contacts_t3_target_t1.id = t1_obj_t2_contacts_t3.target_id",
|
||||
" ))",
|
||||
" WHEN t1_obj_t2_contacts_t3.target_type = 'address' THEN",
|
||||
" ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t2_contacts_t3_target_t2.archived,",
|
||||
" 'city', t1_obj_t2_contacts_t3_target_t1.city,",
|
||||
" 'created_at', t1_obj_t2_contacts_t3_target_t2.created_at,",
|
||||
" 'id', t1_obj_t2_contacts_t3_target_t2.id,",
|
||||
" 'name', t1_obj_t2_contacts_t3_target_t2.name,",
|
||||
" 'type', t1_obj_t2_contacts_t3_target_t2.type",
|
||||
" )",
|
||||
" FROM agreego.address t1_obj_t2_contacts_t3_target_t1",
|
||||
" JOIN agreego.entity t1_obj_t2_contacts_t3_target_t2 ON t1_obj_t2_contacts_t3_target_t2.id = t1_obj_t2_contacts_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_contacts_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_contacts_t3_target_t1.id = t1_obj_t2_contacts_t3.target_id",
|
||||
" ))",
|
||||
" ELSE NULL",
|
||||
" END,",
|
||||
" 'type', t1_obj_t2_contacts_t3.type",
|
||||
" )), '[]'::jsonb)",
|
||||
" FROM agreego.contact t1_obj_t2_contacts_t1",
|
||||
@ -869,7 +1035,7 @@
|
||||
" JOIN agreego.entity t1_obj_t2_email_addresses_t3_target_t2 ON t1_obj_t2_email_addresses_t3_target_t2.id = t1_obj_t2_email_addresses_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_email_addresses_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_email_addresses_t3_target_t1.parent_id = t1_obj_t2_email_addresses_t3.id",
|
||||
" AND t1_obj_t2_email_addresses_t3_target_t1.id = t1_obj_t2_email_addresses_t3.target_id",
|
||||
" ),",
|
||||
" 'type', t1_obj_t2_email_addresses_t3.type",
|
||||
" )), '[]'::jsonb)",
|
||||
@ -903,7 +1069,7 @@
|
||||
" JOIN agreego.entity t1_obj_t2_phone_numbers_t3_target_t2 ON t1_obj_t2_phone_numbers_t3_target_t2.id = t1_obj_t2_phone_numbers_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_phone_numbers_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_phone_numbers_t3_target_t1.parent_id = t1_obj_t2_phone_numbers_t3.id",
|
||||
" AND t1_obj_t2_phone_numbers_t3_target_t1.id = t1_obj_t2_phone_numbers_t3.target_id",
|
||||
" ),",
|
||||
" 'type', t1_obj_t2_phone_numbers_t3.type",
|
||||
" )), '[]'::jsonb)",
|
||||
@ -947,6 +1113,9 @@
|
||||
"$eq": true,
|
||||
"$ne": false
|
||||
},
|
||||
"contacts.#.is_primary": {
|
||||
"$eq": true
|
||||
},
|
||||
"created_at": {
|
||||
"$eq": "2020-01-01T00:00:00Z",
|
||||
"$gt": "2019-01-01T00:00:00Z",
|
||||
@ -970,10 +1139,6 @@
|
||||
"Bob"
|
||||
]
|
||||
},
|
||||
"last_name": {
|
||||
"$eq": "%Doe%",
|
||||
"$ne": "%Smith%"
|
||||
},
|
||||
"id": {
|
||||
"$eq": "00000000-0000-0000-0000-000000000001",
|
||||
"$in": [
|
||||
@ -983,6 +1148,13 @@
|
||||
"$nin": [
|
||||
"00000000-0000-0000-0000-000000000002"
|
||||
]
|
||||
},
|
||||
"last_name": {
|
||||
"$eq": "%Doe%",
|
||||
"$ne": "%Smith%"
|
||||
},
|
||||
"phone_numbers.#.target.number": {
|
||||
"$eq": "555-1234"
|
||||
}
|
||||
},
|
||||
"expect": {
|
||||
@ -1010,7 +1182,7 @@
|
||||
" JOIN agreego.entity t1_obj_t2_addresses_t3_target_t2 ON t1_obj_t2_addresses_t3_target_t2.id = t1_obj_t2_addresses_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_addresses_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_addresses_t3_target_t1.parent_id = t1_obj_t2_addresses_t3.id",
|
||||
" AND t1_obj_t2_addresses_t3_target_t1.id = t1_obj_t2_addresses_t3.target_id",
|
||||
" ),",
|
||||
" 'type', t1_obj_t2_addresses_t3.type",
|
||||
" )), '[]'::jsonb)",
|
||||
@ -1029,7 +1201,54 @@
|
||||
" 'id', t1_obj_t2_contacts_t3.id,",
|
||||
" 'is_primary', t1_obj_t2_contacts_t1.is_primary,",
|
||||
" 'name', t1_obj_t2_contacts_t3.name,",
|
||||
" 'target', t1_obj_t2_contacts_t3.target,",
|
||||
" 'target', CASE",
|
||||
" WHEN t1_obj_t2_contacts_t3.target_type = 'phone_number' THEN",
|
||||
" ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t2_contacts_t3_target_t2.archived,",
|
||||
" 'created_at', t1_obj_t2_contacts_t3_target_t2.created_at,",
|
||||
" 'id', t1_obj_t2_contacts_t3_target_t2.id,",
|
||||
" 'name', t1_obj_t2_contacts_t3_target_t2.name,",
|
||||
" 'number', t1_obj_t2_contacts_t3_target_t1.number,",
|
||||
" 'type', t1_obj_t2_contacts_t3_target_t2.type",
|
||||
" )",
|
||||
" FROM agreego.phone_number t1_obj_t2_contacts_t3_target_t1",
|
||||
" JOIN agreego.entity t1_obj_t2_contacts_t3_target_t2 ON t1_obj_t2_contacts_t3_target_t2.id = t1_obj_t2_contacts_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_contacts_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_contacts_t3_target_t1.id = t1_obj_t2_contacts_t3.target_id",
|
||||
" ))",
|
||||
" WHEN t1_obj_t2_contacts_t3.target_type = 'email_address' THEN",
|
||||
" ((SELECT jsonb_build_object(",
|
||||
" 'address', t1_obj_t2_contacts_t3_target_t1.address,",
|
||||
" 'archived', t1_obj_t2_contacts_t3_target_t2.archived,",
|
||||
" 'created_at', t1_obj_t2_contacts_t3_target_t2.created_at,",
|
||||
" 'id', t1_obj_t2_contacts_t3_target_t2.id,",
|
||||
" 'name', t1_obj_t2_contacts_t3_target_t2.name,",
|
||||
" 'type', t1_obj_t2_contacts_t3_target_t2.type",
|
||||
" )",
|
||||
" FROM agreego.email_address t1_obj_t2_contacts_t3_target_t1",
|
||||
" JOIN agreego.entity t1_obj_t2_contacts_t3_target_t2 ON t1_obj_t2_contacts_t3_target_t2.id = t1_obj_t2_contacts_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_contacts_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_contacts_t3_target_t1.id = t1_obj_t2_contacts_t3.target_id",
|
||||
" ))",
|
||||
" WHEN t1_obj_t2_contacts_t3.target_type = 'address' THEN",
|
||||
" ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t2_contacts_t3_target_t2.archived,",
|
||||
" 'city', t1_obj_t2_contacts_t3_target_t1.city,",
|
||||
" 'created_at', t1_obj_t2_contacts_t3_target_t2.created_at,",
|
||||
" 'id', t1_obj_t2_contacts_t3_target_t2.id,",
|
||||
" 'name', t1_obj_t2_contacts_t3_target_t2.name,",
|
||||
" 'type', t1_obj_t2_contacts_t3_target_t2.type",
|
||||
" )",
|
||||
" FROM agreego.address t1_obj_t2_contacts_t3_target_t1",
|
||||
" JOIN agreego.entity t1_obj_t2_contacts_t3_target_t2 ON t1_obj_t2_contacts_t3_target_t2.id = t1_obj_t2_contacts_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_contacts_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_contacts_t3_target_t1.id = t1_obj_t2_contacts_t3.target_id",
|
||||
" ))",
|
||||
" ELSE NULL",
|
||||
" END,",
|
||||
" 'type', t1_obj_t2_contacts_t3.type",
|
||||
" )), '[]'::jsonb)",
|
||||
" FROM agreego.contact t1_obj_t2_contacts_t1",
|
||||
@ -1037,6 +1256,7 @@
|
||||
" JOIN agreego.entity t1_obj_t2_contacts_t3 ON t1_obj_t2_contacts_t3.id = t1_obj_t2_contacts_t2.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_contacts_t1.archived",
|
||||
" AND t1_obj_t2_contacts_t1.is_primary = ($11#>>'{}')::boolean",
|
||||
" AND t1_obj_t2_contacts_t1.parent_id = t1_obj_t2.id),",
|
||||
" 'created_at', t1_obj_t2.created_at,",
|
||||
" 'email_addresses',",
|
||||
@ -1059,7 +1279,7 @@
|
||||
" JOIN agreego.entity t1_obj_t2_email_addresses_t3_target_t2 ON t1_obj_t2_email_addresses_t3_target_t2.id = t1_obj_t2_email_addresses_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_email_addresses_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_email_addresses_t3_target_t1.parent_id = t1_obj_t2_email_addresses_t3.id",
|
||||
" AND t1_obj_t2_email_addresses_t3_target_t1.id = t1_obj_t2_email_addresses_t3.target_id",
|
||||
" ),",
|
||||
" 'type', t1_obj_t2_email_addresses_t3.type",
|
||||
" )), '[]'::jsonb)",
|
||||
@ -1093,7 +1313,8 @@
|
||||
" JOIN agreego.entity t1_obj_t2_phone_numbers_t3_target_t2 ON t1_obj_t2_phone_numbers_t3_target_t2.id = t1_obj_t2_phone_numbers_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t2_phone_numbers_t3_target_t1.archived",
|
||||
" AND t1_obj_t2_phone_numbers_t3_target_t1.parent_id = t1_obj_t2_phone_numbers_t3.id",
|
||||
" AND t1_obj_t2_phone_numbers_t3_target_t1.number ILIKE $32#>>'{}'",
|
||||
" AND t1_obj_t2_phone_numbers_t3_target_t1.id = t1_obj_t2_phone_numbers_t3.target_id",
|
||||
" ),",
|
||||
" 'type', t1_obj_t2_phone_numbers_t3.type",
|
||||
" )), '[]'::jsonb)",
|
||||
@ -1119,26 +1340,26 @@
|
||||
" AND t1_obj_t1.age NOT IN (SELECT value::numeric FROM jsonb_array_elements_text(($8#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t2.archived = ($9#>>'{}')::boolean",
|
||||
" AND t1_obj_t2.archived != ($10#>>'{}')::boolean",
|
||||
" AND t1_obj_t2.created_at = ($11#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at > ($12#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at >= ($13#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at < ($14#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at <= ($15#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at != ($16#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t1.first_name ILIKE $17#>>'{}'",
|
||||
" AND t1_obj_t1.first_name > ($18#>>'{}')",
|
||||
" AND t1_obj_t1.first_name >= ($19#>>'{}')",
|
||||
" AND t1_obj_t1.first_name IN (SELECT value FROM jsonb_array_elements_text(($20#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t1.first_name < ($21#>>'{}')",
|
||||
" AND t1_obj_t1.first_name <= ($22#>>'{}')",
|
||||
" AND t1_obj_t1.first_name NOT ILIKE $23#>>'{}'",
|
||||
" AND t1_obj_t1.first_name NOT IN (SELECT value FROM jsonb_array_elements_text(($24#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t2.id = ($25#>>'{}')::uuid",
|
||||
" AND t1_obj_t2.id IN (SELECT value::uuid FROM jsonb_array_elements_text(($26#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t2.id != ($27#>>'{}')::uuid",
|
||||
" AND t1_obj_t2.id NOT IN (SELECT value::uuid FROM jsonb_array_elements_text(($28#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t1.last_name ILIKE $29#>>'{}'",
|
||||
" AND t1_obj_t1.last_name NOT ILIKE $30#>>'{}'",
|
||||
" AND t1_obj_t2.created_at = ($12#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at > ($13#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at >= ($14#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at < ($15#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at <= ($16#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t2.created_at != ($17#>>'{}')::timestamptz",
|
||||
" AND t1_obj_t1.first_name ILIKE $18#>>'{}'",
|
||||
" AND t1_obj_t1.first_name > ($19#>>'{}')",
|
||||
" AND t1_obj_t1.first_name >= ($20#>>'{}')",
|
||||
" AND t1_obj_t1.first_name IN (SELECT value FROM jsonb_array_elements_text(($21#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t1.first_name < ($22#>>'{}')",
|
||||
" AND t1_obj_t1.first_name <= ($23#>>'{}')",
|
||||
" AND t1_obj_t1.first_name NOT ILIKE $24#>>'{}'",
|
||||
" AND t1_obj_t1.first_name NOT IN (SELECT value FROM jsonb_array_elements_text(($25#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t2.id = ($26#>>'{}')::uuid",
|
||||
" AND t1_obj_t2.id IN (SELECT value::uuid FROM jsonb_array_elements_text(($27#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t2.id != ($28#>>'{}')::uuid",
|
||||
" AND t1_obj_t2.id NOT IN (SELECT value::uuid FROM jsonb_array_elements_text(($29#>>'{}')::jsonb))",
|
||||
" AND t1_obj_t1.last_name ILIKE $30#>>'{}'",
|
||||
" AND t1_obj_t1.last_name NOT ILIKE $31#>>'{}'",
|
||||
")"
|
||||
]
|
||||
]
|
||||
@ -1172,7 +1393,7 @@
|
||||
" JOIN agreego.entity t1_obj_t3_target_t2 ON t1_obj_t3_target_t2.id = t1_obj_t3_target_t1.id",
|
||||
" WHERE",
|
||||
" NOT t1_obj_t3_target_t1.archived",
|
||||
" AND t1_obj_t3_target_t1.parent_id = t1_obj_t3.id),",
|
||||
" AND t1_obj_t3_target_t1.id = t1_obj_t3.target_id),",
|
||||
" 'type', t1_obj_t3.type",
|
||||
")",
|
||||
"FROM agreego.contact t1_obj_t1",
|
||||
@ -1284,6 +1505,125 @@
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"description": "Base entity family select on polymorphic tree",
|
||||
"action": "query",
|
||||
"schema_id": "get_entities.response",
|
||||
"expect": {
|
||||
"success": true,
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT jsonb_build_object(",
|
||||
" 'id', t1_obj_t1.id,",
|
||||
" 'type', CASE WHEN t1_obj_t1.type = 'address' THEN ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t1_obj_t2.archived,",
|
||||
" 'city', t1_obj_t1_obj_t1.city,",
|
||||
" 'created_at', t1_obj_t1_obj_t2.created_at,",
|
||||
" 'id', t1_obj_t1_obj_t2.id,",
|
||||
" 'name', t1_obj_t1_obj_t2.name,",
|
||||
" 'type', t1_obj_t1_obj_t2.type)",
|
||||
" FROM agreego.address t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'contact' THEN ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t1_obj_t3.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t3.created_at,",
|
||||
" 'id', t1_obj_t1_obj_t3.id,",
|
||||
" 'is_primary', t1_obj_t1_obj_t1.is_primary,",
|
||||
" 'name', t1_obj_t1_obj_t3.name,",
|
||||
" 'type', t1_obj_t1_obj_t3.type)",
|
||||
" FROM agreego.contact t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.relationship t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t3 ON t1_obj_t1_obj_t3.id = t1_obj_t1_obj_t2.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'email_address' THEN ((SELECT jsonb_build_object(",
|
||||
" 'address', t1_obj_t1_obj_t1.address,",
|
||||
" 'archived', t1_obj_t1_obj_t2.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t2.created_at,",
|
||||
" 'id', t1_obj_t1_obj_t2.id,",
|
||||
" 'name', t1_obj_t1_obj_t2.name,",
|
||||
" 'type', t1_obj_t1_obj_t2.type)",
|
||||
" FROM agreego.email_address t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'entity' THEN ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t1_obj_t1.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t1.created_at,",
|
||||
" 'id', t1_obj_t1_obj_t1.id,",
|
||||
" 'name', t1_obj_t1_obj_t1.name,",
|
||||
" 'type', t1_obj_t1_obj_t1.type)",
|
||||
" FROM agreego.entity t1_obj_t1_obj_t1",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'order' THEN ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t1_obj_t2.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t2.created_at,",
|
||||
" 'customer_id', t1_obj_t1_obj_t1.customer_id,",
|
||||
" 'id', t1_obj_t1_obj_t2.id,",
|
||||
" 'name', t1_obj_t1_obj_t2.name,",
|
||||
" 'total', t1_obj_t1_obj_t1.total,",
|
||||
" 'type', t1_obj_t1_obj_t2.type)",
|
||||
" FROM agreego.order t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'order_line' THEN ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t1_obj_t2.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t2.created_at,",
|
||||
" 'id', t1_obj_t1_obj_t2.id,",
|
||||
" 'name', t1_obj_t1_obj_t2.name,",
|
||||
" 'order_id', t1_obj_t1_obj_t1.order_id,",
|
||||
" 'price', t1_obj_t1_obj_t1.price,",
|
||||
" 'product', t1_obj_t1_obj_t1.product,",
|
||||
" 'type', t1_obj_t1_obj_t2.type)",
|
||||
" FROM agreego.order_line t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'organization' THEN ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t1_obj_t2.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t2.created_at,",
|
||||
" 'id', t1_obj_t1_obj_t2.id,",
|
||||
" 'name', t1_obj_t1_obj_t2.name,",
|
||||
" 'type', t1_obj_t1_obj_t2.type)",
|
||||
" FROM agreego.organization t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'person' THEN ((SELECT jsonb_build_object(",
|
||||
" 'age', t1_obj_t1_obj_t1.age,",
|
||||
" 'archived', t1_obj_t1_obj_t2.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t2.created_at,",
|
||||
" 'first_name', t1_obj_t1_obj_t1.first_name,",
|
||||
" 'id', t1_obj_t1_obj_t2.id,",
|
||||
" 'last_name', t1_obj_t1_obj_t1.last_name,",
|
||||
" 'name', t1_obj_t1_obj_t2.name,",
|
||||
" 'type', t1_obj_t1_obj_t2.type)",
|
||||
" FROM agreego.person t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'phone_number' THEN ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t1_obj_t2.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t2.created_at,",
|
||||
" 'id', t1_obj_t1_obj_t2.id,",
|
||||
" 'name', t1_obj_t1_obj_t2.name,",
|
||||
" 'number', t1_obj_t1_obj_t1.number,",
|
||||
" 'type', t1_obj_t1_obj_t2.type)",
|
||||
" FROM agreego.phone_number t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" WHEN t1_obj_t1.type = 'relationship' THEN ((SELECT jsonb_build_object(",
|
||||
" 'archived', t1_obj_t1_obj_t2.archived,",
|
||||
" 'created_at', t1_obj_t1_obj_t2.created_at,",
|
||||
" 'id', t1_obj_t1_obj_t2.id,",
|
||||
" 'name', t1_obj_t1_obj_t2.name,",
|
||||
" 'type', t1_obj_t1_obj_t2.type)",
|
||||
" FROM agreego.relationship t1_obj_t1_obj_t1",
|
||||
" JOIN agreego.entity t1_obj_t1_obj_t2 ON t1_obj_t1_obj_t2.id = t1_obj_t1_obj_t1.id",
|
||||
" WHERE NOT t1_obj_t1_obj_t1.archived))",
|
||||
" ELSE NULL END)",
|
||||
"FROM agreego.entity t1_obj_t1",
|
||||
"WHERE NOT t1_obj_t1.archived)"
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
17
src/bin/ast_explore.rs
Normal file
17
src/bin/ast_explore.rs
Normal file
@ -0,0 +1,17 @@
|
||||
use sqlparser::dialect::PostgreSqlDialect;
|
||||
use sqlparser::parser::Parser;
|
||||
use std::env;
|
||||
|
||||
fn main() {
|
||||
let sql = "SELECT t1_obj_t1_addresses_t1_target_t2.archived, t1.id FROM person t1 JOIN address t1_obj_t1_addresses ON true";
|
||||
let dialect = PostgreSqlDialect {};
|
||||
|
||||
match Parser::parse_sql(&dialect, sql) {
|
||||
Ok(ast) => {
|
||||
println!("{:#?}", ast);
|
||||
}
|
||||
Err(e) => {
|
||||
println!("Error: {:?}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
23
src/lib.rs
23
src/lib.rs
@ -110,6 +110,24 @@ pub fn jspg_validate(schema_id: &str, instance: JsonB) -> JsonB {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg_attr(not(test), pg_extern)]
|
||||
pub fn jspg_schemas() -> JsonB {
|
||||
let engine_opt = {
|
||||
let lock = GLOBAL_JSPG.read().unwrap();
|
||||
lock.clone()
|
||||
};
|
||||
|
||||
match engine_opt {
|
||||
Some(engine) => {
|
||||
let schemas_json = serde_json::to_value(&engine.database.schemas)
|
||||
.unwrap_or(serde_json::Value::Object(serde_json::Map::new()));
|
||||
let drop = crate::drop::Drop::success_with_val(schemas_json);
|
||||
JsonB(serde_json::to_value(drop).unwrap())
|
||||
}
|
||||
None => jspg_failure(),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg_attr(not(test), pg_extern)]
|
||||
pub fn jspg_stems() -> JsonB {
|
||||
let engine_opt = {
|
||||
@ -121,9 +139,10 @@ pub fn jspg_stems() -> JsonB {
|
||||
Some(engine) => {
|
||||
let stems_json = serde_json::to_value(&engine.database.stems)
|
||||
.unwrap_or(serde_json::Value::Object(serde_json::Map::new()));
|
||||
JsonB(stems_json)
|
||||
let drop = crate::drop::Drop::success_with_val(stems_json);
|
||||
JsonB(serde_json::to_value(drop).unwrap())
|
||||
}
|
||||
None => JsonB(serde_json::Value::Object(serde_json::Map::new())),
|
||||
None => jspg_failure(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -21,9 +21,40 @@ impl Merger {
|
||||
}
|
||||
|
||||
pub fn merge(&self, data: Value) -> crate::drop::Drop {
|
||||
match self.merge_internal(data) {
|
||||
let mut val_resolved = Value::Null;
|
||||
let mut notifications_queue = Vec::new();
|
||||
|
||||
let result = self.merge_internal(data, &mut notifications_queue);
|
||||
|
||||
match result {
|
||||
Ok(val) => {
|
||||
let stripped_val = match val {
|
||||
val_resolved = val;
|
||||
}
|
||||
Err(msg) => {
|
||||
return crate::drop::Drop::with_errors(vec![crate::drop::Error {
|
||||
code: "MERGE_FAILED".to_string(),
|
||||
message: msg,
|
||||
details: crate::drop::ErrorDetails {
|
||||
path: "".to_string(),
|
||||
},
|
||||
}]);
|
||||
}
|
||||
};
|
||||
|
||||
// Execute the globally collected, pre-ordered notifications last!
|
||||
for notify_sql in notifications_queue {
|
||||
if let Err(e) = self.db.execute(¬ify_sql, None) {
|
||||
return crate::drop::Drop::with_errors(vec![crate::drop::Error {
|
||||
code: "MERGE_FAILED".to_string(),
|
||||
message: format!("Executor Error in pre-ordered notify: {:?}", e),
|
||||
details: crate::drop::ErrorDetails {
|
||||
path: "".to_string(),
|
||||
},
|
||||
}]);
|
||||
}
|
||||
}
|
||||
|
||||
let stripped_val = match val_resolved {
|
||||
Value::Object(mut map) => {
|
||||
let mut out = serde_json::Map::new();
|
||||
if let Some(id) = map.remove("id") {
|
||||
@ -50,34 +81,27 @@ impl Merger {
|
||||
};
|
||||
crate::drop::Drop::success_with_val(stripped_val)
|
||||
}
|
||||
Err(msg) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
|
||||
code: "MERGE_FAILED".to_string(),
|
||||
message: msg,
|
||||
details: crate::drop::ErrorDetails {
|
||||
path: "".to_string(),
|
||||
},
|
||||
}]),
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn merge_internal(&self, data: Value) -> Result<Value, String> {
|
||||
pub(crate) fn merge_internal(&self, data: Value, notifications: &mut Vec<String>) -> Result<Value, String> {
|
||||
match data {
|
||||
Value::Array(items) => self.merge_array(items),
|
||||
Value::Object(map) => self.merge_object(map),
|
||||
Value::Array(items) => self.merge_array(items, notifications),
|
||||
Value::Object(map) => self.merge_object(map, notifications),
|
||||
_ => Err("Invalid merge payload: root must be an Object or Array".to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
fn merge_array(&self, items: Vec<Value>) -> Result<Value, String> {
|
||||
fn merge_array(&self, items: Vec<Value>, notifications: &mut Vec<String>) -> Result<Value, String> {
|
||||
let mut resolved_items = Vec::new();
|
||||
for item in items {
|
||||
let resolved = self.merge_internal(item)?;
|
||||
let resolved = self.merge_internal(item, notifications)?;
|
||||
resolved_items.push(resolved);
|
||||
}
|
||||
Ok(Value::Array(resolved_items))
|
||||
}
|
||||
|
||||
fn merge_object(&self, obj: serde_json::Map<String, Value>) -> Result<Value, String> {
|
||||
fn merge_object(&self, obj: serde_json::Map<String, Value>, notifications: &mut Vec<String>) -> Result<Value, String> {
|
||||
let queue_start = notifications.len();
|
||||
|
||||
let type_name = match obj.get("type").and_then(|v| v.as_str()) {
|
||||
Some(t) => t.to_string(),
|
||||
None => return Err("Missing required 'type' field on object".to_string()),
|
||||
@ -147,7 +171,7 @@ impl Merger {
|
||||
}
|
||||
}
|
||||
|
||||
let merged_relative = match self.merge_internal(Value::Object(relative))? {
|
||||
let merged_relative = match self.merge_internal(Value::Object(relative), notifications)? {
|
||||
Value::Object(m) => m,
|
||||
_ => continue,
|
||||
};
|
||||
@ -174,7 +198,7 @@ impl Merger {
|
||||
&entity_fields,
|
||||
);
|
||||
|
||||
let merged_relative = match self.merge_internal(Value::Object(relative))? {
|
||||
let merged_relative = match self.merge_internal(Value::Object(relative), notifications)? {
|
||||
Value::Object(m) => m,
|
||||
_ => continue,
|
||||
};
|
||||
@ -242,7 +266,7 @@ impl Merger {
|
||||
&entity_fields,
|
||||
);
|
||||
|
||||
let merged_relative = match self.merge_internal(Value::Object(relative_item))? {
|
||||
let merged_relative = match self.merge_internal(Value::Object(relative_item), notifications)? {
|
||||
Value::Object(m) => m,
|
||||
_ => continue,
|
||||
};
|
||||
@ -255,7 +279,7 @@ impl Merger {
|
||||
}
|
||||
|
||||
// 7. Perform change tracking
|
||||
self.merge_entity_change(
|
||||
let notify_sql = self.merge_entity_change(
|
||||
&entity_fields,
|
||||
entity_fetched.as_ref(),
|
||||
entity_change_kind.as_deref(),
|
||||
@ -263,6 +287,10 @@ impl Merger {
|
||||
×tamp,
|
||||
)?;
|
||||
|
||||
if let Some(sql) = notify_sql {
|
||||
notifications.insert(queue_start, sql);
|
||||
}
|
||||
|
||||
// Produce the full tree response
|
||||
let mut final_response = serde_json::Map::new();
|
||||
if let Some(fetched) = entity_fetched {
|
||||
@ -614,10 +642,10 @@ impl Merger {
|
||||
entity_change_kind: Option<&str>,
|
||||
user_id: &str,
|
||||
timestamp: &str,
|
||||
) -> Result<(), String> {
|
||||
) -> Result<Option<String>, String> {
|
||||
let change_kind = match entity_change_kind {
|
||||
Some(k) => k,
|
||||
None => return Ok(()),
|
||||
None => return Ok(None),
|
||||
};
|
||||
|
||||
let id_str = entity_fields.get("id").unwrap();
|
||||
@ -697,12 +725,8 @@ impl Merger {
|
||||
.db
|
||||
.execute(&change_sql, None)
|
||||
.map_err(|e| format!("Executor Error in change: {:?}", e))?;
|
||||
self
|
||||
.db
|
||||
.execute(¬ify_sql, None)
|
||||
.map_err(|e| format!("Executor Error in notify: {:?}", e))?;
|
||||
|
||||
Ok(())
|
||||
Ok(Some(notify_sql))
|
||||
}
|
||||
|
||||
fn compare_entities(
|
||||
|
||||
@ -47,7 +47,7 @@ impl SqlCompiler {
|
||||
|
||||
// We expect the top level to typically be an Object or Array
|
||||
let is_stem_query = stem_path.is_some();
|
||||
let (sql, _) = self.walk_schema(target_schema, "t1", None, filter_keys, is_stem_query, 0)?;
|
||||
let (sql, _) = self.walk_schema(target_schema, "t1", None, filter_keys, is_stem_query, 0, String::new())?;
|
||||
Ok(sql)
|
||||
}
|
||||
|
||||
@ -61,12 +61,19 @@ impl SqlCompiler {
|
||||
filter_keys: &[String],
|
||||
is_stem_query: bool,
|
||||
depth: usize,
|
||||
current_path: String,
|
||||
) -> Result<(String, String), String> {
|
||||
// Determine the base schema type (could be an array, object, or literal)
|
||||
match &schema.obj.type_ {
|
||||
Some(crate::database::schema::SchemaTypeOrArray::Single(t)) if t == "array" => {
|
||||
// Handle Arrays:
|
||||
if let Some(items) = &schema.obj.items {
|
||||
let next_path = if current_path.is_empty() {
|
||||
String::from("#")
|
||||
} else {
|
||||
format!("{}.#", current_path)
|
||||
};
|
||||
|
||||
if let Some(ref_id) = &items.obj.r#ref {
|
||||
if let Some(type_def) = self.db.types.get(ref_id) {
|
||||
return self.compile_entity_node(
|
||||
@ -78,6 +85,7 @@ impl SqlCompiler {
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth,
|
||||
next_path,
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -88,6 +96,7 @@ impl SqlCompiler {
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth + 1,
|
||||
next_path,
|
||||
)?;
|
||||
return Ok((
|
||||
format!("(SELECT jsonb_agg({}) FROM TODO)", item_sql),
|
||||
@ -104,9 +113,9 @@ impl SqlCompiler {
|
||||
// Determine if this schema represents a Database Entity
|
||||
let mut resolved_type = None;
|
||||
|
||||
// Target is generally a specific schema (e.g. 'base.person'), but it tells us what physical
|
||||
// database table hierarchy it maps to via the `schema.id` prefix/suffix convention.
|
||||
if let Some(lookup_key) = schema.obj.id.as_ref().or(schema.obj.r#ref.as_ref()) {
|
||||
if let Some(family_target) = schema.obj.family.as_ref() {
|
||||
resolved_type = self.db.types.get(family_target);
|
||||
} else if let Some(lookup_key) = schema.obj.id.as_ref().or(schema.obj.r#ref.as_ref()) {
|
||||
let base_type_name = lookup_key.split('.').next_back().unwrap_or("").to_string();
|
||||
resolved_type = self.db.types.get(&base_type_name);
|
||||
}
|
||||
@ -121,6 +130,7 @@ impl SqlCompiler {
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth,
|
||||
current_path,
|
||||
);
|
||||
}
|
||||
|
||||
@ -135,10 +145,50 @@ impl SqlCompiler {
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth,
|
||||
current_path,
|
||||
);
|
||||
}
|
||||
return Err(format!("Unresolved $ref: {}", ref_id));
|
||||
}
|
||||
// Handle $family Polymorphism fallbacks for relations
|
||||
if let Some(family_target) = &schema.obj.family {
|
||||
let mut all_targets = vec![family_target.clone()];
|
||||
if let Some(schema_id) = &schema.obj.id {
|
||||
if let Some(descendants) = self.db.descendants.get(schema_id) {
|
||||
all_targets.extend(descendants.clone());
|
||||
}
|
||||
}
|
||||
|
||||
let mut family_schemas = Vec::new();
|
||||
for target in all_targets {
|
||||
let mut ref_schema = crate::database::schema::Schema::default();
|
||||
ref_schema.obj.r#ref = Some(target);
|
||||
family_schemas.push(std::sync::Arc::new(ref_schema));
|
||||
}
|
||||
|
||||
return self.compile_one_of(
|
||||
&family_schemas,
|
||||
parent_alias,
|
||||
prop_name_context,
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth,
|
||||
current_path,
|
||||
);
|
||||
}
|
||||
|
||||
// Handle oneOf Polymorphism fallbacks for relations
|
||||
if let Some(one_of) = &schema.obj.one_of {
|
||||
return self.compile_one_of(
|
||||
one_of,
|
||||
parent_alias,
|
||||
prop_name_context,
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth,
|
||||
current_path,
|
||||
);
|
||||
}
|
||||
|
||||
// Just an inline object definition?
|
||||
if let Some(props) = &schema.obj.properties {
|
||||
@ -148,6 +198,7 @@ impl SqlCompiler {
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth,
|
||||
current_path,
|
||||
);
|
||||
}
|
||||
|
||||
@ -195,6 +246,7 @@ impl SqlCompiler {
|
||||
filter_keys: &[String],
|
||||
is_stem_query: bool,
|
||||
depth: usize,
|
||||
current_path: String,
|
||||
) -> Result<(String, String), String> {
|
||||
let local_ctx = format!("{}_{}", parent_alias, prop_name.unwrap_or("obj"));
|
||||
|
||||
@ -202,7 +254,7 @@ impl SqlCompiler {
|
||||
let (table_aliases, from_clauses) = self.build_hierarchy_from_clauses(type_def, &local_ctx);
|
||||
|
||||
// 2. Map properties and build jsonb_build_object args
|
||||
let select_args = self.map_properties_to_aliases(
|
||||
let mut select_args = self.map_properties_to_aliases(
|
||||
schema,
|
||||
type_def,
|
||||
&table_aliases,
|
||||
@ -210,8 +262,43 @@ impl SqlCompiler {
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth,
|
||||
¤t_path,
|
||||
)?;
|
||||
|
||||
// 2.5 Inject polymorphism directly into the query object
|
||||
if let Some(family_target) = &schema.obj.family {
|
||||
let mut family_schemas = Vec::new();
|
||||
if let Some(base_type) = self.db.types.get(family_target) {
|
||||
let mut sorted_targets: Vec<String> = base_type.variations.iter().cloned().collect();
|
||||
// Ensure the base type is included if not listed in variations by default
|
||||
if !sorted_targets.contains(family_target) {
|
||||
sorted_targets.push(family_target.clone());
|
||||
}
|
||||
sorted_targets.sort();
|
||||
|
||||
for target in sorted_targets {
|
||||
let mut ref_schema = crate::database::schema::Schema::default();
|
||||
ref_schema.obj.r#ref = Some(target);
|
||||
family_schemas.push(std::sync::Arc::new(ref_schema));
|
||||
}
|
||||
} else {
|
||||
// Fallback for types not strictly defined in physical DB
|
||||
let mut ref_schema = crate::database::schema::Schema::default();
|
||||
ref_schema.obj.r#ref = Some(family_target.clone());
|
||||
family_schemas.push(std::sync::Arc::new(ref_schema));
|
||||
}
|
||||
|
||||
let base_alias = table_aliases.get(&type_def.name).cloned().unwrap_or_else(|| parent_alias.to_string());
|
||||
select_args.push(format!("'id', {}.id", base_alias));
|
||||
let (case_sql, _) = self.compile_one_of(&family_schemas, &base_alias, None, filter_keys, is_stem_query, depth, current_path.clone())?;
|
||||
select_args.push(format!("'type', {}", case_sql));
|
||||
} else if let Some(one_of) = &schema.obj.one_of {
|
||||
let base_alias = table_aliases.get(&type_def.name).cloned().unwrap_or_else(|| parent_alias.to_string());
|
||||
select_args.push(format!("'id', {}.id", base_alias));
|
||||
let (case_sql, _) = self.compile_one_of(one_of, &base_alias, None, filter_keys, is_stem_query, depth, current_path.clone())?;
|
||||
select_args.push(format!("'type', {}", case_sql));
|
||||
}
|
||||
|
||||
let jsonb_obj_sql = if select_args.is_empty() {
|
||||
"jsonb_build_object()".to_string()
|
||||
} else {
|
||||
@ -226,6 +313,7 @@ impl SqlCompiler {
|
||||
parent_alias,
|
||||
prop_name,
|
||||
filter_keys,
|
||||
¤t_path,
|
||||
)?;
|
||||
|
||||
let selection = if is_array {
|
||||
@ -285,6 +373,7 @@ impl SqlCompiler {
|
||||
filter_keys: &[String],
|
||||
is_stem_query: bool,
|
||||
depth: usize,
|
||||
current_path: &str,
|
||||
) -> Result<Vec<String>, String> {
|
||||
let mut select_args = Vec::new();
|
||||
let grouped_fields = type_def.grouped_fields.as_ref().and_then(|v| v.as_object());
|
||||
@ -310,6 +399,32 @@ impl SqlCompiler {
|
||||
}
|
||||
}
|
||||
|
||||
let is_object_or_array = match &prop_schema.obj.type_ {
|
||||
Some(crate::database::schema::SchemaTypeOrArray::Single(s)) => s == "object" || s == "array",
|
||||
Some(crate::database::schema::SchemaTypeOrArray::Multiple(v)) => v.contains(&"object".to_string()) || v.contains(&"array".to_string()),
|
||||
_ => false
|
||||
};
|
||||
|
||||
let is_primitive = prop_schema.obj.r#ref.is_none()
|
||||
&& prop_schema.obj.items.is_none()
|
||||
&& prop_schema.obj.properties.is_none()
|
||||
&& prop_schema.obj.one_of.is_none()
|
||||
&& !is_object_or_array;
|
||||
|
||||
if is_primitive {
|
||||
if let Some(ft) = type_def.field_types.as_ref().and_then(|v| v.as_object()) {
|
||||
if !ft.contains_key(prop_key) {
|
||||
continue; // Skip frontend virtual properties (e.g. `computer` fields, `created`) missing from physical table fields
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let next_path = if current_path.is_empty() {
|
||||
prop_key.clone()
|
||||
} else {
|
||||
format!("{}.{}", current_path, prop_key)
|
||||
};
|
||||
|
||||
let (val_sql, val_type) = self.walk_schema(
|
||||
prop_schema,
|
||||
&owner_alias,
|
||||
@ -317,6 +432,7 @@ impl SqlCompiler {
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth + 1,
|
||||
next_path,
|
||||
)?;
|
||||
|
||||
if val_type != "abort" {
|
||||
@ -334,6 +450,7 @@ impl SqlCompiler {
|
||||
parent_alias: &str,
|
||||
prop_name: Option<&str>,
|
||||
filter_keys: &[String],
|
||||
current_path: &str,
|
||||
) -> Result<Vec<String>, String> {
|
||||
let base_alias = table_aliases
|
||||
.get(&type_def.name)
|
||||
@ -343,12 +460,29 @@ impl SqlCompiler {
|
||||
let mut where_clauses = Vec::new();
|
||||
where_clauses.push(format!("NOT {}.archived", base_alias));
|
||||
|
||||
if parent_alias == "t1" {
|
||||
for (i, filter_key) in filter_keys.iter().enumerate() {
|
||||
let mut parts = filter_key.split(':');
|
||||
let field_name = parts.next().unwrap_or(filter_key);
|
||||
let full_field_path = parts.next().unwrap_or(filter_key);
|
||||
let op = parts.next().unwrap_or("$eq");
|
||||
|
||||
let field_name = if current_path.is_empty() {
|
||||
if full_field_path.contains('.') || full_field_path.contains('#') {
|
||||
continue;
|
||||
}
|
||||
full_field_path
|
||||
} else {
|
||||
let prefix = format!("{}.", current_path);
|
||||
if full_field_path.starts_with(&prefix) {
|
||||
let remainder = &full_field_path[prefix.len()..];
|
||||
if remainder.contains('.') || remainder.contains('#') {
|
||||
continue;
|
||||
}
|
||||
remainder
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
let mut filter_alias = base_alias.clone();
|
||||
|
||||
if let Some(gf) = type_def.grouped_fields.as_ref().and_then(|v| v.as_object()) {
|
||||
@ -455,11 +589,14 @@ impl SqlCompiler {
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(_prop) = prop_name {
|
||||
if let Some(prop) = prop_name {
|
||||
if prop == "target" || prop == "source" {
|
||||
where_clauses.push(format!("{}.id = {}.{}_id", base_alias, parent_alias, prop));
|
||||
} else {
|
||||
where_clauses.push(format!("{}.parent_id = {}.id", base_alias, parent_alias));
|
||||
}
|
||||
}
|
||||
|
||||
Ok(where_clauses)
|
||||
}
|
||||
@ -471,9 +608,16 @@ impl SqlCompiler {
|
||||
filter_keys: &[String],
|
||||
is_stem_query: bool,
|
||||
depth: usize,
|
||||
current_path: String,
|
||||
) -> Result<(String, String), String> {
|
||||
let mut build_args = Vec::new();
|
||||
for (k, v) in props {
|
||||
let next_path = if current_path.is_empty() {
|
||||
k.clone()
|
||||
} else {
|
||||
format!("{}.{}", current_path, k)
|
||||
};
|
||||
|
||||
let (child_sql, val_type) = self.walk_schema(
|
||||
v,
|
||||
parent_alias,
|
||||
@ -481,6 +625,7 @@ impl SqlCompiler {
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth + 1,
|
||||
next_path,
|
||||
)?;
|
||||
if val_type == "abort" {
|
||||
continue;
|
||||
@ -490,4 +635,56 @@ impl SqlCompiler {
|
||||
let combined = format!("jsonb_build_object({})", build_args.join(", "));
|
||||
Ok((combined, "object".to_string()))
|
||||
}
|
||||
|
||||
fn compile_one_of(
|
||||
&self,
|
||||
schemas: &[Arc<crate::database::schema::Schema>],
|
||||
parent_alias: &str,
|
||||
prop_name_context: Option<&str>,
|
||||
filter_keys: &[String],
|
||||
is_stem_query: bool,
|
||||
depth: usize,
|
||||
current_path: String,
|
||||
) -> Result<(String, String), String> {
|
||||
let mut case_statements = Vec::new();
|
||||
let type_col = if let Some(prop) = prop_name_context {
|
||||
format!("{}_type", prop)
|
||||
} else {
|
||||
"type".to_string()
|
||||
};
|
||||
|
||||
for option_schema in schemas {
|
||||
if let Some(ref_id) = &option_schema.obj.r#ref {
|
||||
// Find the physical type this ref maps to
|
||||
let base_type_name = ref_id.split('.').next_back().unwrap_or("").to_string();
|
||||
|
||||
// Generate the nested SQL for this specific target type
|
||||
let (val_sql, _) = self.walk_schema(
|
||||
option_schema,
|
||||
parent_alias,
|
||||
prop_name_context,
|
||||
filter_keys,
|
||||
is_stem_query,
|
||||
depth,
|
||||
current_path.clone(),
|
||||
)?;
|
||||
|
||||
case_statements.push(format!(
|
||||
"WHEN {}.{} = '{}' THEN ({})",
|
||||
parent_alias, type_col, base_type_name, val_sql
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
if case_statements.is_empty() {
|
||||
return Ok(("NULL".to_string(), "string".to_string()));
|
||||
}
|
||||
|
||||
let sql = format!(
|
||||
"CASE {} ELSE NULL END",
|
||||
case_statements.join(" ")
|
||||
);
|
||||
|
||||
Ok((sql, "object".to_string()))
|
||||
}
|
||||
}
|
||||
|
||||
@ -1469,6 +1469,12 @@ fn test_queryer_0_9() {
|
||||
crate::tests::runner::run_test_case(&path, 0, 9).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_queryer_0_10() {
|
||||
let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
|
||||
crate::tests::runner::run_test_case(&path, 0, 10).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_not_0_0() {
|
||||
let path = format!("{}/fixtures/not.json", env!("CARGO_MANIFEST_DIR"));
|
||||
|
||||
@ -2,6 +2,7 @@ use crate::*;
|
||||
pub mod runner;
|
||||
pub mod types;
|
||||
use serde_json::json;
|
||||
pub mod sql_validator;
|
||||
|
||||
// Database module tests moved to src/database/executors/mock.rs
|
||||
|
||||
@ -49,6 +50,25 @@ fn test_library_api() {
|
||||
})
|
||||
);
|
||||
|
||||
// 3. Validate jspg_schemas
|
||||
let schemas_drop = jspg_schemas();
|
||||
assert_eq!(
|
||||
schemas_drop.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"response": {
|
||||
"test_schema": {
|
||||
"$id": "test_schema",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"name": { "type": "string" }
|
||||
},
|
||||
"required": ["name"]
|
||||
}
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
// 4. Validate Happy Path
|
||||
let happy_drop = jspg_validate("test_schema", JsonB(json!({"name": "Neo"})));
|
||||
assert_eq!(
|
||||
|
||||
156
src/tests/sql_validator.rs
Normal file
156
src/tests/sql_validator.rs
Normal file
@ -0,0 +1,156 @@
|
||||
use sqlparser::ast::{
|
||||
Expr, Join, JoinConstraint, JoinOperator, Query, Select, SelectItem, SetExpr, Statement,
|
||||
TableFactor, TableWithJoins, Ident,
|
||||
};
|
||||
use sqlparser::dialect::PostgreSqlDialect;
|
||||
use sqlparser::parser::Parser;
|
||||
use std::collections::HashSet;
|
||||
|
||||
pub fn validate_semantic_sql(sql: &str) -> Result<(), String> {
|
||||
let dialect = PostgreSqlDialect {};
|
||||
let statements = match Parser::parse_sql(&dialect, sql) {
|
||||
Ok(s) => s,
|
||||
Err(e) => return Err(format!("SQL Syntax Error: {}\nSQL: {}", e, sql)),
|
||||
};
|
||||
|
||||
for statement in statements {
|
||||
validate_statement(&statement, sql)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn validate_statement(stmt: &Statement, original_sql: &str) -> Result<(), String> {
|
||||
match stmt {
|
||||
Statement::Query(query) => validate_query(query, original_sql)?,
|
||||
Statement::Insert(insert) => {
|
||||
if let Some(query) = &insert.source {
|
||||
validate_query(query, original_sql)?
|
||||
}
|
||||
}
|
||||
Statement::Update(update) => {
|
||||
if let Some(expr) = &update.selection {
|
||||
validate_expr(expr, &HashSet::new(), original_sql)?;
|
||||
}
|
||||
}
|
||||
Statement::Delete(delete) => {
|
||||
if let Some(expr) = &delete.selection {
|
||||
validate_expr(expr, &HashSet::new(), original_sql)?;
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn validate_query(query: &Query, original_sql: &str) -> Result<(), String> {
|
||||
if let SetExpr::Select(select) = &*query.body {
|
||||
validate_select(select, original_sql)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn validate_select(select: &Select, original_sql: &str) -> Result<(), String> {
|
||||
let mut available_aliases = HashSet::new();
|
||||
|
||||
// 1. Collect all declared table aliases in the FROM clause and JOINs
|
||||
for table_with_joins in &select.from {
|
||||
collect_aliases_from_table_factor(&table_with_joins.relation, &mut available_aliases);
|
||||
for join in &table_with_joins.joins {
|
||||
collect_aliases_from_table_factor(&join.relation, &mut available_aliases);
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Validate all SELECT projection fields
|
||||
for projection in &select.projection {
|
||||
if let SelectItem::UnnamedExpr(expr) | SelectItem::ExprWithAlias { expr, .. } = projection {
|
||||
validate_expr(expr, &available_aliases, original_sql)?;
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Validate ON conditions in joins
|
||||
for table_with_joins in &select.from {
|
||||
for join in &table_with_joins.joins {
|
||||
if let JoinOperator::Inner(JoinConstraint::On(expr))
|
||||
| JoinOperator::LeftOuter(JoinConstraint::On(expr))
|
||||
| JoinOperator::RightOuter(JoinConstraint::On(expr))
|
||||
| JoinOperator::FullOuter(JoinConstraint::On(expr))
|
||||
| JoinOperator::Join(JoinConstraint::On(expr)) = &join.join_operator
|
||||
{
|
||||
validate_expr(expr, &available_aliases, original_sql)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Validate WHERE conditions
|
||||
if let Some(selection) = &select.selection {
|
||||
validate_expr(selection, &available_aliases, original_sql)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn collect_aliases_from_table_factor(tf: &TableFactor, aliases: &mut HashSet<String>) {
|
||||
match tf {
|
||||
TableFactor::Table { name, alias, .. } => {
|
||||
if let Some(table_alias) = alias {
|
||||
aliases.insert(table_alias.name.value.clone());
|
||||
} else if let Some(last) = name.0.last() {
|
||||
match last {
|
||||
sqlparser::ast::ObjectNamePart::Identifier(i) => {
|
||||
aliases.insert(i.value.clone());
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
TableFactor::Derived { alias: Some(table_alias), .. } => {
|
||||
aliases.insert(table_alias.name.value.clone());
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn validate_expr(expr: &Expr, available_aliases: &HashSet<String>, sql: &str) -> Result<(), String> {
|
||||
match expr {
|
||||
Expr::CompoundIdentifier(idents) => {
|
||||
if idents.len() == 2 {
|
||||
let alias = &idents[0].value;
|
||||
if !available_aliases.is_empty() && !available_aliases.contains(alias) {
|
||||
return Err(format!(
|
||||
"Semantic Error: Orchestrated query referenced table alias '{}' but it was not declared in the query's FROM/JOIN clauses.\nAvailable aliases: {:?}\nSQL: {}",
|
||||
alias, available_aliases, sql
|
||||
));
|
||||
}
|
||||
} else if idents.len() > 2 {
|
||||
let alias = &idents[1].value; // In form schema.table.column, 'table' is idents[1]
|
||||
if !available_aliases.is_empty() && !available_aliases.contains(alias) {
|
||||
return Err(format!(
|
||||
"Semantic Error: Orchestrated query referenced table '{}' but it was not mapped.\nAvailable aliases: {:?}\nSQL: {}",
|
||||
alias, available_aliases, sql
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
Expr::BinaryOp { left, right, .. } => {
|
||||
validate_expr(left, available_aliases, sql)?;
|
||||
validate_expr(right, available_aliases, sql)?;
|
||||
}
|
||||
Expr::IsFalse(e) | Expr::IsNotFalse(e) | Expr::IsTrue(e) | Expr::IsNotTrue(e)
|
||||
| Expr::IsNull(e) | Expr::IsNotNull(e) | Expr::InList { expr: e, .. }
|
||||
| Expr::Nested(e) | Expr::UnaryOp { expr: e, .. } | Expr::Cast { expr: e, .. }
|
||||
| Expr::Like { expr: e, .. } | Expr::ILike { expr: e, .. } | Expr::AnyOp { left: e, .. }
|
||||
| Expr::AllOp { left: e, .. } => {
|
||||
validate_expr(e, available_aliases, sql)?;
|
||||
}
|
||||
Expr::Function(func) => {
|
||||
if let sqlparser::ast::FunctionArguments::List(args) = &func.args {
|
||||
if let Some(sqlparser::ast::FunctionArg::Unnamed(sqlparser::ast::FunctionArgExpr::Expr(e))) = args.args.get(0) {
|
||||
validate_expr(e, available_aliases, sql)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@ -39,6 +39,12 @@ impl ExpectBlock {
|
||||
));
|
||||
}
|
||||
|
||||
for query in actual {
|
||||
if let Err(e) = crate::tests::sql_validator::validate_semantic_sql(query) {
|
||||
return Err(e);
|
||||
}
|
||||
}
|
||||
|
||||
let ws_re = Regex::new(r"\s+").unwrap();
|
||||
|
||||
let types = HashMap::from([
|
||||
|
||||
Reference in New Issue
Block a user