Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b6647f2d6 | |||
| d301d5fab9 | |||
| 61511b595d |
13
flow
13
flow
@ -97,11 +97,16 @@ install() {
|
||||
fi
|
||||
}
|
||||
|
||||
test() {
|
||||
test-jspg() {
|
||||
info "Running jspg tests..."
|
||||
cargo pgrx test "pg${POSTGRES_VERSION}" "$@" || return $?
|
||||
}
|
||||
|
||||
test-validator() {
|
||||
info "Running validator tests..."
|
||||
cargo test -p boon --features "pgrx/pg${POSTGRES_VERSION}" "$@" || return $?
|
||||
}
|
||||
|
||||
clean() {
|
||||
info "Cleaning build artifacts..."
|
||||
cargo clean || return $?
|
||||
@ -111,7 +116,8 @@ jspg-usage() {
|
||||
printf "prepare\tCheck OS, Cargo, and PGRX dependencies.\n"
|
||||
printf "install\tBuild and install the extension locally (after prepare).\n"
|
||||
printf "reinstall\tClean, build, and install the extension locally (after prepare).\n"
|
||||
printf "test\t\tRun pgrx integration tests.\n"
|
||||
printf "test-jspg\t\tRun pgrx integration tests.\n"
|
||||
printf "test-validator\t\tRun validator integration tests.\n"
|
||||
printf "clean\t\tRemove pgrx build artifacts.\n"
|
||||
}
|
||||
|
||||
@ -121,7 +127,8 @@ jspg-flow() {
|
||||
build) build; return $?;;
|
||||
install) install; return $?;;
|
||||
reinstall) clean && install; return $?;;
|
||||
test) test "${@:2}"; return $?;;
|
||||
test-jspg) test-jspg "${@:2}"; return $?;;
|
||||
test-validator) test-validator "${@:2}"; return $?;;
|
||||
clean) clean; return $?;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
|
||||
@ -304,7 +304,7 @@ fn validate_json_schema(schema_id: &str, instance: JsonB) -> JsonB {
|
||||
Some(schema) => {
|
||||
let instance_value: Value = instance.0;
|
||||
let options = match schema.t {
|
||||
SchemaType::Type | SchemaType::PublicPunc => Some(ValidationOptions { be_strict: true }),
|
||||
SchemaType::PublicPunc => Some(ValidationOptions { be_strict: true }),
|
||||
_ => None,
|
||||
};
|
||||
|
||||
@ -394,7 +394,7 @@ fn collect_errors(error: &ValidationError, errors_list: &mut Vec<Error>) {
|
||||
ErrorKind::AnyOf => handle_any_of_error(&base_path),
|
||||
ErrorKind::OneOf(matched) => handle_one_of_error(&base_path, matched),
|
||||
};
|
||||
|
||||
|
||||
errors_list.extend(errors_to_add);
|
||||
}
|
||||
|
||||
|
||||
@ -849,7 +849,6 @@ impl<'v, 's> Validator<'v, 's, '_, '_> {
|
||||
) -> Result<(), ValidationError<'s, 'v>> {
|
||||
let scope = self.scope.child(sch, ref_kw, self.scope.vid);
|
||||
let schema = &self.schemas.get(sch);
|
||||
let be_strict = self.options.map_or(false, |o| o.be_strict);
|
||||
let (result, reply) = Validator {
|
||||
v: self.v,
|
||||
vloc: self.vloc,
|
||||
|
||||
Reference in New Issue
Block a user