Compare commits
5 Commits
1.0.160
...
backup-mai
| Author | SHA1 | Date | |
|---|---|---|---|
| dd83f301f6 | |||
| 44d36a2997 | |||
| 0091e5c226 | |||
| 2c18163961 | |||
| 0b241c5227 |
@ -16,7 +16,7 @@ url = "2.5.8"
|
||||
fluent-uri = "0.3.2"
|
||||
idna = "1.1.0"
|
||||
percent-encoding = "2.3.2"
|
||||
uuid = { version = "1.20.0", features = ["v7", "serde"] }
|
||||
uuid = { version = "1.20.0", features = ["v4", "serde"] }
|
||||
chrono = { version = "0.4.43", features = ["serde"] }
|
||||
json-pointer = "0.3.4"
|
||||
indexmap = { version = "2.13.0", features = ["serde"] }
|
||||
|
||||
@ -175,7 +175,6 @@ In the Punc architecture, filters are automatically synthesized, strongly-typed
|
||||
|
||||
* **Conditions**: A condition schema is the contract defining the mathematical operations allowed on a primitive field. For example, a `string.condition` allows `$eq`, `$ne`, `$gt`, `$gte`, `$lt`, `$lte`, `$of` (IN), and `$nof` (NOT IN).
|
||||
* **Enum Conditions**: When JSPG synthesizes an enum, it dynamically generates an `<enum>.condition` (e.g., `address_kind.condition`). This strongly-typed condition perfectly mirrors the operations of a `string.condition`, but strictly limits the arrays and inputs of `$eq`, `$ne`, `$of`, and `$nof` to the exact variations defined by that Enum. This context ensures that UI generators know exactly when to render `<Select>` dropdowns instead of generic `<Text>` boxes.
|
||||
* **Pre-compiled Condition and Filter Mapping**: To prevent redundant double-wrapping of search structures, any schema property whose type is already a `.condition` or `.filter` type (such as `"string.condition"` or `"$kind.filter"`) maps directly to itself during filter synthesis rather than receiving a redundant `.filter` suffix.
|
||||
* **Filters**: A filter schema (e.g., `person.filter`) is an object containing condition properties used to filter entities. It natively supports structural composition:
|
||||
* **Inherited Properties**: Filters automatically inherit all valid database columns from their base type schema, immediately converting them to their respective `.condition` schemas.
|
||||
* **Relational Proxies**: If a table has a foreign key to another table, the filter automatically generates a proxy property pointing to the related entity's filter (e.g., the `person` filter automatically gains an `organization` property that points to `organization.filter`), allowing infinitely deep nested queries natively.
|
||||
@ -296,7 +295,6 @@ The Queryer transforms Postgres into a pre-compiled Semantic Query Engine, desig
|
||||
* **The Dot Convention**: When a schema requests `family: "target.schema"`, the compiler extracts the base type (e.g. `schema`) and looks up its Physical Table definition.
|
||||
* **Multi-Table Branching**: If the Physical Table is a parent to other tables (e.g. `organization` has variations `["organization", "bot", "person"]`), the compiler generates a dynamic `CASE WHEN type = '...' THEN ...` query, expanding into sub-queries for each variation. To ensure safe resolution, the compiler dynamically evaluates correlation boundaries: it attempts standard Relational Edge discovery first. If no explicit relational edge exists (indicating pure Table Inheritance rather than a standard foreign-key graph relationship), it safely invokes a **Table Parity Fallback**. This generates an explicit ID correlation constraint (`AND inner.id = outer.id`), perfectly binding the structural variations back to the parent row to eliminate Cartesian products.
|
||||
* **Single-Table Bypass**: If the Physical Table is a leaf node with only one variation (e.g. `person` has variations `["person"]`), the compiler cleanly bypasses `CASE` generation and compiles a simple `SELECT` across the base table, as all schema extensions (e.g. `light.person`, `full.person`) are guaranteed to reside in the exact same physical row.
|
||||
* **Polymorphic Relation Type Filtering**: When a relationship maps to a polymorphic target with variations, the Queryer compiles an `IN` clause containing all allowed table variations (e.g., `counterparty_type IN ('bot', 'organization', 'person')`) rather than matching the base type literal, ensuring all polymorphic types are loaded correctly.
|
||||
|
||||
---
|
||||
|
||||
|
||||
@ -791,8 +791,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"invoice"
|
||||
"invoice",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -867,8 +867,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"invoice_line"
|
||||
"invoice_line",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
|
||||
@ -37,14 +37,6 @@
|
||||
},
|
||||
"filter": {
|
||||
"type": "$kind.filter"
|
||||
},
|
||||
"conditions": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"new": { "type": "$kind.filter" },
|
||||
"old": { "type": "$kind.filter" },
|
||||
"complete": { "type": "$kind.filter" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -157,48 +149,7 @@
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"description": "Valid nested filter payload",
|
||||
"data": {
|
||||
"kind": "person",
|
||||
"conditions": {
|
||||
"new": {
|
||||
"age": 30
|
||||
}
|
||||
}
|
||||
},
|
||||
"schema_id": "search",
|
||||
"action": "validate",
|
||||
"expect": {
|
||||
"success": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"description": "Invalid nested filter payload (fails constraint)",
|
||||
"data": {
|
||||
"kind": "person",
|
||||
"conditions": {
|
||||
"new": {
|
||||
"age": "thirty"
|
||||
}
|
||||
}
|
||||
},
|
||||
"schema_id": "search",
|
||||
"action": "validate",
|
||||
"expect": {
|
||||
"success": false,
|
||||
"errors": [
|
||||
{
|
||||
"code": "INVALID_TYPE",
|
||||
"details": {
|
||||
"path": "conditions/new/age"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
@ -466,7 +466,7 @@
|
||||
},
|
||||
"filter": {
|
||||
"type": [
|
||||
"$kind.filter",
|
||||
"$kind.filter.filter",
|
||||
"null"
|
||||
]
|
||||
},
|
||||
|
||||
@ -110,8 +110,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"activity"
|
||||
"activity",
|
||||
"entity"
|
||||
],
|
||||
"variations": [
|
||||
"activity",
|
||||
@ -166,9 +166,9 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"invoice",
|
||||
"activity",
|
||||
"invoice"
|
||||
"entity"
|
||||
],
|
||||
"variations": [
|
||||
"invoice"
|
||||
@ -237,8 +237,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"attachment"
|
||||
"attachment",
|
||||
"entity"
|
||||
],
|
||||
"variations": [
|
||||
"attachment"
|
||||
|
||||
@ -219,8 +219,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"organization"
|
||||
"organization",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -262,9 +262,9 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"user",
|
||||
"organization",
|
||||
"user"
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -359,10 +359,10 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"organization",
|
||||
"person",
|
||||
"user",
|
||||
"person"
|
||||
"organization",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -445,8 +445,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"order"
|
||||
"order",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -504,8 +504,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"order_line"
|
||||
"order_line",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -548,8 +548,8 @@
|
||||
"name": "relationship",
|
||||
"relationship": true,
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"relationship"
|
||||
"relationship",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"source_id",
|
||||
@ -611,9 +611,9 @@
|
||||
"name": "contact",
|
||||
"relationship": true,
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"contact",
|
||||
"relationship",
|
||||
"contact"
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"is_primary",
|
||||
@ -683,8 +683,8 @@
|
||||
{
|
||||
"name": "phone_number",
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"phone_number"
|
||||
"phone_number",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"number",
|
||||
@ -741,8 +741,8 @@
|
||||
{
|
||||
"name": "email_address",
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"email_address"
|
||||
"email_address",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"address",
|
||||
@ -834,8 +834,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"attachment"
|
||||
"attachment",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -887,8 +887,8 @@
|
||||
{
|
||||
"name": "account",
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"account"
|
||||
"account",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -1031,8 +1031,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"invoice"
|
||||
"invoice",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -1107,8 +1107,8 @@
|
||||
}
|
||||
},
|
||||
"hierarchy": [
|
||||
"entity",
|
||||
"invoice_line"
|
||||
"invoice_line",
|
||||
"entity"
|
||||
],
|
||||
"fields": [
|
||||
"id",
|
||||
@ -1260,7 +1260,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"first_name\": \"IncompleteFirst\",",
|
||||
" \"last_name\": \"IncompleteLast\",",
|
||||
@ -1309,10 +1308,10 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"organization\" t2 ON ",
|
||||
"JOIN agreego.\"user\" t3 ON ",
|
||||
"JOIN agreego.\"person\" t4 ON ",
|
||||
"FROM agreego.\"person\" t1",
|
||||
"JOIN agreego.\"user\" t2 ON ",
|
||||
"JOIN agreego.\"organization\" t3 ON ",
|
||||
"JOIN agreego.\"entity\" t4 ON ",
|
||||
"WHERE",
|
||||
" (\"first_name\" = 'LookupFirst'",
|
||||
" AND \"last_name\" = 'LookupLast'",
|
||||
@ -1320,62 +1319,17 @@
|
||||
" AND \"pronouns\" = 'they/them'))"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
" \"created_by\",",
|
||||
" \"id\",",
|
||||
" \"modified_at\",",
|
||||
" \"modified_by\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" 'person'",
|
||||
")"
|
||||
"UPDATE agreego.\"person\" SET",
|
||||
" contact_id = 'abc-contact'",
|
||||
"WHERE",
|
||||
" id = '{{uuid:mocks.0.id}}'"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"organization\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"user\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"person\" (",
|
||||
" \"contact_id\",",
|
||||
" \"date_of_birth\",",
|
||||
" \"first_name\",",
|
||||
" \"id\",",
|
||||
" \"last_name\",",
|
||||
" \"pronouns\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" 'abc-contact',",
|
||||
" '{{timestamp}}',",
|
||||
" 'LookupFirst',",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" 'LookupLast',",
|
||||
" 'they/them',",
|
||||
" 'person'",
|
||||
")"
|
||||
"UPDATE agreego.\"entity\" SET",
|
||||
" modified_at = '{{timestamp}}',",
|
||||
" modified_by = '00000000-0000-0000-0000-000000000000'",
|
||||
"WHERE",
|
||||
" id = '{{uuid:mocks.0.id}}'"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.change (",
|
||||
@ -1388,45 +1342,39 @@
|
||||
" \"modified_by\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" NULL,",
|
||||
" '{",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"contact_id\": \"old-contact\"",
|
||||
" }',",
|
||||
" '{",
|
||||
" \"contact_id\": \"abc-contact\",",
|
||||
" \"type\": \"person\"",
|
||||
" }',",
|
||||
" '{{uuid:mocks.0.id}}',",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" '{{uuid:generated_1}}',",
|
||||
" 'create',",
|
||||
" 'update',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"id\": \"{{uuid:mocks.0.id}}\",",
|
||||
" \"type\": \"person\",",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"contact_id\": \"abc-contact\",",
|
||||
" \"id\": \"{{uuid:generated_0}}\",",
|
||||
" \"type\": \"person\",",
|
||||
" \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"created_at\": \"{{timestamp}}\",",
|
||||
" \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"modified_at\": \"{{timestamp}}\"",
|
||||
" },",
|
||||
" \"new\": {",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"contact_id\": \"abc-contact\",",
|
||||
" \"type\": \"person\"",
|
||||
" },",
|
||||
" \"old\": {",
|
||||
" \"contact_id\": \"old-contact\"",
|
||||
" }",
|
||||
"}'))"
|
||||
]
|
||||
@ -1462,10 +1410,10 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"organization\" t2 ON ",
|
||||
"JOIN agreego.\"user\" t3 ON ",
|
||||
"JOIN agreego.\"person\" t4 ON ",
|
||||
"FROM agreego.\"person\" t1",
|
||||
"JOIN agreego.\"user\" t2 ON ",
|
||||
"JOIN agreego.\"organization\" t3 ON ",
|
||||
"JOIN agreego.\"entity\" t4 ON ",
|
||||
"WHERE",
|
||||
" t1.id = '{{uuid:data.id}}'",
|
||||
" OR (\"first_name\" = 'LookupFirst'",
|
||||
@ -1474,62 +1422,17 @@
|
||||
" AND \"pronouns\" = 'they/them'))"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
" \"created_by\",",
|
||||
" \"id\",",
|
||||
" \"modified_at\",",
|
||||
" \"modified_by\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" '{{uuid:data.id}}',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" 'person'",
|
||||
")"
|
||||
"UPDATE agreego.\"person\" SET",
|
||||
" contact_id = 'abc-contact'",
|
||||
"WHERE",
|
||||
" id = '{{uuid:mocks.0.id}}'"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"organization\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{uuid:data.id}}',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"user\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{uuid:data.id}}',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"person\" (",
|
||||
" \"contact_id\",",
|
||||
" \"date_of_birth\",",
|
||||
" \"first_name\",",
|
||||
" \"id\",",
|
||||
" \"last_name\",",
|
||||
" \"pronouns\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" 'abc-contact',",
|
||||
" '{{timestamp}}',",
|
||||
" 'LookupFirst',",
|
||||
" '{{uuid:data.id}}',",
|
||||
" 'LookupLast',",
|
||||
" 'they/them',",
|
||||
" 'person'",
|
||||
")"
|
||||
"UPDATE agreego.\"entity\" SET",
|
||||
" modified_at = '{{timestamp}}',",
|
||||
" modified_by = '00000000-0000-0000-0000-000000000000'",
|
||||
"WHERE",
|
||||
" id = '{{uuid:mocks.0.id}}'"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.change (",
|
||||
@ -1542,46 +1445,41 @@
|
||||
" \"modified_by\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" NULL,",
|
||||
" '{",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"contact_id\": \"old-contact\"",
|
||||
" }',",
|
||||
" '{",
|
||||
" \"contact_id\": \"abc-contact\",",
|
||||
" \"type\": \"person\"",
|
||||
" }',",
|
||||
" '{{uuid:data.id}}',",
|
||||
" '{{uuid:mocks.0.id}}',",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" 'create',",
|
||||
" 'update',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"id\": \"{{uuid:mocks.0.id}}\",",
|
||||
" \"type\": \"person\",",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"contact_id\": \"abc-contact\",",
|
||||
" \"id\": \"{{uuid:data.id}}\",",
|
||||
" \"type\": \"person\",",
|
||||
" \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"created_at\": \"{{timestamp}}\",",
|
||||
" \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"modified_at\": \"{{timestamp}}\"",
|
||||
" },",
|
||||
" \"new\": {",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"contact_id\": \"abc-contact\",",
|
||||
" \"type\": \"person\"",
|
||||
" }",
|
||||
" },",
|
||||
" \"old\": {",
|
||||
" \"contact_id\": \"old-contact\"",
|
||||
" },",
|
||||
" \"replaces\": \"{{uuid:data.id}}\"",
|
||||
"}'))"
|
||||
]
|
||||
]
|
||||
@ -1615,10 +1513,10 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"organization\" t2 ON ",
|
||||
"JOIN agreego.\"user\" t3 ON ",
|
||||
"JOIN agreego.\"person\" t4 ON ",
|
||||
"FROM agreego.\"person\" t1",
|
||||
"JOIN agreego.\"user\" t2 ON ",
|
||||
"JOIN agreego.\"organization\" t3 ON ",
|
||||
"JOIN agreego.\"entity\" t4 ON ",
|
||||
"WHERE",
|
||||
" t1.id = '{{uuid:data.id}}'",
|
||||
" OR (\"first_name\" = 'LookupFirst'",
|
||||
@ -1626,110 +1524,23 @@
|
||||
" AND \"date_of_birth\" = '{{timestamp}}'",
|
||||
" AND \"pronouns\" = 'they/them'))"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
" \"created_by\",",
|
||||
" \"id\",",
|
||||
" \"modified_at\",",
|
||||
" \"modified_by\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" '{{uuid:data.id}}',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"organization\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{uuid:data.id}}',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"user\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{uuid:data.id}}',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"person\" (",
|
||||
" \"date_of_birth\",",
|
||||
" \"first_name\",",
|
||||
" \"id\",",
|
||||
" \"last_name\",",
|
||||
" \"pronouns\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{timestamp}}',",
|
||||
" 'LookupFirst',",
|
||||
" '{{uuid:data.id}}',",
|
||||
" 'LookupLast',",
|
||||
" 'they/them',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.change (",
|
||||
" \"old\",",
|
||||
" \"new\",",
|
||||
" \"entity_id\",",
|
||||
" \"id\",",
|
||||
" \"kind\",",
|
||||
" \"modified_at\",",
|
||||
" \"modified_by\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" NULL,",
|
||||
" '{",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"type\": \"person\"",
|
||||
" }',",
|
||||
" '{{uuid:data.id}}',",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" 'create',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"id\": \"{{uuid:mocks.0.id}}\",",
|
||||
" \"type\": \"person\",",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"id\": \"{{uuid:data.id}}\",",
|
||||
" \"type\": \"person\",",
|
||||
" \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"created_at\": \"{{timestamp}}\",",
|
||||
" \"contact_id\": \"old-contact\",",
|
||||
" \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"modified_at\": \"{{timestamp}}\"",
|
||||
" },",
|
||||
" \"new\": {",
|
||||
" \"first_name\": \"LookupFirst\",",
|
||||
" \"last_name\": \"LookupLast\",",
|
||||
" \"date_of_birth\": \"{{timestamp}}\",",
|
||||
" \"pronouns\": \"they/them\",",
|
||||
" \"type\": \"person\"",
|
||||
" }",
|
||||
" },",
|
||||
" \"replaces\": \"{{uuid:data.id}}\"",
|
||||
"}'))"
|
||||
]
|
||||
]
|
||||
@ -1758,64 +1569,26 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"organization\" t2 ON ",
|
||||
"JOIN agreego.\"user\" t3 ON ",
|
||||
"JOIN agreego.\"person\" t4 ON ",
|
||||
"FROM agreego.\"person\" t1",
|
||||
"JOIN agreego.\"user\" t2 ON ",
|
||||
"JOIN agreego.\"organization\" t3 ON ",
|
||||
"JOIN agreego.\"entity\" t4 ON ",
|
||||
"WHERE",
|
||||
" t1.id = '{{uuid:mocks.0.id}}')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"created_at\",",
|
||||
" \"created_by\",",
|
||||
" \"id\",",
|
||||
" \"modified_at\",",
|
||||
" \"modified_by\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" '{{uuid:mocks.0.id}}',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" 'person'",
|
||||
")"
|
||||
"UPDATE agreego.\"person\" SET",
|
||||
" first_name = 'NewFirst',",
|
||||
" last_name = 'NewLast'",
|
||||
"WHERE",
|
||||
" id = '{{uuid:mocks.0.id}}'"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"organization\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{uuid:mocks.0.id}}',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"user\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" '{{uuid:mocks.0.id}}',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"person\" (",
|
||||
" \"first_name\",",
|
||||
" \"id\",",
|
||||
" \"last_name\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" 'NewFirst',",
|
||||
" '{{uuid:mocks.0.id}}',",
|
||||
" 'NewLast',",
|
||||
" 'person'",
|
||||
")"
|
||||
"UPDATE agreego.\"entity\" SET",
|
||||
" modified_at = '{{timestamp}}',",
|
||||
" modified_by = '00000000-0000-0000-0000-000000000000'",
|
||||
"WHERE",
|
||||
" id = '{{uuid:mocks.0.id}}'"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.change (",
|
||||
@ -1828,7 +1601,10 @@
|
||||
" \"modified_by\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" NULL,",
|
||||
" '{",
|
||||
" \"first_name\": \"OldFirst\",",
|
||||
" \"last_name\": \"OldLast\"",
|
||||
" }',",
|
||||
" '{",
|
||||
" \"first_name\": \"NewFirst\",",
|
||||
" \"last_name\": \"NewLast\",",
|
||||
@ -1836,21 +1612,18 @@
|
||||
" }',",
|
||||
" '{{uuid:mocks.0.id}}',",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" 'create',",
|
||||
" 'update',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"first_name\": \"NewFirst\",",
|
||||
" \"last_name\": \"NewLast\",",
|
||||
" \"id\": \"{{uuid:mocks.0.id}}\",",
|
||||
" \"type\": \"person\",",
|
||||
" \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"created_at\": \"{{timestamp}}\",",
|
||||
" \"first_name\": \"NewFirst\",",
|
||||
" \"last_name\": \"NewLast\",",
|
||||
" \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"modified_at\": \"{{timestamp}}\"",
|
||||
" },",
|
||||
@ -1858,6 +1631,10 @@
|
||||
" \"first_name\": \"NewFirst\",",
|
||||
" \"last_name\": \"NewLast\",",
|
||||
" \"type\": \"person\"",
|
||||
" },",
|
||||
" \"old\": {",
|
||||
" \"first_name\": \"OldFirst\",",
|
||||
" \"last_name\": \"OldLast\"",
|
||||
" }",
|
||||
"}'))"
|
||||
]
|
||||
@ -1881,10 +1658,10 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"organization\" t2 ON ",
|
||||
"JOIN agreego.\"user\" t3 ON ",
|
||||
"JOIN agreego.\"person\" t4 ON ",
|
||||
"FROM agreego.\"person\" t1",
|
||||
"JOIN agreego.\"user\" t2 ON ",
|
||||
"JOIN agreego.\"organization\" t3 ON ",
|
||||
"JOIN agreego.\"entity\" t4 ON ",
|
||||
"WHERE",
|
||||
" t1.id = '123')"
|
||||
],
|
||||
@ -1972,7 +1749,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"first_name\": \"John\",",
|
||||
" \"last_name\": \"Doe\",",
|
||||
@ -2154,7 +1930,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"total\": 100.0,",
|
||||
" \"id\": \"{{uuid:generated_3}}\",",
|
||||
@ -2174,7 +1949,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"first_name\": \"Bob\",",
|
||||
" \"last_name\": \"Smith\",",
|
||||
@ -2220,8 +1994,8 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"order\" t2 ON ",
|
||||
"FROM agreego.\"order\" t1",
|
||||
"JOIN agreego.\"entity\" t2 ON ",
|
||||
"WHERE",
|
||||
" t1.id = 'abc'",
|
||||
" OR (\"id\" = 'abc'))"
|
||||
@ -2340,7 +2114,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"total\": 99.0,",
|
||||
" \"id\": \"abc\",",
|
||||
@ -2358,7 +2131,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"product\": \"Widget\",",
|
||||
" \"price\": 99.0,",
|
||||
@ -2847,7 +2619,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"first_name\": \"Relation\",",
|
||||
" \"last_name\": \"Test\",",
|
||||
@ -2867,7 +2638,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"is_primary\": true,",
|
||||
" \"source_id\": \"{{uuid:generated_0}}\",",
|
||||
@ -2893,7 +2663,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"number\": \"555-0001\",",
|
||||
" \"id\": \"{{uuid:generated_1}}\",",
|
||||
@ -2911,7 +2680,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"is_primary\": false,",
|
||||
" \"source_id\": \"{{uuid:generated_0}}\",",
|
||||
@ -2937,7 +2705,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"address\": \"test@example.com\",",
|
||||
" \"id\": \"{{uuid:generated_5}}\",",
|
||||
@ -2955,7 +2722,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"is_primary\": false,",
|
||||
" \"source_id\": \"{{uuid:generated_0}}\",",
|
||||
@ -2981,7 +2747,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"address\": \"test2@example.com\",",
|
||||
" \"id\": \"{{uuid:generated_9}}\",",
|
||||
@ -3023,62 +2788,20 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"organization\" t2 ON ",
|
||||
"JOIN agreego.\"user\" t3 ON ",
|
||||
"JOIN agreego.\"person\" t4 ON ",
|
||||
"FROM agreego.\"person\" t1",
|
||||
"JOIN agreego.\"user\" t2 ON ",
|
||||
"JOIN agreego.\"organization\" t3 ON ",
|
||||
"JOIN agreego.\"entity\" t4 ON ",
|
||||
"WHERE",
|
||||
" t1.id = 'abc-archived')"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"entity\" (",
|
||||
" \"archived\",",
|
||||
" \"created_at\",",
|
||||
" \"created_by\",",
|
||||
" \"id\",",
|
||||
" \"modified_at\",",
|
||||
" \"modified_by\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" true,",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" 'abc-archived',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"organization\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" 'abc-archived',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"user\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" 'abc-archived',",
|
||||
" 'person'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.\"person\" (",
|
||||
" \"id\",",
|
||||
" \"type\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" 'abc-archived',",
|
||||
" 'person'",
|
||||
")"
|
||||
"UPDATE agreego.\"entity\" SET",
|
||||
" archived = true,",
|
||||
" modified_at = '{{timestamp}}',",
|
||||
" modified_by = '00000000-0000-0000-0000-000000000000'",
|
||||
"WHERE",
|
||||
" id = 'abc-archived'"
|
||||
],
|
||||
[
|
||||
"INSERT INTO agreego.change (",
|
||||
@ -3091,33 +2814,37 @@
|
||||
" \"modified_by\"",
|
||||
")",
|
||||
"VALUES (",
|
||||
" NULL,",
|
||||
" '{",
|
||||
" \"archived\": false",
|
||||
" }',",
|
||||
" '{",
|
||||
" \"archived\": true,",
|
||||
" \"type\": \"person\"",
|
||||
" }',",
|
||||
" 'abc-archived',",
|
||||
" '{{uuid:generated_0}}',",
|
||||
" 'create',",
|
||||
" 'delete',",
|
||||
" '{{timestamp}}',",
|
||||
" '00000000-0000-0000-0000-000000000000'",
|
||||
")"
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"archived\": true,",
|
||||
" \"id\": \"abc-archived\",",
|
||||
" \"type\": \"person\",",
|
||||
" \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"created_at\": \"{{timestamp}}\",",
|
||||
" \"first_name\": \"ArchivedFirst\",",
|
||||
" \"last_name\": \"ArchivedLast\",",
|
||||
" \"archived\": true,",
|
||||
" \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
|
||||
" \"modified_at\": \"{{timestamp}}\"",
|
||||
" },",
|
||||
" \"new\": {",
|
||||
" \"archived\": true,",
|
||||
" \"type\": \"person\"",
|
||||
" },",
|
||||
" \"old\": {",
|
||||
" \"archived\": false",
|
||||
" }",
|
||||
"}'))"
|
||||
]
|
||||
@ -3216,7 +2943,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"flags\": [",
|
||||
" \"urgent\",",
|
||||
@ -3332,7 +3058,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"product\": \"Widget\",",
|
||||
" \"price\": 99.0,",
|
||||
@ -3376,8 +3101,8 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"order_line\" t2 ON ",
|
||||
"FROM agreego.\"order_line\" t1",
|
||||
"JOIN agreego.\"entity\" t2 ON ",
|
||||
"WHERE",
|
||||
" t1.id = '{{uuid:data.lines.0.id}}')"
|
||||
],
|
||||
@ -3442,7 +3167,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"product\": \"Widget\",",
|
||||
" \"price\": 99.0,",
|
||||
@ -3500,8 +3224,8 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"invoice\" t2 ON ",
|
||||
"FROM agreego.\"invoice\" t1",
|
||||
"JOIN agreego.\"entity\" t2 ON ",
|
||||
"WHERE",
|
||||
" t1.id = '{{uuid:data.id}}'",
|
||||
" OR (\"id\" = '{{uuid:data.id}}'))"
|
||||
@ -3617,8 +3341,8 @@
|
||||
"sql": [
|
||||
[
|
||||
"(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
|
||||
"FROM agreego.\"entity\" t1",
|
||||
"JOIN agreego.\"account\" t2 ON ",
|
||||
"FROM agreego.\"account\" t1",
|
||||
"JOIN agreego.\"entity\" t2 ON ",
|
||||
"WHERE",
|
||||
" t1.id = '{{uuid:data.id}}')"
|
||||
],
|
||||
@ -3680,7 +3404,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"kind\": \"checking\",",
|
||||
" \"routing_number\": \"123456789\",",
|
||||
@ -3975,7 +3698,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"organization_id\": \"parent-org-id\",",
|
||||
" \"id\": \"{{uuid:generated_3}}\",",
|
||||
@ -3995,7 +3717,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"first_name\": \"Const\",",
|
||||
" \"last_name\": \"Person\",",
|
||||
@ -4017,7 +3738,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"order_id\": \"{{uuid:generated_3}}\",",
|
||||
" \"id\": \"{{uuid:generated_4}}\",",
|
||||
@ -4037,7 +3757,6 @@
|
||||
],
|
||||
[
|
||||
"(SELECT pg_notify('entity', '{",
|
||||
" \"kind\": \"create\",",
|
||||
" \"complete\": {",
|
||||
" \"organization_id\": \"explicit-org-id\",",
|
||||
" \"order_id\": \"{{uuid:generated_3}}\",",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -159,9 +159,7 @@ impl Schema {
|
||||
},
|
||||
"null" => None,
|
||||
custom => {
|
||||
if custom.ends_with(".condition") || custom.ends_with(".filter") {
|
||||
Some(vec![custom.to_string()])
|
||||
} else if db.enums.contains_key(custom) {
|
||||
if db.enums.contains_key(custom) {
|
||||
Some(vec![format!("{}.condition", custom)])
|
||||
} else {
|
||||
// Assume anything else is a Relational cross-boundary that already has its own .filter dynamically built
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
use serde_json::Value;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use serde_json::Value;
|
||||
|
||||
pub fn compose(val: &mut Value, errors: &mut Vec<crate::drop::Error>) -> Result<(), String> {
|
||||
let _ = std::fs::write("/Users/awgneo/Repositories/thoughtpatterns/cellular/jspg/traits_debug_val.json", serde_json::to_string_pretty(val).unwrap());
|
||||
let mut traits = HashMap::new();
|
||||
let mut schemas = HashMap::new();
|
||||
|
||||
@ -73,9 +74,7 @@ fn resolve_in_place(
|
||||
return;
|
||||
}
|
||||
|
||||
let include_opt = current
|
||||
.as_object_mut()
|
||||
.and_then(|obj| obj.remove("include"));
|
||||
let include_opt = current.as_object_mut().and_then(|obj| obj.remove("include"));
|
||||
if let Some(include_val) = include_opt {
|
||||
if let Some(include_arr) = include_val.as_array() {
|
||||
let mut merged_props = serde_json::Map::new();
|
||||
@ -146,10 +145,7 @@ fn resolve_in_place(
|
||||
visited.remove(inc_name);
|
||||
|
||||
// Merge properties (host overrides trait)
|
||||
if let Some(target_props) = resolved_target
|
||||
.get("properties")
|
||||
.and_then(|v| v.as_object())
|
||||
{
|
||||
if let Some(target_props) = resolved_target.get("properties").and_then(|v| v.as_object()) {
|
||||
for (k, v) in target_props {
|
||||
if !merged_props.contains_key(k) {
|
||||
merged_props.insert(k.clone(), v.clone());
|
||||
@ -158,10 +154,7 @@ fn resolve_in_place(
|
||||
}
|
||||
|
||||
// Merge patternProperties (host overrides trait)
|
||||
if let Some(target_pat_props) = resolved_target
|
||||
.get("patternProperties")
|
||||
.and_then(|v| v.as_object())
|
||||
{
|
||||
if let Some(target_pat_props) = resolved_target.get("patternProperties").and_then(|v| v.as_object()) {
|
||||
for (k, v) in target_pat_props {
|
||||
if !merged_pattern_props.contains_key(k) {
|
||||
merged_pattern_props.insert(k.clone(), v.clone());
|
||||
@ -188,19 +181,11 @@ fn resolve_in_place(
|
||||
}
|
||||
|
||||
// Merge dependencies
|
||||
if let Some(target_deps) = resolved_target
|
||||
.get("dependencies")
|
||||
.and_then(|v| v.as_object())
|
||||
{
|
||||
if let Some(target_deps) = resolved_target.get("dependencies").and_then(|v| v.as_object()) {
|
||||
for (dep_prop, dep_val) in target_deps {
|
||||
if let Some(existing_val) = merged_dependencies.get_mut(dep_prop) {
|
||||
if let (Some(arr_existing), Some(arr_target)) =
|
||||
(existing_val.as_array_mut(), dep_val.as_array())
|
||||
{
|
||||
let mut set: HashSet<String> = arr_existing
|
||||
.iter()
|
||||
.filter_map(|x| x.as_str().map(String::from))
|
||||
.collect();
|
||||
if let (Some(arr_existing), Some(arr_target)) = (existing_val.as_array_mut(), dep_val.as_array()) {
|
||||
let mut set: HashSet<String> = arr_existing.iter().filter_map(|x| x.as_str().map(String::from)).collect();
|
||||
for x in arr_target {
|
||||
if let Some(s) = x.as_str() {
|
||||
if set.insert(s.to_string()) {
|
||||
@ -218,13 +203,7 @@ fn resolve_in_place(
|
||||
// Inherit other non-merged schemas/scalars if not defined in host (type, items, cases, family, format, etc.)
|
||||
if let Some(obj) = current.as_object_mut() {
|
||||
for (k, v) in resolved_target.as_object().unwrap() {
|
||||
if k != "properties"
|
||||
&& k != "patternProperties"
|
||||
&& k != "required"
|
||||
&& k != "display"
|
||||
&& k != "dependencies"
|
||||
&& k != "include"
|
||||
{
|
||||
if k != "properties" && k != "patternProperties" && k != "required" && k != "display" && k != "dependencies" && k != "include" {
|
||||
if !obj.contains_key(k) {
|
||||
obj.insert(k.clone(), v.clone());
|
||||
}
|
||||
@ -250,10 +229,7 @@ fn resolve_in_place(
|
||||
obj.insert("properties".to_string(), Value::Object(merged_props));
|
||||
}
|
||||
if !merged_pattern_props.is_empty() {
|
||||
obj.insert(
|
||||
"patternProperties".to_string(),
|
||||
Value::Object(merged_pattern_props),
|
||||
);
|
||||
obj.insert("patternProperties".to_string(), Value::Object(merged_pattern_props));
|
||||
}
|
||||
if !merged_required.is_empty() {
|
||||
let mut req_vec: Vec<Value> = merged_required.into_iter().map(Value::String).collect();
|
||||
@ -266,10 +242,7 @@ fn resolve_in_place(
|
||||
obj.insert("display".to_string(), Value::Array(disp_vec));
|
||||
}
|
||||
if !merged_dependencies.is_empty() {
|
||||
obj.insert(
|
||||
"dependencies".to_string(),
|
||||
Value::Object(merged_dependencies),
|
||||
);
|
||||
obj.insert("dependencies".to_string(), Value::Object(merged_dependencies));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -279,138 +252,47 @@ fn resolve_in_place(
|
||||
if let Some(obj) = current.as_object_mut() {
|
||||
if let Some(props) = obj.get_mut("properties").and_then(|v| v.as_object_mut()) {
|
||||
for (k, v) in props {
|
||||
resolve_in_place(
|
||||
v,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/{}", path, k),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(v, traits, schemas, errors, schema_id, &format!("{}/{}", path, k), visited);
|
||||
}
|
||||
}
|
||||
if let Some(pat_props) = obj
|
||||
.get_mut("patternProperties")
|
||||
.and_then(|v| v.as_object_mut())
|
||||
{
|
||||
if let Some(pat_props) = obj.get_mut("patternProperties").and_then(|v| v.as_object_mut()) {
|
||||
for (k, v) in pat_props {
|
||||
resolve_in_place(
|
||||
v,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/{}", path, k),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(v, traits, schemas, errors, schema_id, &format!("{}/{}", path, k), visited);
|
||||
}
|
||||
}
|
||||
if let Some(items) = obj.get_mut("items") {
|
||||
resolve_in_place(
|
||||
items,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/items", path),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(items, traits, schemas, errors, schema_id, &format!("{}/items", path), visited);
|
||||
}
|
||||
if let Some(prefix_items) = obj.get_mut("prefixItems").and_then(|v| v.as_array_mut()) {
|
||||
for (i, v) in prefix_items.iter_mut().enumerate() {
|
||||
resolve_in_place(
|
||||
v,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/prefixItems/{}", path, i),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(v, traits, schemas, errors, schema_id, &format!("{}/prefixItems/{}", path, i), visited);
|
||||
}
|
||||
}
|
||||
if let Some(additional_props) = obj.get_mut("additionalProperties") {
|
||||
resolve_in_place(
|
||||
additional_props,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/additionalProperties", path),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(additional_props, traits, schemas, errors, schema_id, &format!("{}/additionalProperties", path), visited);
|
||||
}
|
||||
if let Some(one_of) = obj.get_mut("oneOf").and_then(|v| v.as_array_mut()) {
|
||||
for (i, v) in one_of.iter_mut().enumerate() {
|
||||
resolve_in_place(
|
||||
v,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/oneOf/{}", path, i),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(v, traits, schemas, errors, schema_id, &format!("{}/oneOf/{}", path, i), visited);
|
||||
}
|
||||
}
|
||||
if let Some(contains) = obj.get_mut("contains") {
|
||||
resolve_in_place(
|
||||
contains,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/contains", path),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(contains, traits, schemas, errors, schema_id, &format!("{}/contains", path), visited);
|
||||
}
|
||||
if let Some(not) = obj.get_mut("not") {
|
||||
resolve_in_place(
|
||||
not,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/not", path),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(not, traits, schemas, errors, schema_id, &format!("{}/not", path), visited);
|
||||
}
|
||||
if let Some(cases) = obj.get_mut("cases").and_then(|v| v.as_array_mut()) {
|
||||
for (i, c_val) in cases.iter_mut().enumerate() {
|
||||
if let Some(c_obj) = c_val.as_object_mut() {
|
||||
if let Some(when) = c_obj.get_mut("when") {
|
||||
resolve_in_place(
|
||||
when,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/cases/{}/when", path, i),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(when, traits, schemas, errors, schema_id, &format!("{}/cases/{}/when", path, i), visited);
|
||||
}
|
||||
if let Some(then) = c_obj.get_mut("then") {
|
||||
resolve_in_place(
|
||||
then,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/cases/{}/then", path, i),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(then, traits, schemas, errors, schema_id, &format!("{}/cases/{}/then", path, i), visited);
|
||||
}
|
||||
if let Some(else_) = c_obj.get_mut("else") {
|
||||
resolve_in_place(
|
||||
else_,
|
||||
traits,
|
||||
schemas,
|
||||
errors,
|
||||
schema_id,
|
||||
&format!("{}/cases/{}/else", path, i),
|
||||
visited,
|
||||
);
|
||||
resolve_in_place(else_, traits, schemas, errors, schema_id, &format!("{}/cases/{}/else", path, i), visited);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -206,7 +206,6 @@ impl Database {
|
||||
self.executor.timestamp()
|
||||
}
|
||||
|
||||
|
||||
pub fn compile(&mut self, errors: &mut Vec<crate::drop::Error>) {
|
||||
// Phase 1: Registration
|
||||
self.collect_schemas(errors);
|
||||
|
||||
@ -138,9 +138,7 @@ impl Merger {
|
||||
is_child: bool,
|
||||
) -> Result<Value, String> {
|
||||
match data {
|
||||
Value::Array(items) => {
|
||||
self.merge_array(schema, items, notifications, parent_org_id, is_child)
|
||||
}
|
||||
Value::Array(items) => self.merge_array(schema, items, notifications, parent_org_id, is_child),
|
||||
Value::Object(map) => {
|
||||
if let Some(options) = schema.obj.compiled_options.get() {
|
||||
if let Some(disc) = schema.obj.compiled_discriminator.get() {
|
||||
@ -212,13 +210,7 @@ impl Merger {
|
||||
|
||||
let mut resolved_items = Vec::new();
|
||||
for item in items {
|
||||
let resolved = self.merge_internal(
|
||||
item_schema.clone(),
|
||||
item,
|
||||
notifications,
|
||||
parent_org_id.clone(),
|
||||
is_child,
|
||||
)?;
|
||||
let resolved = self.merge_internal(item_schema.clone(), item, notifications, parent_org_id.clone(), is_child)?;
|
||||
resolved_items.push(resolved);
|
||||
}
|
||||
Ok(Value::Array(resolved_items))
|
||||
@ -348,10 +340,7 @@ impl Merger {
|
||||
if let Some(relation) = self.db.relations.get(&edge.constraint) {
|
||||
let parent_is_source = edge.forward;
|
||||
|
||||
let org_id_to_pass = entity_fields
|
||||
.get("organization_id")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s.to_string());
|
||||
let org_id_to_pass = entity_fields.get("organization_id").and_then(|v| v.as_str()).map(|s| s.to_string());
|
||||
if parent_is_source {
|
||||
let mut merged_relative = match self.merge_internal(
|
||||
rel_schema.clone(),
|
||||
@ -454,10 +443,7 @@ impl Merger {
|
||||
}
|
||||
}
|
||||
|
||||
let org_id_to_pass = entity_fields
|
||||
.get("organization_id")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s.to_string());
|
||||
let org_id_to_pass = entity_fields.get("organization_id").and_then(|v| v.as_str()).map(|s| s.to_string());
|
||||
let mut relative_responses = Vec::new();
|
||||
for relative_item_val in relative_arr {
|
||||
if let Value::Object(mut relative_item) = relative_item_val {
|
||||
@ -588,7 +574,7 @@ impl Merger {
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("");
|
||||
let id_val = if entity_id.is_empty() {
|
||||
Value::String(uuid::Uuid::now_v7().to_string())
|
||||
Value::String(uuid::Uuid::new_v4().to_string())
|
||||
} else {
|
||||
Value::String(entity_id.to_string())
|
||||
};
|
||||
@ -791,8 +777,13 @@ impl Merger {
|
||||
}
|
||||
};
|
||||
|
||||
for table_name in &entity_type.hierarchy {
|
||||
let table_fields = match grouped_fields.get(table_name).and_then(|v| v.as_array()) {
|
||||
let mut execute_order: Vec<String> = entity_type.hierarchy.clone();
|
||||
if change_kind == "create" {
|
||||
execute_order.reverse();
|
||||
}
|
||||
|
||||
for table_name in execute_order {
|
||||
let table_fields = match grouped_fields.get(&table_name).and_then(|v| v.as_array()) {
|
||||
Some(arr) => arr
|
||||
.iter()
|
||||
.filter_map(|v| v.as_str().map(|s| s.to_string()))
|
||||
@ -956,7 +947,6 @@ impl Merger {
|
||||
};
|
||||
|
||||
let mut notification = serde_json::Map::new();
|
||||
notification.insert("kind".to_string(), Value::String(change_kind.to_string()));
|
||||
notification.insert("complete".to_string(), Value::Object(complete));
|
||||
notification.insert("new".to_string(), new_val_obj.clone());
|
||||
|
||||
@ -971,11 +961,11 @@ impl Merger {
|
||||
let mut notify_sql = None;
|
||||
if type_obj.historical && change_kind != "replace" {
|
||||
let change_sql = format!(
|
||||
"INSERT INTO agreego.change (\"old\", \"new\", \"entity_id\", \"id\", \"kind\", \"modified_at\", \"modified_by\") VALUES ({}, {}, {}, {}, {}, {}, {})",
|
||||
"INSERT INTO agreego.change (\"old\", \"new\", entity_id, id, kind, modified_at, modified_by) VALUES ({}, {}, {}, {}, {}, {}, {})",
|
||||
Self::quote_literal(&old_val_obj),
|
||||
Self::quote_literal(&new_val_obj),
|
||||
Self::quote_literal(id_str),
|
||||
Self::quote_literal(&Value::String(uuid::Uuid::now_v7().to_string())),
|
||||
Self::quote_literal(&Value::String(uuid::Uuid::new_v4().to_string())),
|
||||
Self::quote_literal(&Value::String(change_kind.to_string())),
|
||||
Self::quote_literal(&Value::String(timestamp.to_string())),
|
||||
Self::quote_literal(&Value::String(user_id.to_string()))
|
||||
|
||||
@ -621,17 +621,19 @@ impl<'a> Compiler<'a> {
|
||||
.get(table_to_alias)
|
||||
.or_else(|| type_aliases.get(&node.parent_alias))
|
||||
{
|
||||
// DEBUG: See what variations we have for this type
|
||||
#[cfg(not(test))]
|
||||
pgrx::notice!("JSPG_POLY_BOUNDS: type={}, col={}, variations_len={}, variations={:?}", type_name, col, type_def.variations.len(), type_def.variations);
|
||||
|
||||
// Use IN clause with all variations to support inherited types.
|
||||
// e.g., "asset" has variations ["asset", "property", "unit", ...]
|
||||
// so target_type IN ('asset','property','unit') instead of = 'asset'
|
||||
if type_def.variations.len() > 1 {
|
||||
let quoted: Vec<String> = type_def
|
||||
.variations
|
||||
.iter()
|
||||
let quoted: Vec<String> = type_def.variations.iter()
|
||||
.map(|v| format!("'{}'", v))
|
||||
.collect();
|
||||
where_clauses.push(format!(
|
||||
"{}.{} IN ({})",
|
||||
alias,
|
||||
col,
|
||||
quoted.join(", ")
|
||||
"{}.{} IN ({})", alias, col, quoted.join(", ")
|
||||
));
|
||||
} else {
|
||||
where_clauses.push(format!("{}.{} = '{}'", alias, col, type_name));
|
||||
|
||||
@ -50,6 +50,10 @@ impl Queryer {
|
||||
Err(drop) => return drop,
|
||||
};
|
||||
|
||||
// DEBUG: Emit compiled SQL as a NOTICE for inspection
|
||||
#[cfg(not(test))]
|
||||
pgrx::notice!("JSPG_SQL[{}]: {}", schema_id, sql);
|
||||
|
||||
// 3. Execute via Database Executor
|
||||
self.execute_sql(schema_id, &sql, args)
|
||||
}
|
||||
|
||||
@ -1277,18 +1277,6 @@ fn test_dynamic_type_0_4() {
|
||||
crate::tests::runner::run_test_case(&path, 0, 4).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_dynamic_type_0_5() {
|
||||
let path = format!("{}/fixtures/dynamicType.json", env!("CARGO_MANIFEST_DIR"));
|
||||
crate::tests::runner::run_test_case(&path, 0, 5).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_dynamic_type_0_6() {
|
||||
let path = format!("{}/fixtures/dynamicType.json", env!("CARGO_MANIFEST_DIR"));
|
||||
crate::tests::runner::run_test_case(&path, 0, 6).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_property_names_0_0() {
|
||||
let path = format!("{}/fixtures/propertyNames.json", env!("CARGO_MANIFEST_DIR"));
|
||||
|
||||
177
src/tests/inheritance_matching.rs
Normal file
177
src/tests/inheritance_matching.rs
Normal file
@ -0,0 +1,177 @@
|
||||
use crate::*;
|
||||
use serde_json::json;
|
||||
|
||||
fn setup_dynamic_pointer_db() {
|
||||
let db_json = json!({
|
||||
"puncs": [],
|
||||
"enums": [],
|
||||
"relations": [],
|
||||
"types": [
|
||||
{
|
||||
"name": "bid.evaluation_context",
|
||||
"variations": ["bid.evaluation_context"],
|
||||
"hierarchy": ["bid.evaluation_context", "entity"],
|
||||
"schemas": {
|
||||
"bid.evaluation_context": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"amount": { "type": "number" }
|
||||
},
|
||||
"required": ["amount"]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "work_order.evaluation_context",
|
||||
"variations": ["work_order.evaluation_context"],
|
||||
"hierarchy": ["work_order.evaluation_context", "entity"],
|
||||
"schemas": {
|
||||
"work_order.evaluation_context": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"vendor_id": { "type": "string" }
|
||||
},
|
||||
"required": ["vendor_id"]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "evaluation_rule",
|
||||
"variations": ["evaluation_rule"],
|
||||
"hierarchy": ["evaluation_rule", "entity"],
|
||||
"schemas": {
|
||||
"evaluation_rule": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"entity_type": { "type": "string" },
|
||||
"evaluation_context": { "type": "$entity_type.evaluation_context" }
|
||||
},
|
||||
"required": ["entity_type", "evaluation_context"]
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
});
|
||||
|
||||
let setup_res = jspg_setup(Json(db_json));
|
||||
assert_eq!(
|
||||
setup_res.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"response": "success"
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
fn test_structural_inheritance_dynamic_pointer() {
|
||||
setup_dynamic_pointer_db();
|
||||
|
||||
// 1. Happy path: entity_type = bid, evaluation_context matches bid.evaluation_context
|
||||
let happy_bid = json!({
|
||||
"entity_type": "bid",
|
||||
"evaluation_context": {
|
||||
"amount": 5000
|
||||
}
|
||||
});
|
||||
let res_happy_bid = jspg_validate("evaluation_rule", JsonB(happy_bid));
|
||||
assert_eq!(
|
||||
res_happy_bid.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"response": "success"
|
||||
})
|
||||
);
|
||||
|
||||
// 2. Happy path: entity_type = work_order, evaluation_context matches work_order.evaluation_context
|
||||
let happy_wo = json!({
|
||||
"entity_type": "work_order",
|
||||
"evaluation_context": {
|
||||
"vendor_id": "vendor-123"
|
||||
}
|
||||
});
|
||||
let res_happy_wo = jspg_validate("evaluation_rule", JsonB(happy_wo));
|
||||
assert_eq!(
|
||||
res_happy_wo.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"response": "success"
|
||||
})
|
||||
);
|
||||
|
||||
// 3. Unhappy path: entity_type = bid but evaluation_context has invalid schema (missing required field 'amount')
|
||||
let unhappy_bid = json!({
|
||||
"entity_type": "bid",
|
||||
"evaluation_context": {
|
||||
"vendor_id": "vendor-123"
|
||||
}
|
||||
});
|
||||
let res_unhappy_bid = jspg_validate("evaluation_rule", JsonB(unhappy_bid));
|
||||
assert_eq!(
|
||||
res_unhappy_bid.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"errors": [
|
||||
{
|
||||
"code": "REQUIRED_FIELD_MISSING",
|
||||
"message": "Missing amount",
|
||||
"details": { "path": "evaluation_context/amount" }
|
||||
},
|
||||
{
|
||||
"code": "STRICT_PROPERTY_VIOLATION",
|
||||
"message": "Unexpected property 'vendor_id'",
|
||||
"details": { "path": "evaluation_context/vendor_id" }
|
||||
}
|
||||
]
|
||||
})
|
||||
);
|
||||
|
||||
// 4. Missing discriminator: dynamic pointer cannot resolve property 'entity_type'
|
||||
let missing_disc = json!({
|
||||
"evaluation_context": {}
|
||||
});
|
||||
let res_missing_disc = jspg_validate("evaluation_rule", JsonB(missing_disc));
|
||||
assert_eq!(
|
||||
res_missing_disc.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"errors": [
|
||||
{
|
||||
"code": "REQUIRED_FIELD_MISSING",
|
||||
"message": "Missing entity_type",
|
||||
"details": { "path": "entity_type" }
|
||||
},
|
||||
{
|
||||
"code": "DYNAMIC_TYPE_RESOLUTION_FAILED",
|
||||
"message": "Dynamic type pointer '$entity_type.evaluation_context' could not resolve discriminator property 'entity_type' on parent instance",
|
||||
"details": { "path": "evaluation_context" }
|
||||
}
|
||||
]
|
||||
})
|
||||
);
|
||||
|
||||
// 5. Unregistered discriminator: target not found in registry
|
||||
let unknown_disc = json!({
|
||||
"entity_type": "unknown",
|
||||
"evaluation_context": {}
|
||||
});
|
||||
let res_unknown_disc = jspg_validate("evaluation_rule", JsonB(unknown_disc));
|
||||
assert_eq!(
|
||||
res_unknown_disc.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"errors": [
|
||||
{
|
||||
"code": "DYNAMIC_TYPE_RESOLUTION_FAILED",
|
||||
"message": "Resolved dynamic type pointer 'unknown.evaluation_context' was not found in schema registry",
|
||||
"details": { "path": "evaluation_context" }
|
||||
}
|
||||
]
|
||||
})
|
||||
);
|
||||
|
||||
let _ = jspg_teardown();
|
||||
}
|
||||
|
||||
pub fn run_all() {
|
||||
test_structural_inheritance_dynamic_pointer();
|
||||
}
|
||||
124
src/tests/inline_validator.rs
Normal file
124
src/tests/inline_validator.rs
Normal file
@ -0,0 +1,124 @@
|
||||
use crate::*;
|
||||
use serde_json::json;
|
||||
|
||||
fn setup_simple_db() {
|
||||
let db_json = json!({
|
||||
"puncs": [],
|
||||
"enums": [],
|
||||
"relations": [],
|
||||
"types": [
|
||||
{
|
||||
"name": "person",
|
||||
"variations": ["person"],
|
||||
"hierarchy": ["person", "entity"],
|
||||
"schemas": {
|
||||
"person": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": { "type": "string" },
|
||||
"name": { "type": "string" }
|
||||
},
|
||||
"required": ["name"]
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
});
|
||||
let setup_res = jspg_setup(Json(db_json));
|
||||
assert_eq!(
|
||||
setup_res.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"response": "success"
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
fn test_inline_schema_happy_path() {
|
||||
// 1. Valid instance matching the inline schema
|
||||
let inline_schema = r#"{"type": "object", "properties": {"age": {"type": "number"}}, "required": ["age"]}"#;
|
||||
let happy_res = jspg_validate(inline_schema, JsonB(json!({"age": 42})));
|
||||
assert_eq!(
|
||||
happy_res.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"response": "success"
|
||||
})
|
||||
);
|
||||
|
||||
// 2. Invalid instance failing the inline schema (missing required field)
|
||||
let unhappy_res = jspg_validate(inline_schema, JsonB(json!({"name": "Neo"})));
|
||||
assert_eq!(
|
||||
unhappy_res.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"errors": [
|
||||
{
|
||||
"code": "REQUIRED_FIELD_MISSING",
|
||||
"message": "Missing age",
|
||||
"details": { "path": "age" }
|
||||
},
|
||||
{
|
||||
"code": "STRICT_PROPERTY_VIOLATION",
|
||||
"message": "Unexpected property 'name'",
|
||||
"details": { "path": "name" }
|
||||
}
|
||||
]
|
||||
})
|
||||
);
|
||||
|
||||
// 3. Inline schema referencing registered custom type "person"
|
||||
let inline_with_ref = r#"{"type": "object", "properties": {"who": {"type": "person"}}, "required": ["who"]}"#;
|
||||
let happy_ref_res = jspg_validate(inline_with_ref, JsonB(json!({"who": {"type": "person", "name": "Morpheus"}})));
|
||||
assert_eq!(
|
||||
happy_ref_res.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"response": "success"
|
||||
})
|
||||
);
|
||||
|
||||
let unhappy_ref_res = jspg_validate(inline_with_ref, JsonB(json!({"who": {"type": "person"}})));
|
||||
assert_eq!(
|
||||
unhappy_ref_res.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"errors": [
|
||||
{
|
||||
"code": "REQUIRED_FIELD_MISSING",
|
||||
"message": "Missing name",
|
||||
"details": { "path": "who/name" }
|
||||
}
|
||||
]
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
fn test_inline_schema_syntax_errors() {
|
||||
let malformed_schema = r#"{"type": "object", "properties": {"name": {"type": "#;
|
||||
let res = jspg_validate(malformed_schema, JsonB(json!({})));
|
||||
|
||||
let errors = res.0.get("errors").expect("Expected errors block");
|
||||
let err = errors.get(0).expect("Expected at least one error");
|
||||
assert_eq!(err.get("code").unwrap().as_str().unwrap(), "SCHEMA_PARSE_FAILED");
|
||||
assert!(err.get("message").unwrap().as_str().unwrap().contains("Failed to parse inline schema"));
|
||||
}
|
||||
|
||||
fn test_inline_schema_ref_compilation_errors() {
|
||||
// Try to use a custom type that is not defined in the compiled database context.
|
||||
let invalid_ref_schema = r#"{"type": "object", "properties": {"item": {"type": "non_existent_type"}}}"#;
|
||||
let res = jspg_validate(invalid_ref_schema, JsonB(json!({"item": {}})));
|
||||
|
||||
let errors = res.0.get("errors").expect("Expected errors block");
|
||||
let err = errors.get(0).expect("Expected compilation error");
|
||||
assert_eq!(err.get("code").unwrap().as_str().unwrap(), "PROXY_TYPE_RESOLUTION_FAILED");
|
||||
assert!(err.get("message").unwrap().as_str().unwrap().contains("non_existent_type"));
|
||||
}
|
||||
|
||||
pub fn run_all() {
|
||||
setup_simple_db();
|
||||
test_inline_schema_happy_path();
|
||||
test_inline_schema_syntax_errors();
|
||||
test_inline_schema_ref_compilation_errors();
|
||||
let _ = jspg_teardown();
|
||||
}
|
||||
@ -2,12 +2,28 @@ use crate::*;
|
||||
pub mod formatter;
|
||||
pub mod runner;
|
||||
pub mod types;
|
||||
pub mod inline_validator;
|
||||
pub mod swap_concurrency;
|
||||
pub mod inheritance_matching;
|
||||
use serde_json::json;
|
||||
|
||||
lazy_static::lazy_static! {
|
||||
pub static ref TEST_MUTEX: std::sync::Mutex<()> = std::sync::Mutex::new(());
|
||||
}
|
||||
|
||||
// Database module tests moved to src/database/executors/mock.rs
|
||||
|
||||
#[test]
|
||||
fn test_jspg_custom_audit_suite() {
|
||||
let _guard = TEST_MUTEX.lock().unwrap();
|
||||
inline_validator::run_all();
|
||||
inheritance_matching::run_all();
|
||||
swap_concurrency::run_all();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_library_api() {
|
||||
let _guard = TEST_MUTEX.lock().unwrap();
|
||||
// 1. Initially, schemas are not cached.
|
||||
|
||||
// Expected uninitialized drop format: errors + null response
|
||||
@ -44,7 +60,7 @@ fn test_library_api() {
|
||||
{
|
||||
"name": "source_schema",
|
||||
"variations": ["source_schema"],
|
||||
"hierarchy": ["entity", "source_schema"],
|
||||
"hierarchy": ["source_schema", "entity"],
|
||||
"schemas": {
|
||||
"source_schema": {
|
||||
"type": "object",
|
||||
@ -60,7 +76,7 @@ fn test_library_api() {
|
||||
{
|
||||
"name": "target_schema",
|
||||
"variations": ["target_schema"],
|
||||
"hierarchy": ["entity", "target_schema"],
|
||||
"hierarchy": ["target_schema", "entity"],
|
||||
"schemas": {
|
||||
"target_schema": {
|
||||
"type": "object",
|
||||
@ -109,7 +125,7 @@ fn test_library_api() {
|
||||
"field_types": null,
|
||||
"fields": [],
|
||||
"grouped_fields": null,
|
||||
"hierarchy": ["entity", "source_schema"],
|
||||
"hierarchy": ["source_schema", "entity"],
|
||||
"historical": false,
|
||||
"id": "",
|
||||
"longevity": null,
|
||||
@ -174,7 +190,7 @@ fn test_library_api() {
|
||||
"field_types": null,
|
||||
"fields": [],
|
||||
"grouped_fields": null,
|
||||
"hierarchy": ["entity", "target_schema"],
|
||||
"hierarchy": ["target_schema", "entity"],
|
||||
"historical": false,
|
||||
"id": "",
|
||||
"longevity": null,
|
||||
@ -251,18 +267,12 @@ fn test_library_api() {
|
||||
{
|
||||
"code": "REQUIRED_FIELD_MISSING",
|
||||
"message": "Missing name",
|
||||
"details": {
|
||||
"path": "name",
|
||||
"schema": "source_schema"
|
||||
}
|
||||
"details": { "path": "name" }
|
||||
},
|
||||
{
|
||||
"code": "STRICT_PROPERTY_VIOLATION",
|
||||
"message": "Unexpected property 'wrong'",
|
||||
"details": {
|
||||
"path": "wrong",
|
||||
"schema": "source_schema"
|
||||
}
|
||||
"details": { "path": "wrong" }
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
91
src/tests/swap_concurrency.rs
Normal file
91
src/tests/swap_concurrency.rs
Normal file
@ -0,0 +1,91 @@
|
||||
use crate::*;
|
||||
use serde_json::json;
|
||||
use std::thread;
|
||||
use std::sync::Arc;
|
||||
|
||||
fn get_concurrency_db() -> serde_json::Value {
|
||||
json!({
|
||||
"puncs": [],
|
||||
"enums": [],
|
||||
"relations": [],
|
||||
"types": [
|
||||
{
|
||||
"name": "person",
|
||||
"variations": ["person"],
|
||||
"hierarchy": ["person", "entity"],
|
||||
"schemas": {
|
||||
"person": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": { "type": "string" },
|
||||
"name": { "type": "string" }
|
||||
},
|
||||
"required": ["name"]
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
|
||||
fn test_concurrent_atomic_swap_isolation() {
|
||||
// 1. Initialize first
|
||||
let db_json = get_concurrency_db();
|
||||
let setup_res = jspg_setup(Json(db_json.clone()));
|
||||
assert_eq!(
|
||||
setup_res.0,
|
||||
json!({
|
||||
"type": "drop",
|
||||
"response": "success"
|
||||
})
|
||||
);
|
||||
|
||||
// 2. Spawn 8 parallel reader threads validating schemas
|
||||
let num_readers = 8;
|
||||
let mut handles = Vec::new();
|
||||
|
||||
for i in 0..num_readers {
|
||||
handles.push(thread::spawn(move || {
|
||||
let payload = json!({"type": "person", "name": format!("Neo-{}", i)});
|
||||
for _ in 0..100 {
|
||||
let res = jspg_validate("person", JsonB(payload.clone()));
|
||||
// The validation either succeeds or returns ENGINE_NOT_INITIALIZED (if teardown just swapped it)
|
||||
// BUT it must NEVER panic, deadlock, or return corrupt memory!
|
||||
let val = res.0;
|
||||
let is_success = val.get("response").and_then(|r| r.as_str()) == Some("success");
|
||||
let is_uninit = val.get("errors")
|
||||
.and_then(|e| e.as_array())
|
||||
.and_then(|arr| arr.get(0))
|
||||
.and_then(|err| err.get("code"))
|
||||
.and_then(|c| c.as_str()) == Some("ENGINE_NOT_INITIALIZED");
|
||||
|
||||
assert!(is_success || is_uninit, "Unexpected validation response: {:?}", val);
|
||||
thread::yield_now();
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
// 3. Spawn a concurrent writer thread constantly calling setup and teardown
|
||||
let db_json_shared = Arc::new(db_json);
|
||||
let writer_handle = thread::spawn(move || {
|
||||
for _ in 0..50 {
|
||||
let _ = jspg_teardown();
|
||||
thread::yield_now();
|
||||
let _ = jspg_setup(Json((*db_json_shared).clone()));
|
||||
thread::yield_now();
|
||||
}
|
||||
});
|
||||
|
||||
// 4. Join everyone and verify no thread panicked
|
||||
for handle in handles {
|
||||
handle.join().expect("Reader thread panicked or deadlocked!");
|
||||
}
|
||||
writer_handle.join().expect("Writer thread panicked or deadlocked!");
|
||||
|
||||
// Clean up
|
||||
let _ = jspg_teardown();
|
||||
}
|
||||
|
||||
pub fn run_all() {
|
||||
test_concurrent_atomic_swap_isolation();
|
||||
}
|
||||
@ -96,10 +96,8 @@ impl Case {
|
||||
let queries = db.executor.get_queries();
|
||||
if std::env::var("UPDATE_EXPECT").is_ok() {
|
||||
crate::tests::runner::update_sql_fixture(path, suite_idx, case_idx, &queries);
|
||||
Ok(())
|
||||
} else {
|
||||
expect.assert_sql(&queries)
|
||||
}
|
||||
expect.assert_sql(&queries)
|
||||
} else {
|
||||
Ok(())
|
||||
}
|
||||
@ -130,10 +128,8 @@ impl Case {
|
||||
let queries = db.executor.get_queries();
|
||||
if std::env::var("UPDATE_EXPECT").is_ok() {
|
||||
crate::tests::runner::update_sql_fixture(path, suite_idx, case_idx, &queries);
|
||||
Ok(())
|
||||
} else {
|
||||
expect.assert_sql(&queries)
|
||||
}
|
||||
expect.assert_sql(&queries)
|
||||
} else {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
pub mod pattern;
|
||||
pub mod sql;
|
||||
pub mod drop;
|
||||
pub mod schema;
|
||||
|
||||
132
src/tests/types/expect/pattern.rs
Normal file
132
src/tests/types/expect/pattern.rs
Normal file
@ -0,0 +1,132 @@
|
||||
use super::Expect;
|
||||
use regex::Regex;
|
||||
use std::collections::HashMap;
|
||||
|
||||
impl Expect {
|
||||
/// Advanced SQL execution assertion algorithm ported from `assert.go`.
|
||||
/// This compares two arrays of strings, one containing {{uuid:name}} or {{timestamp}} placeholders,
|
||||
/// and the other containing actual executed database queries. It ensures that placeholder UUIDs
|
||||
/// are consistently mapped to the same actual UUIDs across all lines, and strictly validates line-by-line sequences.
|
||||
pub fn assert_pattern(&self, actual: &[String]) -> Result<(), String> {
|
||||
let patterns = match &self.sql {
|
||||
Some(s) => s,
|
||||
None => return Ok(()),
|
||||
};
|
||||
|
||||
if patterns.len() != actual.len() {
|
||||
return Err(format!(
|
||||
"Length mismatch: expected {} SQL executions, got {}.\nActual Execution Log:\n{}",
|
||||
patterns.len(),
|
||||
actual.len(),
|
||||
actual.join("\n")
|
||||
));
|
||||
}
|
||||
|
||||
let ws_re = Regex::new(r"\s+").unwrap();
|
||||
|
||||
let types = HashMap::from([
|
||||
(
|
||||
"uuid",
|
||||
r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
|
||||
),
|
||||
(
|
||||
"timestamp",
|
||||
r"\d{4}-\d{2}-\d{2}(?:[ T])\d{2}:\d{2}:\d{2}(?:\.\d{1,6})?(?:Z|\+\d{2}(?::\d{2})?)?",
|
||||
),
|
||||
("integer", r"-?\d+"),
|
||||
("float", r"-?\d+\.\d+"),
|
||||
("text", r"(?:''|[^'])*"),
|
||||
("json", r"(?:''|[^'])*"),
|
||||
]);
|
||||
|
||||
let mut seen: HashMap<String, String> = HashMap::new();
|
||||
let system_uuid = "00000000-0000-0000-0000-000000000000";
|
||||
|
||||
// Placeholder regex: {{type:name}} or {{type}}
|
||||
let ph_rx = Regex::new(r"\{\{([a-z]+)(?:[:]([^}]+))?\}\}").unwrap();
|
||||
|
||||
let clean_str = |s: &str| -> String {
|
||||
let mut s = ws_re.replace_all(s, " ").into_owned();
|
||||
for token in ["(", ")", ",", "{", "}", "\"", "=", "'"] {
|
||||
s = s.replace(&format!(" {}", token), token);
|
||||
s = s.replace(&format!("{} ", token), token);
|
||||
}
|
||||
s.trim().to_string()
|
||||
};
|
||||
|
||||
for (i, pattern_expect) in patterns.iter().enumerate() {
|
||||
let aline_raw = &actual[i];
|
||||
let aline = clean_str(aline_raw);
|
||||
|
||||
let pattern_str_raw = match pattern_expect {
|
||||
super::SqlExpectation::Single(s) => s.clone(),
|
||||
super::SqlExpectation::Multi(m) => m.join(" "),
|
||||
};
|
||||
|
||||
let pattern_str = clean_str(&pattern_str_raw);
|
||||
|
||||
let mut pp = regex::escape(&pattern_str);
|
||||
pp = pp.replace(r"\{\{", "{{").replace(r"\}\}", "}}");
|
||||
|
||||
let mut cap_names = HashMap::new(); // cg_X -> var_name
|
||||
let mut group_idx = 0;
|
||||
|
||||
let mut final_rx_str = String::new();
|
||||
let mut last_match = 0;
|
||||
|
||||
let pp_clone = pp.clone();
|
||||
for caps in ph_rx.captures_iter(&pp_clone) {
|
||||
let full_match = caps.get(0).unwrap();
|
||||
final_rx_str.push_str(&pp[last_match..full_match.start()]);
|
||||
|
||||
let type_name = caps.get(1).unwrap().as_str();
|
||||
let var_name = caps.get(2).map(|m| m.as_str());
|
||||
|
||||
if let Some(name) = var_name {
|
||||
if let Some(val) = seen.get(name) {
|
||||
final_rx_str.push_str(®ex::escape(val));
|
||||
} else {
|
||||
let type_pattern = types.get(type_name).unwrap_or(&".*?");
|
||||
let cg_name = format!("cg_{}", group_idx);
|
||||
final_rx_str.push_str(&format!("(?P<{}>{})", cg_name, type_pattern));
|
||||
cap_names.insert(cg_name, name.to_string());
|
||||
group_idx += 1;
|
||||
}
|
||||
} else {
|
||||
let type_pattern = types.get(type_name).unwrap_or(&".*?");
|
||||
final_rx_str.push_str(&format!("(?:{})", type_pattern));
|
||||
}
|
||||
|
||||
last_match = full_match.end();
|
||||
}
|
||||
final_rx_str.push_str(&pp[last_match..]);
|
||||
|
||||
let final_rx = match Regex::new(&format!("^{}$", final_rx_str)) {
|
||||
Ok(r) => r,
|
||||
Err(e) => return Err(format!("Bad constructed regex: {} -> {}", final_rx_str, e)),
|
||||
};
|
||||
|
||||
if let Some(captures) = final_rx.captures(&aline) {
|
||||
for (cg_name, var_name) in cap_names {
|
||||
if let Some(m) = captures.name(&cg_name) {
|
||||
let matched_str = m.as_str();
|
||||
if matched_str != system_uuid {
|
||||
seen.insert(var_name, matched_str.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return Err(format!(
|
||||
"Line mismatched at execution sequence {}.\nExpected Pattern: {}\nActual SQL: {}\nRegex used: {}\nVariables Mapped: {:?}",
|
||||
i + 1,
|
||||
pattern_str,
|
||||
aline,
|
||||
final_rx_str,
|
||||
seen
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,8 @@
|
||||
use super::Expect;
|
||||
use regex::Regex;
|
||||
use sqlparser::ast::{Expr, Query, SelectItem, Statement, TableFactor};
|
||||
use sqlparser::dialect::PostgreSqlDialect;
|
||||
use sqlparser::parser::Parser;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::collections::HashSet;
|
||||
|
||||
impl Expect {
|
||||
pub fn assert_sql(&self, actual: &[String]) -> Result<(), String> {
|
||||
@ -12,7 +11,6 @@ impl Expect {
|
||||
return Err(e);
|
||||
}
|
||||
}
|
||||
self.assert_pattern(actual)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -205,132 +203,4 @@ impl Expect {
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Advanced SQL execution assertion algorithm ported from `assert.go`.
|
||||
/// This compares two arrays of strings, one containing {{uuid:name}} or {{timestamp}} placeholders,
|
||||
/// and the other containing actual executed database queries. It ensures that placeholder UUIDs
|
||||
/// are consistently mapped to the same actual UUIDs across all lines, and strictly validates line-by-line sequences.
|
||||
pub fn assert_pattern(&self, actual: &[String]) -> Result<(), String> {
|
||||
let patterns = match &self.sql {
|
||||
Some(s) => s,
|
||||
None => return Ok(()),
|
||||
};
|
||||
|
||||
if patterns.len() != actual.len() {
|
||||
return Err(format!(
|
||||
"Length mismatch: expected {} SQL executions, got {}.\nActual Execution Log:\n{}",
|
||||
patterns.len(),
|
||||
actual.len(),
|
||||
actual.join("\n")
|
||||
));
|
||||
}
|
||||
|
||||
let ws_re = Regex::new(r"\s+").unwrap();
|
||||
|
||||
let types = HashMap::from([
|
||||
(
|
||||
"uuid",
|
||||
r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
|
||||
),
|
||||
(
|
||||
"timestamp",
|
||||
r"\d{4}-\d{2}-\d{2}(?:[ T])\d{2}:\d{2}:\d{2}(?:\.\d{1,6})?(?:Z|\+\d{2}(?::\d{2})?)?",
|
||||
),
|
||||
("integer", r"-?\d+"),
|
||||
("float", r"-?\d+\.\d+"),
|
||||
("text", r"(?:''|[^'])*"),
|
||||
("json", r"(?:''|[^'])*"),
|
||||
]);
|
||||
|
||||
let mut seen: HashMap<String, String> = HashMap::new();
|
||||
let system_uuid = "00000000-0000-0000-0000-000000000000";
|
||||
|
||||
// Placeholder regex: {{type:name}} or {{type}}
|
||||
let ph_rx = Regex::new(r"\{\{([a-z]+)(?:[:]([^}]+))?\}\}").unwrap();
|
||||
|
||||
let clean_str = |s: &str| -> String {
|
||||
let mut s = ws_re.replace_all(s, " ").into_owned();
|
||||
for token in ["(", ")", ",", "{", "}", "\"", "=", "'"] {
|
||||
s = s.replace(&format!(" {}", token), token);
|
||||
s = s.replace(&format!("{} ", token), token);
|
||||
}
|
||||
s.trim().to_string()
|
||||
};
|
||||
|
||||
for (i, pattern_expect) in patterns.iter().enumerate() {
|
||||
let aline_raw = &actual[i];
|
||||
let formatted_actual = crate::tests::formatter::SqlFormatter::format(aline_raw).join(" ");
|
||||
let aline = clean_str(&formatted_actual);
|
||||
|
||||
let pattern_str_raw = match pattern_expect {
|
||||
super::SqlExpectation::Single(s) => s.clone(),
|
||||
super::SqlExpectation::Multi(m) => m.join(" "),
|
||||
};
|
||||
|
||||
let pattern_str = clean_str(&pattern_str_raw);
|
||||
|
||||
let mut pp = regex::escape(&pattern_str);
|
||||
pp = pp.replace(r"\{\{", "{{").replace(r"\}\}", "}}");
|
||||
|
||||
let mut cap_names = HashMap::new(); // cg_X -> var_name
|
||||
let mut group_idx = 0;
|
||||
|
||||
let mut final_rx_str = String::new();
|
||||
let mut last_match = 0;
|
||||
|
||||
let pp_clone = pp.clone();
|
||||
for caps in ph_rx.captures_iter(&pp_clone) {
|
||||
let full_match = caps.get(0).unwrap();
|
||||
final_rx_str.push_str(&pp[last_match..full_match.start()]);
|
||||
|
||||
let type_name = caps.get(1).unwrap().as_str();
|
||||
let var_name = caps.get(2).map(|m| m.as_str());
|
||||
|
||||
if let Some(name) = var_name {
|
||||
if let Some(val) = seen.get(name) {
|
||||
final_rx_str.push_str(®ex::escape(val));
|
||||
} else {
|
||||
let type_pattern = types.get(type_name).unwrap_or(&".*?");
|
||||
let cg_name = format!("cg_{}", group_idx);
|
||||
final_rx_str.push_str(&format!("(?P<{}>{})", cg_name, type_pattern));
|
||||
cap_names.insert(cg_name, name.to_string());
|
||||
group_idx += 1;
|
||||
}
|
||||
} else {
|
||||
let type_pattern = types.get(type_name).unwrap_or(&".*?");
|
||||
final_rx_str.push_str(&format!("(?:{})", type_pattern));
|
||||
}
|
||||
|
||||
last_match = full_match.end();
|
||||
}
|
||||
final_rx_str.push_str(&pp[last_match..]);
|
||||
|
||||
let final_rx = match Regex::new(&format!("^{}$", final_rx_str)) {
|
||||
Ok(r) => r,
|
||||
Err(e) => return Err(format!("Bad constructed regex: {} -> {}", final_rx_str, e)),
|
||||
};
|
||||
|
||||
if let Some(captures) = final_rx.captures(&aline) {
|
||||
for (cg_name, var_name) in cap_names {
|
||||
if let Some(m) = captures.name(&cg_name) {
|
||||
let matched_str = m.as_str();
|
||||
if matched_str != system_uuid {
|
||||
seen.insert(var_name, matched_str.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return Err(format!(
|
||||
"Line mismatched at execution sequence {}.\nExpected Pattern: {}\nActual SQL: {}\nRegex used: {}\nVariables Mapped: {:?}",
|
||||
i + 1,
|
||||
pattern_str,
|
||||
aline,
|
||||
final_rx_str,
|
||||
seen
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ pub struct ValidationContext<'a> {
|
||||
pub extensible: bool,
|
||||
pub reporter: bool,
|
||||
pub overrides: HashSet<String>,
|
||||
pub parents: Vec<&'a serde_json::Value>,
|
||||
pub parent: Option<&'a serde_json::Value>,
|
||||
}
|
||||
|
||||
impl<'a> ValidationContext<'a> {
|
||||
@ -39,7 +39,7 @@ impl<'a> ValidationContext<'a> {
|
||||
extensible: effective_extensible,
|
||||
reporter,
|
||||
overrides,
|
||||
parents: Vec::new(),
|
||||
parent: None,
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,11 +63,6 @@ impl<'a> ValidationContext<'a> {
|
||||
) -> Self {
|
||||
let effective_extensible = schema.extensible.unwrap_or(extensible);
|
||||
|
||||
let mut parents = self.parents.clone();
|
||||
if let Some(p) = parent_instance {
|
||||
parents.push(p);
|
||||
}
|
||||
|
||||
Self {
|
||||
db: self.db,
|
||||
root: self.root,
|
||||
@ -78,7 +73,7 @@ impl<'a> ValidationContext<'a> {
|
||||
extensible: effective_extensible,
|
||||
reporter,
|
||||
overrides,
|
||||
parents,
|
||||
parent: parent_instance,
|
||||
}
|
||||
}
|
||||
|
||||
@ -90,7 +85,7 @@ impl<'a> ValidationContext<'a> {
|
||||
HashSet::new(),
|
||||
self.extensible,
|
||||
reporter,
|
||||
None,
|
||||
self.parent,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@ -42,62 +42,83 @@ impl Validator {
|
||||
}
|
||||
|
||||
pub fn validate(&self, schema_id: &str, instance: &Value) -> crate::drop::Drop {
|
||||
let schema_opt = self.db.schemas.get(schema_id);
|
||||
|
||||
if let Some(schema) = schema_opt {
|
||||
let ctx = ValidationContext::new(
|
||||
&self.db,
|
||||
&schema,
|
||||
&schema,
|
||||
instance,
|
||||
HashSet::new(),
|
||||
false,
|
||||
false,
|
||||
);
|
||||
match ctx.validate_scoped() {
|
||||
Ok(result) => {
|
||||
if result.is_valid() {
|
||||
crate::drop::Drop::success()
|
||||
} else {
|
||||
let errors: Vec<crate::drop::Error> = result
|
||||
.errors
|
||||
.into_iter()
|
||||
.map(|e| crate::drop::Error {
|
||||
code: e.code,
|
||||
message: e.message,
|
||||
details: crate::drop::ErrorDetails {
|
||||
path: Some(e.path),
|
||||
cause: None,
|
||||
context: None,
|
||||
schema: Some(schema_id.to_string()),
|
||||
},
|
||||
})
|
||||
.collect();
|
||||
crate::drop::Drop::with_errors(errors)
|
||||
let schema_arc = if schema_id.trim().starts_with('{') {
|
||||
match serde_json::from_str::<crate::database::schema::Schema>(schema_id) {
|
||||
Ok(schema) => {
|
||||
let mut errors = Vec::new();
|
||||
schema.compile(&self.db, "inline", "inline".to_string(), &mut errors);
|
||||
if !errors.is_empty() {
|
||||
return crate::drop::Drop::with_errors(errors);
|
||||
}
|
||||
Arc::new(schema)
|
||||
}
|
||||
Err(e) => {
|
||||
return crate::drop::Drop::with_errors(vec![crate::drop::Error {
|
||||
code: "SCHEMA_PARSE_FAILED".to_string(),
|
||||
message: format!("Failed to parse inline schema: {}", e),
|
||||
details: crate::drop::ErrorDetails::default(),
|
||||
}]);
|
||||
}
|
||||
Err(e) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
|
||||
code: e.code,
|
||||
message: e.message,
|
||||
details: crate::drop::ErrorDetails {
|
||||
path: Some(e.path),
|
||||
cause: None,
|
||||
context: None,
|
||||
schema: Some(schema_id.to_string()),
|
||||
},
|
||||
}]),
|
||||
}
|
||||
} else {
|
||||
crate::drop::Drop::with_errors(vec![crate::drop::Error {
|
||||
code: "SCHEMA_NOT_FOUND".to_string(),
|
||||
message: format!("Schema {} not found", schema_id),
|
||||
match self.db.schemas.get(schema_id) {
|
||||
Some(schema) => Arc::clone(schema),
|
||||
None => {
|
||||
return crate::drop::Drop::with_errors(vec![crate::drop::Error {
|
||||
code: "SCHEMA_NOT_FOUND".to_string(),
|
||||
message: format!("Schema {} not found", schema_id),
|
||||
details: crate::drop::ErrorDetails {
|
||||
path: Some("/".to_string()),
|
||||
cause: None,
|
||||
context: None,
|
||||
schema: None,
|
||||
},
|
||||
}]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let ctx = ValidationContext::new(
|
||||
&self.db,
|
||||
&schema_arc,
|
||||
&schema_arc,
|
||||
instance,
|
||||
HashSet::new(),
|
||||
false,
|
||||
false,
|
||||
);
|
||||
match ctx.validate_scoped() {
|
||||
Ok(result) => {
|
||||
if result.is_valid() {
|
||||
crate::drop::Drop::success()
|
||||
} else {
|
||||
let errors: Vec<crate::drop::Error> = result
|
||||
.errors
|
||||
.into_iter()
|
||||
.map(|e| crate::drop::Error {
|
||||
code: e.code,
|
||||
message: e.message,
|
||||
details: crate::drop::ErrorDetails {
|
||||
path: Some(e.path),
|
||||
cause: None,
|
||||
context: None,
|
||||
schema: None,
|
||||
},
|
||||
})
|
||||
.collect();
|
||||
crate::drop::Drop::with_errors(errors)
|
||||
}
|
||||
}
|
||||
Err(e) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
|
||||
code: e.code,
|
||||
message: e.message,
|
||||
details: crate::drop::ErrorDetails {
|
||||
path: Some("/".to_string()),
|
||||
path: Some(e.path),
|
||||
cause: None,
|
||||
context: None,
|
||||
schema: Some(schema_id.to_string()),
|
||||
schema: None,
|
||||
},
|
||||
}])
|
||||
}]),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -59,13 +59,12 @@ impl<'a> ValidationContext<'a> {
|
||||
};
|
||||
|
||||
let mut resolved = false;
|
||||
for parent in self.parents.iter().rev() {
|
||||
if let Some(parent) = self.parent {
|
||||
if let Some(obj) = parent.as_object() {
|
||||
if let Some(val) = obj.get(var_name) {
|
||||
if let Some(str_val) = val.as_str() {
|
||||
target_id = format!("{}{}", str_val, suffix);
|
||||
resolved = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -98,7 +97,7 @@ impl<'a> ValidationContext<'a> {
|
||||
new_overrides,
|
||||
self.extensible,
|
||||
true, // Reporter mode
|
||||
None,
|
||||
self.parent,
|
||||
);
|
||||
shadow.root = &global_schema;
|
||||
result.merge(shadow.validate()?);
|
||||
|
||||
Reference in New Issue
Block a user