cellular/jspg
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added limit 1 to arrays treated as a single value in schemas

Browse Source
This commit is contained in:
Alex Groleau
2026-07-16 13:43:08 -04:00
parent 1fedf5253c
commit c4bf6bde58
47 changed files with 616 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fixtures/contains.json
View File

@ -227,8 +227,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "1",
"count": "0"
"count": "0",
"limit": "1"
},
"details": {
"path": "",
@ -268,8 +268,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "1",
"count": "0"
"count": "0",
"limit": "1"
},
"details": {
"path": "",
@ -347,8 +347,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "1",
"count": "0"
"count": "0",
"limit": "1"
},
"details": {
"path": "",
@ -373,8 +373,8 @@
{
"code": "MULTIPLE_OF_VIOLATED",
"values": {
"multiple_of": "2",
"value": "3"
"value": "3",
"multiple_of": "2"
},
"details": {
"path": "0",
@ -384,8 +384,8 @@
{
"code": "MULTIPLE_OF_VIOLATED",
"values": {
"multiple_of": "2",
"value": "9"
"value": "9",
"multiple_of": "2"
},
"details": {
"path": "2",
@ -432,8 +432,8 @@
{
"code": "MULTIPLE_OF_VIOLATED",
"values": {
"multiple_of": "2",
"value": "1"
"value": "1",
"multiple_of": "2"
},
"details": {
"path": "0",

10
fixtures/database.json
View File

@ -62,8 +62,8 @@
"code": "EDGE_MISSING",
"values": {
"parent_type": "org",
"property_name": "missing_users",
"child_type": "user"
"child_type": "user",
"property_name": "missing_users"
},
"details": {
"path": "full.org/missing_users",
@ -151,8 +151,8 @@
{
"code": "EDGE_MISSING",
"values": {
"child_type": "child",
"parent_type": "parent",
"child_type": "child",
"property_name": "children"
},
"details": {
@ -470,8 +470,8 @@
{
"code": "DATABASE_TYPE_PARSE_FAILED",
"values": {
"reason": "invalid type: sequence, expected a string",
"type": "failure"
"type": "failure",
"reason": "invalid type: sequence, expected a string"
},
"details": {
"context": "failure"

12
fixtures/dependencies.json
View File

@ -227,8 +227,8 @@
{
"code": "DEPENDENCY_MISSING",
"values": {
"required_property": "bar",
"property_name": "quux"
"property_name": "quux",
"required_property": "bar"
},
"details": {
"path": "",
@ -386,8 +386,8 @@
{
"code": "DEPENDENCY_MISSING",
"values": {
"required_property": "foo'bar",
"property_name": "foo\"bar"
"property_name": "foo\"bar",
"required_property": "foo'bar"
},
"details": {
"path": "",
@ -829,8 +829,8 @@
{
"code": "MIN_PROPERTIES_VIOLATED",
"values": {
"limit": "4",
"count": "2"
"count": "2",
"limit": "4"
},
"details": {
"path": "",

4
fixtures/exclusiveMaximum.json
View File

@ -34,8 +34,8 @@
{
"code": "EXCLUSIVE_MAXIMUM_VIOLATED",
"values": {
"limit": "3",
"value": "3"
"value": "3",
"limit": "3"
},
"details": {
"path": "",

4
fixtures/exclusiveMinimum.json
View File

@ -34,8 +34,8 @@
{
"code": "EXCLUSIVE_MINIMUM_VIOLATED",
"values": {
"limit": "1.1",
"value": "1.1"
"value": "1.1",
"limit": "1.1"
},
"details": {
"path": "",

326
fixtures/filter.json
View File

@ -211,13 +211,6 @@
"gender": {},
"gender.condition": {
"type": "condition",
"compiledPropertyNames": [
"kind",
"$eq",
"$ne",
"$of",
"$nof"
],
"properties": {
"$eq": {
"type": [
@ -231,15 +224,6 @@
"null"
]
},
"$nof": {
"type": [
"array",
"null"
],
"items": {
"type": "gender"
}
},
"$of": {
"type": [
"array",
@ -248,80 +232,32 @@
"items": {
"type": "gender"
}
},
"$nof": {
"type": [
"array",
"null"
],
"items": {
"type": "gender"
}
}
}
},
"compiledPropertyNames": [
"kind",
"$eq",
"$ne",
"$of",
"$nof"
]
},
"person": {},
"person.filter": {
"compiledPropertyNames": [
"first_name",
"age",
"billing_address",
"gender",
"birth_date",
"uuid_field",
"tags",
"ad_hoc",
"$and",
"$or"
],
"type": "filter",
"properties": {
"$and": {
"items": {
"compiledPropertyNames": [
"first_name",
"age",
"billing_address",
"gender",
"birth_date",
"uuid_field",
"tags",
"ad_hoc",
"$and",
"$or"
],
"type": "person.filter"
},
"first_name": {
"type": [
"array",
"null"
]
},
"$or": {
"items": {
"compiledPropertyNames": [
"first_name",
"age",
"billing_address",
"gender",
"birth_date",
"uuid_field",
"tags",
"ad_hoc",
"$and",
"$or"
],
"type": "person.filter"
},
"type": [
"array",
"null"
]
},
"ad_hoc": {
"compiledPropertyNames": [
"foo"
],
"properties": {
"foo": {
"type": [
"string.condition",
"null"
]
}
},
"type": [
"filter",
"string.condition",
"null"
]
},
@ -337,6 +273,12 @@
"null"
]
},
"gender": {
"type": [
"gender.condition",
"null"
]
},
"birth_date": {
"type": [
"date.condition",
@ -349,48 +291,48 @@
"null"
]
},
"first_name": {
"type": [
"string.condition",
"null"
]
},
"gender": {
"type": [
"gender.condition",
"null"
]
},
"tags": {
"type": [
"string.condition",
"null"
]
}
},
"type": "filter"
},
"address": {},
"address.filter": {
"type": "filter",
"compiledPropertyNames": [
"city",
"$and",
"$or"
],
"properties": {
},
"ad_hoc": {
"type": [
"filter",
"null"
],
"properties": {
"foo": {
"type": [
"string.condition",
"null"
]
}
},
"compiledPropertyNames": [
"foo"
]
},
"$and": {
"type": [
"array",
"null"
],
"items": {
"type": "person.filter",
"compiledPropertyNames": [
"city",
"first_name",
"age",
"billing_address",
"gender",
"birth_date",
"uuid_field",
"tags",
"ad_hoc",
"$and",
"$or"
],
"type": "address.filter"
]
}
},
"$or": {
@ -399,21 +341,79 @@
"null"
],
"items": {
"type": "person.filter",
"compiledPropertyNames": [
"city",
"first_name",
"age",
"billing_address",
"gender",
"birth_date",
"uuid_field",
"tags",
"ad_hoc",
"$and",
"$or"
],
"type": "address.filter"
]
}
},
}
},
"compiledPropertyNames": [
"first_name",
"age",
"billing_address",
"gender",
"birth_date",
"uuid_field",
"tags",
"ad_hoc",
"$and",
"$or"
]
},
"address": {},
"address.filter": {
"type": "filter",
"properties": {
"city": {
"type": [
"string.condition",
"null"
]
},
"$and": {
"type": [
"array",
"null"
],
"items": {
"type": "address.filter",
"compiledPropertyNames": [
"city",
"$and",
"$or"
]
}
},
"$or": {
"type": [
"array",
"null"
],
"items": {
"type": "address.filter",
"compiledPropertyNames": [
"city",
"$and",
"$or"
]
}
}
}
},
"compiledPropertyNames": [
"city",
"$and",
"$or"
]
},
"condition": {},
"filter": {},
@ -424,52 +424,7 @@
"search": {},
"search.filter": {
"type": "filter",
"compiledPropertyNames": [
"kind",
"name",
"filter",
"$and",
"$or"
],
"properties": {
"$and": {
"type": [
"array",
"null"
],
"items": {
"compiledPropertyNames": [
"kind",
"name",
"filter",
"$and",
"$or"
],
"type": "search.filter"
}
},
"$or": {
"type": [
"array",
"null"
],
"items": {
"compiledPropertyNames": [
"kind",
"name",
"filter",
"$and",
"$or"
],
"type": "search.filter"
}
},
"filter": {
"type": [
"$kind.filter",
"null"
]
},
"kind": {
"type": [
"string.condition",
@ -481,8 +436,53 @@
"string.condition",
"null"
]
},
"filter": {
"type": [
"$kind.filter",
"null"
]
},
"$and": {
"type": [
"array",
"null"
],
"items": {
"type": "search.filter",
"compiledPropertyNames": [
"kind",
"name",
"filter",
"$and",
"$or"
]
}
},
"$or": {
"type": [
"array",
"null"
],
"items": {
"type": "search.filter",
"compiledPropertyNames": [
"kind",
"name",
"filter",
"$and",
"$or"
]
}
}
}
},
"compiledPropertyNames": [
"kind",
"name",
"filter",
"$and",
"$or"
]
}
}
}

480
fixtures/format.json
View File

File diff suppressed because it is too large Load Diff

12
fixtures/maxContains.json
View File

@ -106,8 +106,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "1",
"count": "2"
"count": "2",
"limit": "1"
},
"details": {
"path": "",
@ -144,8 +144,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "1",
"count": "2"
"count": "2",
"limit": "1"
},
"details": {
"path": "",
@ -284,8 +284,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "3",
"count": "4"
"count": "4",
"limit": "3"
},
"details": {
"path": "",

4
fixtures/maxItems.json
View File

@ -52,8 +52,8 @@
{
"code": "MAX_ITEMS_VIOLATED",
"values": {
"limit": "2",
"count": "3"
"count": "3",
"limit": "2"
},
"details": {
"path": "",

8
fixtures/maxLength.json
View File

@ -43,8 +43,8 @@
{
"code": "MAX_LENGTH_VIOLATED",
"values": {
"limit": "2",
"count": "3"
"count": "3",
"limit": "2"
},
"details": {
"path": "",
@ -109,8 +109,8 @@
{
"code": "MAX_LENGTH_VIOLATED",
"values": {
"limit": "2",
"count": "3"
"count": "3",
"limit": "2"
},
"details": {
"path": "",

8
fixtures/maxProperties.json
View File

@ -139,8 +139,8 @@
{
"code": "MAX_PROPERTIES_VIOLATED",
"values": {
"limit": "2",
"count": "3"
"count": "3",
"limit": "2"
},
"details": {
"path": "",
@ -190,8 +190,8 @@
{
"code": "MAX_PROPERTIES_VIOLATED",
"values": {
"limit": "0",
"count": "1"
"count": "1",
"limit": "0"
},
"details": {
"path": "",

4
fixtures/maximum.json
View File

@ -118,8 +118,8 @@
{
"code": "MAXIMUM_VIOLATED",
"values": {
"limit": "300",
"value": "300.5"
"value": "300.5",
"limit": "300"
},
"details": {
"path": "",

4
fixtures/merge.json
View File

@ -239,8 +239,8 @@
{
"code": "DEPENDENCY_MISSING",
"values": {
"required_property": "base_dep",
"property_name": "trigger"
"property_name": "trigger",
"required_property": "base_dep"
},
"details": {
"path": "",

24
fixtures/minContains.json
View File

@ -169,8 +169,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "2",
"count": "0"
"count": "0",
"limit": "2"
},
"details": {
"path": "",
@ -357,8 +357,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "2",
"count": "0"
"count": "0",
"limit": "2"
},
"details": {
"path": "",
@ -463,8 +463,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "3",
"count": "0"
"count": "0",
"limit": "3"
},
"details": {
"path": "",
@ -487,8 +487,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "3",
"count": "1"
"count": "1",
"limit": "3"
},
"details": {
"path": "",
@ -513,8 +513,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "1",
"count": "3"
"count": "3",
"limit": "1"
},
"details": {
"path": "",
@ -657,8 +657,8 @@
{
"code": "CONTAINS_VIOLATED",
"values": {
"limit": "1",
"count": "2"
"count": "2",
"limit": "1"
},
"details": {
"path": "",

4
fixtures/minItems.json
View File

@ -108,8 +108,8 @@
{
"code": "MIN_ITEMS_VIOLATED",
"values": {
"limit": "1",
"count": "0"
"count": "0",
"limit": "1"
},
"details": {
"path": "",

4
fixtures/minLength.json
View File

@ -43,8 +43,8 @@
{
"code": "MIN_LENGTH_VIOLATED",
"values": {
"limit": "2",
"count": "1"
"count": "1",
"limit": "2"
},
"details": {
"path": "",

12
fixtures/minimum.json
View File

@ -43,8 +43,8 @@
{
"code": "MINIMUM_VIOLATED",
"values": {
"limit": "1.1",
"value": "0.6"
"value": "0.6",
"limit": "1.1"
},
"details": {
"path": "",
@ -127,8 +127,8 @@
{
"code": "MINIMUM_VIOLATED",
"values": {
"limit": "-2",
"value": "-2.0001"
"value": "-2.0001",
"limit": "-2"
},
"details": {
"path": "",
@ -149,8 +149,8 @@
{
"code": "MINIMUM_VIOLATED",
"values": {
"limit": "-2",
"value": "-3"
"value": "-3",
"limit": "-2"
},
"details": {
"path": "",

4
fixtures/multipleOf.json
View File

@ -148,8 +148,8 @@
{
"code": "MULTIPLE_OF_VIOLATED",
"values": {
"multiple_of": "0.0001",
"value": "0.00751"
"value": "0.00751",
"multiple_of": "0.0001"
},
"details": {
"path": "",

4
fixtures/objectTypes.json
View File

@ -156,8 +156,8 @@
{
"code": "MAXIMUM_VIOLATED",
"values": {
"limit": "50",
"value": "60"
"value": "60",
"limit": "50"
},
"details": {
"path": "max",

4
fixtures/paths.json
View File

@ -200,8 +200,8 @@
{
"code": "MINIMUM_VIOLATED",
"values": {
"limit": "10",
"value": "5"
"value": "5",
"limit": "10"
},
"details": {
"path": "entities/entity-beta/value",

4
fixtures/pattern.json
View File

@ -34,8 +34,8 @@
{
"code": "PATTERN_VIOLATED",
"values": {
"value": "abc",
"pattern": "^a*$"
"pattern": "^a*$",
"value": "abc"
},
"details": {
"path": "",

16
fixtures/polymorphism.json
View File

@ -148,8 +148,8 @@
{
"code": "NO_FAMILY_MATCH",
"values": {
"value": "alien",
"discriminator": "type"
"discriminator": "type",
"value": "alien"
},
"details": {
"path": "",
@ -284,8 +284,8 @@
{
"code": "NO_FAMILY_MATCH",
"values": {
"value": "bot",
"discriminator": "type"
"discriminator": "type",
"value": "bot"
},
"details": {
"path": "",
@ -591,8 +591,8 @@
{
"code": "NO_ONEOF_MATCH",
"values": {
"value": "alien",
"discriminator": "type"
"discriminator": "type",
"value": "alien"
},
"details": {
"path": "",
@ -931,8 +931,8 @@
{
"code": "NO_FAMILY_MATCH",
"values": {
"value": "unknown_panel",
"discriminator": "kind"
"discriminator": "kind",
"value": "unknown_panel"
},
"details": {
"path": "",

4
fixtures/propertyNames.json
View File

@ -431,8 +431,8 @@
{
"code": "MAX_LENGTH_VIOLATED",
"values": {
"limit": "3",
"count": "6"
"count": "6",
"limit": "3"
},
"details": {
"path": "",

3
fixtures/queryer.json
View File

@ -2670,7 +2670,8 @@
" WHERE",
" NOT entity_3.archived",
" AND attachment_4.kind = 'cover'",
" AND attachment_4.attachable_id = entity_1.id LIMIT 1",
" AND attachment_4.attachable_id = entity_1.id",
" LIMIT 1",
" ),",
" 'cover_attachments', (",
" SELECT COALESCE(jsonb_agg(jsonb_build_object(",

4
fixtures/traits.json
View File

@ -139,8 +139,8 @@
{
"code": "MAX_LENGTH_VIOLATED",
"values": {
"limit": "5",
"count": "26"
"count": "26",
"limit": "5"
},
"details": {
"path": "email",

4
src/database/compile/collection.rs
View File

@ -2,7 +2,7 @@ use crate::database::schema::Schema;
#[allow(unused_imports)]
use crate::drop::{Error, ErrorDetails};
#[allow(unused_imports)]
use std::collections::HashMap;
use indexmap::IndexMap;
use std::sync::Arc;
impl Schema {
@ -19,7 +19,7 @@ impl Schema {
if !c.is_ascii_lowercase() && !c.is_ascii_digit() && c != '_' && c != '.' && c != '$' {
errors.push(Error {
code: "INVALID_IDENTIFIER".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("character".to_string(), c.to_string()),
("field_name".to_string(), field_name.to_string()),
("identifier".to_string(), id.to_string()),

3
src/database/compile/mod.rs
View File

@ -7,7 +7,6 @@ pub mod polymorphism;
use crate::database::schema::Schema;
use crate::drop::{Error, ErrorDetails};
use indexmap::IndexMap;
use std::collections::HashMap;
impl Schema {
pub fn compile(
@ -64,7 +63,7 @@ impl Schema {
if custom_type_count > 1 {
errors.push(Error {
code: "MULTIPLE_INHERITANCE_PROHIBITED".to_string(),
values: Some(HashMap::from([("types".to_string(), types.join(", "))])),
values: Some(IndexMap::from([("types".to_string(), types.join(", "))])),
details: ErrorDetails {
path: Some(path.clone()),
schema: Some(root_id.to_string()),

4
src/database/compile/polymorphism.rs
View File

@ -1,6 +1,6 @@
use crate::drop::{Error, ErrorDetails};
use indexmap::IndexSet;
use std::collections::HashMap;
use indexmap::IndexMap;
use crate::database::schema::Schema;
impl Schema {
@ -144,7 +144,7 @@ impl Schema {
if options.contains_key(&val) {
errors.push(Error {
code: "POLYMORPHIC_COLLISION".to_string(),
values: Some(HashMap::from([("value".to_string(), val.to_string())])),
values: Some(IndexMap::from([("value".to_string(), val.to_string())])),
details: ErrorDetails {
path: Some(path.to_string()),
schema: Some(root_id.to_string()),

5
src/database/compose/mod.rs
View File

@ -1,6 +1,7 @@
use crate::drop::{Error, ErrorDetails};
use serde_json::Value;
use std::collections::{HashMap, HashSet};
use indexmap::IndexMap;
pub fn compose(val: &mut Value, errors: &mut Vec<Error>) {
let mut traits = HashMap::new();
@ -114,7 +115,7 @@ fn resolve_in_place(
if visited.contains(inc_name) {
errors.push(Error {
code: "CIRCULAR_INCLUDE_DETECTED".to_string(),
values: Some(HashMap::from([(
values: Some(IndexMap::from([(
"include".to_string(),
inc_name.to_string(),
)])),
@ -218,7 +219,7 @@ fn resolve_in_place(
} else {
errors.push(Error {
code: "TRAIT_NOT_FOUND".to_string(),
values: Some(HashMap::from([(
values: Some(IndexMap::from([(
"include".to_string(),
inc_name.to_string(),
)])),

14
src/database/mod.rs
View File

@ -28,7 +28,7 @@ use serde_json::Value;
use indexmap::IndexMap;
use std::sync::Arc;
use r#type::Type;
use std::collections::HashMap;
use crate::drop::{Drop, Error, ErrorDetails};
#[derive(serde::Serialize)]
@ -76,7 +76,7 @@ impl Database {
Err(e) => {
errors.push(Error {
code: "DATABASE_ENUM_PARSE_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("enum".to_string(), name.clone()),
("reason".to_string(), e.to_string()),
])),
@ -104,7 +104,7 @@ impl Database {
Err(e) => {
errors.push(Error {
code: "DATABASE_TYPE_PARSE_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("type".to_string(), name.clone()),
("reason".to_string(), e.to_string()),
])),
@ -136,7 +136,7 @@ impl Database {
Err(e) => {
errors.push(Error {
code: "DATABASE_RELATION_PARSE_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("relation".to_string(), constraint.clone()),
("reason".to_string(), e.to_string()),
])),
@ -164,7 +164,7 @@ impl Database {
Err(e) => {
errors.push(Error {
code: "DATABASE_PUNC_PARSE_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("punc".to_string(), name.clone()),
("reason".to_string(), e.to_string()),
])),
@ -461,7 +461,7 @@ impl Database {
errors.push(Error {
code: "EDGE_MISSING".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("parent_type".to_string(), parent_type.to_string()),
("child_type".to_string(), child_type.to_string()),
("property_name".to_string(), prop_name.to_string()),
@ -563,7 +563,7 @@ impl Database {
errors.push(Error {
code: "AMBIGUOUS_TYPE_RELATIONS".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("parent_type".to_string(), parent_type.to_string()),
("child_type".to_string(), child_type.to_string()),
("property_name".to_string(), prop_name.to_string()),

4
src/drop.rs
View File

@ -57,13 +57,13 @@ impl Drop {
}
}
use std::collections::HashMap;
use indexmap::IndexMap;
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct Error {
pub code: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub values: Option<HashMap<String, String>>,
pub values: Option<IndexMap<String, String>>,
pub details: ErrorDetails,
}

8
src/merger/mod.rs
View File

@ -7,7 +7,7 @@ use crate::database::Database;
use crate::database::r#type::Type;
use crate::drop::{Drop, Error, ErrorDetails};
use serde_json::Value;
use std::collections::HashMap;
use indexmap::IndexMap;
use std::sync::Arc;
pub struct Merger {
@ -31,7 +31,7 @@ impl Merger {
None => {
return Drop::with_errors(vec![Error {
code: "SCHEMA_NOT_FOUND".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("schema".to_string(), schema_id.to_string()),
])),
details: ErrorDetails {
@ -78,7 +78,7 @@ impl Merger {
return Drop::with_errors(vec![Error {
code: final_code,
values: Some(HashMap::from([
values: Some(IndexMap::from([
("error".to_string(), final_message),
])),
details: ErrorDetails {
@ -96,7 +96,7 @@ impl Merger {
if let Err(e) = self.db.execute(&notify_sql, None) {
return Drop::with_errors(vec![Error {
code: "MERGE_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("error".to_string(), e.to_string()),
])),
details: ErrorDetails {

33
src/queryer/compiler.rs
View File

@ -240,7 +240,7 @@ impl<'a> Compiler<'a> {
};
// 3. Build WHERE clauses
let where_clauses = self.compile_where_clause(r#type, &table_aliases, node)?;
let where_clauses = self.compile_where_clause(r#type, &table_aliases, node.clone())?;
let selection = if is_array {
format!("COALESCE(jsonb_agg({}), '[]'::jsonb)", jsonb_obj_sql)
@ -248,11 +248,38 @@ impl<'a> Compiler<'a> {
jsonb_obj_sql
};
let mut limit_clause = "";
if !is_array {
let is_reverse = if let Some(prop_ref) = &node.property_name {
let prop = prop_ref.as_str();
if let Some(parent_schema) = &node.parent_schema {
if let Some(compiled_edges) = parent_schema.obj.compiled_edges.get() {
if let Some(edge) = compiled_edges.get(prop) {
!edge.forward
} else {
false
}
} else {
false
}
} else {
false
}
} else {
false
};
if is_reverse {
limit_clause = " LIMIT 1";
}
}
let full_sql = format!(
"(SELECT {} FROM {} WHERE {})",
"(SELECT {} FROM {} WHERE {}{})",
selection,
from_clauses.join(" "),
where_clauses.join(" AND ")
where_clauses.join(" AND "),
limit_clause
);
Ok((

10
src/queryer/mod.rs
View File

@ -1,6 +1,6 @@
use crate::database::Database;
use crate::drop::{Drop, Error, ErrorDetails};
use std::collections::HashMap;
use indexmap::IndexMap;
use std::sync::Arc;
pub mod compiler;
@ -33,7 +33,7 @@ impl Queryer {
Err(msg) => {
return Drop::with_errors(vec![Error {
code: "FILTER_PARSE_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("error".to_string(), msg.clone()),
])),
details: ErrorDetails {
@ -140,7 +140,7 @@ impl Queryer {
}
Err(e) => Err(Drop::with_errors(vec![Error {
code: "QUERY_COMPILATION_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("error".to_string(), e.clone()),
])),
details: ErrorDetails {
@ -169,7 +169,7 @@ impl Queryer {
}
Ok(other) => Drop::with_errors(vec![Error {
code: "QUERY_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("error".to_string(), format!("Expected array from generic query, got: {:?}", other)),
])),
details: ErrorDetails {
@ -181,7 +181,7 @@ impl Queryer {
}]),
Err(e) => Drop::with_errors(vec![Error {
code: "QUERY_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("error".to_string(), e.to_string()),
])),
details: ErrorDetails {

3
src/tests/formatter.rs
View File

@ -180,6 +180,9 @@ impl SqlFormatter {
fn format_query(&mut self, query: &Query) {
self.format_set_expr(&query.body);
if let Some(limit_clause) = &query.limit_clause {
self.push_line(&format!("{}", limit_clause.to_string().trim()));
}
}
fn format_set_expr(&mut self, set_expr: &SetExpr) {

4
src/validator/error.rs
View File

@ -1,9 +1,9 @@
use std::collections::HashMap;
use indexmap::IndexMap;
#[derive(Debug, Clone, serde::Serialize)]
pub struct ValidationError {
pub code: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub values: Option<HashMap<String, String>>,
pub values: Option<IndexMap<String, String>>,
pub path: String,
}

5
src/validator/mod.rs
View File

@ -1,4 +1,5 @@
use std::collections::{HashMap, HashSet};
use std::collections::HashSet;
use indexmap::IndexMap;
pub mod context;
pub mod error;
@ -92,7 +93,7 @@ impl Validator {
} else {
Drop::with_errors(vec![Error {
code: "SCHEMA_NOT_FOUND".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("schema".to_string(), schema_id.to_string()),
])),
details: ErrorDetails {

11
src/validator/rules/array.rs
View File

@ -1,4 +1,5 @@
use std::collections::{HashMap, HashSet};
use std::collections::HashSet;
use indexmap::IndexMap;
use serde_json::Value;
@ -18,7 +19,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "MIN_ITEMS_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("count".to_string(), arr.len().to_string()),
("limit".to_string(), min.to_string()),
])),
@ -30,7 +31,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "MAX_ITEMS_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("count".to_string(), arr.len().to_string()),
("limit".to_string(), max.to_string()),
])),
@ -77,7 +78,7 @@ impl<'a> ValidationContext<'a> {
if _match_count < min {
result.errors.push(ValidationError {
code: "CONTAINS_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("count".to_string(), _match_count.to_string()),
("limit".to_string(), min.to_string()),
])),
@ -89,7 +90,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "CONTAINS_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("count".to_string(), _match_count.to_string()),
("limit".to_string(), max.to_string()),
])),

10
src/validator/rules/core.rs
View File

@ -1,4 +1,4 @@
use std::collections::HashMap;
use indexmap::IndexMap;
use crate::validator::Validator;
use crate::validator::context::ValidationContext;
@ -19,7 +19,7 @@ impl<'a> ValidationContext<'a> {
if !Validator::check_type(t, current) {
result.errors.push(ValidationError {
code: "INVALID_TYPE".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("expected".to_string(), t.to_string()),
])),
path: self.path.to_string(),
@ -37,7 +37,7 @@ impl<'a> ValidationContext<'a> {
if !valid {
result.errors.push(ValidationError {
code: "INVALID_TYPE".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("expected".to_string(), format!("{:?}", types)),
])),
path: self.path.to_string(),
@ -51,7 +51,7 @@ impl<'a> ValidationContext<'a> {
if !equals(current, const_val) {
result.errors.push(ValidationError {
code: "CONST_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("expected".to_string(), format!("{:?}", const_val)),
])),
path: self.path.to_string(),
@ -74,7 +74,7 @@ impl<'a> ValidationContext<'a> {
if !found {
result.errors.push(ValidationError {
code: "ENUM_MISMATCH".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("expected".to_string(), format!("{:?}", enum_vals)),
])),
path: self.path.to_string(),

4
src/validator/rules/extensible.rs
View File

@ -1,4 +1,4 @@
use std::collections::HashMap;
use indexmap::IndexMap;
use crate::database::object::{is_primitive_type, SchemaTypeOrArray};
use crate::database::schema::Schema;
@ -75,7 +75,7 @@ impl<'a> ValidationContext<'a> {
if !result.evaluated_keys.contains(key) && !self.overrides.contains(key) {
result.errors.push(ValidationError {
code: "STRICT_PROPERTY_VIOLATION".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("property_name".to_string(), key.to_string()),
])),
path: self.join_path(key),

6
src/validator/rules/format.rs
View File

@ -1,4 +1,4 @@
use std::collections::HashMap;
use indexmap::IndexMap;
use crate::validator::context::ValidationContext;
use crate::validator::error::ValidationError;
@ -21,7 +21,7 @@ impl<'a> ValidationContext<'a> {
if should && let Err(e) = f(current) {
result.errors.push(ValidationError {
code: "FORMAT_MISMATCH".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("format".to_string(), self.schema.format.clone().unwrap_or_default()),
("error".to_string(), e.to_string()),
])),
@ -35,7 +35,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "FORMAT_MISMATCH".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("format".to_string(), self.schema.format.clone().unwrap_or_default()),
])),
path: self.path.to_string(),

4
src/validator/rules/mod.rs
View File

@ -1,7 +1,7 @@
use crate::validator::context::ValidationContext;
use crate::validator::error::ValidationError;
use crate::validator::result::ValidationResult;
use std::collections::HashMap;
use indexmap::IndexMap;
pub mod array;
pub mod cases;
@ -64,7 +64,7 @@ impl<'a> ValidationContext<'a> {
if self.depth > 100 {
Err(ValidationError {
code: "RECURSION_LIMIT_EXCEEDED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("limit".to_string(), 100.to_string()),
])),
path: self.path.to_string(),

12
src/validator/rules/numeric.rs
View File

@ -1,4 +1,4 @@
use std::collections::HashMap;
use indexmap::IndexMap;
use crate::validator::context::ValidationContext;
use crate::validator::error::ValidationError;
@ -16,7 +16,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "MINIMUM_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("value".to_string(), num.to_string()),
("limit".to_string(), min.to_string()),
])),
@ -28,7 +28,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "MAXIMUM_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("value".to_string(), num.to_string()),
("limit".to_string(), max.to_string()),
])),
@ -40,7 +40,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "EXCLUSIVE_MINIMUM_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("value".to_string(), num.to_string()),
("limit".to_string(), ex_min.to_string()),
])),
@ -52,7 +52,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "EXCLUSIVE_MAXIMUM_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("value".to_string(), num.to_string()),
("limit".to_string(), ex_max.to_string()),
])),
@ -64,7 +64,7 @@ impl<'a> ValidationContext<'a> {
if (val - val.round()).abs() > f64::EPSILON {
result.errors.push(ValidationError {
code: "MULTIPLE_OF_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("value".to_string(), num.to_string()),
("multiple_of".to_string(), multiple_of.to_string()),
])),

17
src/validator/rules/object.rs
View File

@ -1,4 +1,5 @@
use std::collections::{HashMap, HashSet};
use std::collections::HashSet;
use indexmap::IndexMap;
use serde_json::Value;
@ -38,7 +39,7 @@ impl<'a> ValidationContext<'a> {
} else {
result.errors.push(ValidationError {
code: "CONST_VIOLATED".to_string(), // Aligning with original const override errors natively
values: Some(HashMap::from([
values: Some(IndexMap::from([
("value".to_string(), type_str.to_string()),
])),
path: self.join_path("type"),
@ -49,7 +50,7 @@ impl<'a> ValidationContext<'a> {
// Because it's a global entity target, the payload must structurally provide a discriminator natively
result.errors.push(ValidationError {
code: "MISSING_TYPE".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("expected".to_string(), expected_type.to_string()),
])),
path: self.path.clone(), // Empty boundary
@ -104,7 +105,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "MIN_PROPERTIES_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("count".to_string(), obj.len().to_string()),
("limit".to_string(), min.to_string()),
])),
@ -117,7 +118,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "MAX_PROPERTIES_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("count".to_string(), obj.len().to_string()),
("limit".to_string(), max.to_string()),
])),
@ -131,7 +132,7 @@ impl<'a> ValidationContext<'a> {
if field == "type" {
result.errors.push(ValidationError {
code: "MISSING_TYPE".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("field_name".to_string(), "type".to_string()),
])),
path: self.join_path(field),
@ -139,7 +140,7 @@ impl<'a> ValidationContext<'a> {
} else {
result.errors.push(ValidationError {
code: "REQUIRED_FIELD_MISSING".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("field_name".to_string(), field.to_string()),
])),
path: self.join_path(field),
@ -158,7 +159,7 @@ impl<'a> ValidationContext<'a> {
if !obj.contains_key(req_prop) {
result.errors.push(ValidationError {
code: "DEPENDENCY_MISSING".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("property_name".to_string(), prop.to_string()),
("required_property".to_string(), req_prop.to_string()),
])),

34
src/validator/rules/polymorphism.rs
View File

@ -1,5 +1,3 @@
use std::collections::HashMap;
use crate::validator::context::ValidationContext;
use crate::validator::error::ValidationError;
use crate::validator::result::ValidationResult;
@ -55,10 +53,10 @@ impl<'a> ValidationContext<'a> {
return self.execute_polymorph(options, result);
} else {
result.errors.push(ValidationError {
code: "UNCOMPILED_ONEOF".to_string(),
values: None,
path: self.path.to_string(),
});
code: "UNCOMPILED_ONEOF".to_string(),
values: None,
path: self.path.to_string(),
});
return Ok(false);
}
}
@ -110,9 +108,10 @@ impl<'a> ValidationContext<'a> {
} else {
result.errors.push(ValidationError {
code: "MISSING_COMPILED_SCHEMA".to_string(),
values: Some(HashMap::from([
("target_id".to_string(), target_id.to_string()),
])),
values: Some(IndexMap::from([(
"target_id".to_string(),
target_id.to_string(),
)])),
path: self.path.to_string(),
});
return Ok(false);
@ -132,9 +131,7 @@ impl<'a> ValidationContext<'a> {
} else {
result.errors.push(ValidationError {
code: "MISSING_COMPILED_SCHEMA".to_string(),
values: Some(HashMap::from([
("index".to_string(), idx.to_string()),
])),
values: Some(IndexMap::from([("index".to_string(), idx.to_string())])),
path: self.path.to_string(),
});
return Ok(false);
@ -144,14 +141,12 @@ impl<'a> ValidationContext<'a> {
}
} else {
let values = if let Some(d) = self.schema.compiled_discriminator.get() {
Some(HashMap::from([
Some(IndexMap::from([
("discriminator".to_string(), d.to_string()),
("value".to_string(), val.to_string()),
]))
} else {
Some(HashMap::from([
("primitive".to_string(), val.to_string()),
]))
Some(IndexMap::from([("primitive".to_string(), val.to_string())]))
};
result.errors.push(ValidationError {
code: if self.schema.family.is_some() {
@ -168,9 +163,10 @@ impl<'a> ValidationContext<'a> {
if let Some(d) = self.schema.compiled_discriminator.get() {
result.errors.push(ValidationError {
code: "MISSING_TYPE".to_string(),
values: Some(HashMap::from([
("discriminator".to_string(), d.to_string()),
])),
values: Some(IndexMap::from([(
"discriminator".to_string(),
d.to_string(),
)])),
path: self.path.to_string(),
});
}

10
src/validator/rules/string.rs
View File

@ -1,4 +1,4 @@
use std::collections::HashMap;
use indexmap::IndexMap;
use crate::validator::context::ValidationContext;
use crate::validator::error::ValidationError;
@ -17,7 +17,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "MIN_LENGTH_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("count".to_string(), s.chars().count().to_string()),
("limit".to_string(), min.to_string()),
])),
@ -29,7 +29,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "MAX_LENGTH_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("count".to_string(), s.chars().count().to_string()),
("limit".to_string(), max.to_string()),
])),
@ -40,7 +40,7 @@ impl<'a> ValidationContext<'a> {
if !compiled_re.0.is_match(s) {
result.errors.push(ValidationError {
code: "PATTERN_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("pattern".to_string(), self.schema.pattern.clone().unwrap_or_default()),
("value".to_string(), s.to_string()),
])),
@ -53,7 +53,7 @@ impl<'a> ValidationContext<'a> {
{
result.errors.push(ValidationError {
code: "PATTERN_VIOLATED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("pattern".to_string(), pattern.to_string()),
("value".to_string(), s.to_string()),
])),

10
src/validator/rules/type.rs
View File

@ -2,7 +2,7 @@ use crate::database::object::{is_primitive_type, SchemaTypeOrArray};
use crate::validator::context::ValidationContext;
use crate::validator::error::ValidationError;
use crate::validator::result::ValidationResult;
use std::collections::HashMap;
use indexmap::IndexMap;
impl<'a> ValidationContext<'a> {
pub(crate) fn validate_type(
@ -76,7 +76,7 @@ impl<'a> ValidationContext<'a> {
if !resolved {
result.errors.push(ValidationError {
code: "DYNAMIC_TYPE_RESOLUTION_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("pointer".to_string(), t.clone()),
("discriminator".to_string(), var_name.to_string()),
])),
@ -109,7 +109,7 @@ impl<'a> ValidationContext<'a> {
if t.starts_with('$') {
result.errors.push(ValidationError {
code: "DYNAMIC_TYPE_RESOLUTION_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("pointer".to_string(), target_id.to_string()),
])),
path: self.path.to_string(),
@ -117,7 +117,7 @@ impl<'a> ValidationContext<'a> {
} else if self.schema.is_proxy() {
result.errors.push(ValidationError {
code: "PROXY_TYPE_RESOLUTION_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("pointer".to_string(), target_id.to_string()),
])),
path: self.path.to_string(),
@ -125,7 +125,7 @@ impl<'a> ValidationContext<'a> {
} else {
result.errors.push(ValidationError {
code: "INHERITANCE_RESOLUTION_FAILED".to_string(),
values: Some(HashMap::from([
values: Some(IndexMap::from([
("pointer".to_string(), target_id.to_string()),
])),
path: self.path.to_string(),