Merge branch 'master' into master

Author: olirice

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pg_graphql"
-version = "1.5.3"
+version = "1.5.4"
 edition = "2021"
 
 [lib]

Cargo.toml

@@ -78,4 +78,7 @@
 ## 1.5.3
 - bugfix: computed field returning a composite type was always null
 
+## 1.5.4
+- bugfix: once a query panics, all subsequent queries return a lock poisoned error.
+
 ## master

docs/changelog.md

@@ -179,7 +179,7 @@ type Account {
 
 #### Relationship's Field
 
-Use the `"local_name"` and `"foreign_name"` JSON keys to override a a relationships inbound and outbound field names.
+Use the `"local_name"` and `"foreign_name"` JSON keys to override a relationship's inbound and outbound field names.
 
 ```sql
 create table "Account"(

docs/configuration.md

@@ -544,8 +544,7 @@ pub enum __Type {
 #[cached(
     type = "SizedCache<u64, HashMap<String, __Field>>",
     create = "{ SizedCache::with_size(1000) }",
-    convert = r#"{ calculate_hash(type_) }"#,
-    sync_writes = true
+    convert = r#"{ calculate_hash(type_) }"#
 )]
 pub fn field_map(type_: &__Type) -> HashMap<String, __Field> {
     let mut hmap = HashMap::new();
@@ -570,8 +569,7 @@ pub fn field_map(type_: &__Type) -> HashMap<String, __Field> {
 #[cached(
     type = "SizedCache<u64, HashMap<String, __InputValue>>",
     create = "{ SizedCache::with_size(1000) }",
-    convert = r#"{ calculate_hash(type_) }"#,
-    sync_writes = true
+    convert = r#"{ calculate_hash(type_) }"#
 )]
 pub fn input_field_map(type_: &__Type) -> HashMap<String, __InputValue> {
     let mut hmap = HashMap::new();
@@ -3875,8 +3873,7 @@ pub struct __Schema {
 #[cached(
     type = "SizedCache<String, HashMap<String, __Type>>",
     create = "{ SizedCache::with_size(200) }",
-    convert = r#"{ serde_json::ser::to_string(&schema.context.config).expect("schema config should be a string") }"#,
-    sync_writes = true
+    convert = r#"{ serde_json::ser::to_string(&schema.context.config).expect("schema config should be a string") }"#
 )]
 pub fn type_map(schema: &__Schema) -> HashMap<String, __Type> {
     let tmap: HashMap<String, __Type> = schema

src/graphql.rs

@@ -791,8 +791,7 @@ pub fn calculate_hash<T: Hash>(t: &T) -> u64 {
 #[cached(
     type = "SizedCache<u64, Result<Arc<Context>, String>>",
     create = "{ SizedCache::with_size(250) }",
-    convert = r#"{ calculate_hash(_config) }"#,
-    sync_writes = true
+    convert = r#"{ calculate_hash(_config) }"#
 )]
 pub fn load_sql_context(_config: &Config) -> Result<Arc<Context>, String> {
     // cache value for next query