Merge for 2.28.5 release (#349)

## Usage and product changes

Merge for 2.28.5 release

Author: typedb-bot

.factory/automation.yml

@@ -12,7 +12,7 @@ config:
 build:
   quality:
     filter:
-      owner: vaticle
+      owner: typedb
       branch: [master, development]
     dependency-analysis:
       image: vaticle-ubuntu-22.04
@@ -50,7 +50,7 @@ build:
         bazel test //rust/tests/behaviour:test_behaviour --test_output=errors
     deploy-crate-snapshot:
       filter:
-        owner: vaticle
+        owner: typedb
         branch: [master, development]
       image: vaticle-ubuntu-22.04
       dependencies: [build, build-dependency, test-rust]
@@ -60,7 +60,7 @@ build:
         bazel run --define version=$(git rev-parse HEAD) //rust:deploy_crate -- snapshot
     deploy-maven-snapshot:
       filter:
-        owner: vaticle
+        owner: typedb
         branch: [master, development]
       image: vaticle-ubuntu-22.04
       dependencies: [build, build-dependency, test-java]
@@ -78,7 +78,7 @@ build:
         bazel run --define version=$(git rev-parse HEAD) //common/java:deploy-maven -- snapshot
     deploy-pip-snapshot:
       filter:
-        owner: vaticle
+        owner: typedb
         branch: [master, development]
       image: vaticle-ubuntu-20.04
       dependencies: [ build, build-dependency ]
@@ -88,7 +88,7 @@ build:
         bazel run --define version=$(git rev-parse HEAD) //grammar/python:deploy-pip -- snapshot
     test-deployment-maven:
       filter:
-        owner: vaticle
+        owner: typedb
         branch: [master, development]
       image: vaticle-ubuntu-22.04
       dependencies: [deploy-maven-snapshot]
@@ -98,7 +98,7 @@ build:
     sync-dependencies:
       image: vaticle-ubuntu-22.04
       filter:
-        owner: vaticle
+        owner: typedb
         branch: [master, development]
       dependencies:
         - build
@@ -115,7 +115,7 @@ build:
 
 release:
   filter:
-    owner: vaticle
+    owner: type
     branch: master
   validation:
     validate-release-notes:
@@ -167,7 +167,7 @@ release:
     sync-dependencies-release:
       image: vaticle-ubuntu-22.04
       filter:
-        owner: vaticle
+        owner: typedb
         branch: [master, development]
       dependencies:
         - deploy-github

README.md

@@ -10,14 +10,14 @@
 
 # Introducing TypeQL
 
-TypeQL is the query language of **[TypeDB](https://github.com/vaticle/typedb)**.
+TypeQL is the query language of **[TypeDB](https://github.com/vaticle/typedb)**. It is based on a novel, elegant, and declarative querying paradigm described in [recent research](https://typedb.com/papers/typeql-theory). TypeQL is designed to be intuitive and mirror natural language, making it straightforward to compose complex queries using high-level abstractions.
 
-- **Conceptual and intuitive**. TypeQL is based directly on the [conceptual data model](https://development.typedb.com/philosophy) of TypeDB. Its queries comprise sequences of statements that assemble into [patterns](https://development.typedb.com/features#modern-language). This mirrors natural language and makes it easy and intuitive to express even highly complex queries.
-- **Fully declarative and composable** TypeQL is fully declarative, allowing us to define query patterns without considering execution strategy. The user only composes sets of requirements, and TypeDB finds all matching data to process. 
-- **A fully variablizable language**. Any concept in TypeQL has a type, and so any concept in TypeQL can be variablized in a query – even types! This enables TypeQL to express powerful [parametric](https://typedb.com/features#polymorphic-queries) database operations.
-- **Built for consistency**. TypeQL patterns are underpinned by a powerful type system that ensure safety and consistency of database applications.
+- Get started by [installing TypeDB](https://typedb.com/docs/home/install/overview).
+- Explore the basics of TypeDB in our easy [Crash Course](https://typedb.com/docs/home/crash-course).
+- Discover more of TypeDB’s unique [features](https://typedb.com/features).
+- Master TypeDB with our end-to-end [Learning Course](https://typedb.com/docs/learn/overview).
+- Learn more at TypeDB's [Learning Center](https://typedb.com/learn).
 
-For a quick overview of the range of statements that are available in TypeQL check out our [TypeQL in 20 queries guide](https://typedb.com/docs/).
 
 > **IMPORTANT NOTE:** > > TypeDB & TypeQL are in the process of being rewritten in [Rust](https://www.rust-lang.org). There will be significant refinement to the language, and minor breaks in backwards compatibility. Learn about the changes on our [roadmap issue on GitHub](https://github.com/vaticle/typedb/issues/6764). The biggest change to TypeDB 3.0 will be our storage data structure and architecture that significantly boosts performance. We’re aiming to release 3.0 in the summer this year, along with preliminary benchmarks of TypeDB.
 

RELEASE_NOTES_LATEST.md

@@ -3,7 +3,7 @@
 
 Available through https://crates.io/crates/typeql.
 ```
-cargo add typeql@2.28.1
+cargo add typeql@2.28.5
 ```
 
 ## TypeQL Grammar and Language Library distributions for Java
@@ -20,12 +20,12 @@ cargo add typeql@2.28.1
     <dependency>
         <groupId>com.vaticle.typeql</groupId>
         <artifactId>typeql-grammar</artifactId>
-        <version>2.28.1</version>
+        <version>2.28.5</version>
     </dependency>
     <dependency>
         <groupId>com.vaticle.typeql</groupId>
         <artifactId>typeql-lang</artifactId>
-        <version>2.28.1</version>
+        <version>2.28.5</version>
     </dependency>
 </dependencies>
 ```
@@ -35,9 +35,35 @@ cargo add typeql@2.28.1
 Available through https://pypi.org
 
 ```
-pip install typeql-grammar==2.28.1
+pip install typeql-grammar==2.28.5
 ```
 
+
+## New Features
+
+
+## Bugs Fixed
+
+
+## Code Refactors
+
+
 ## Other Improvements
-- **Bump snake-yaml maven dependency to 2.2**
-  Bump snake-yaml maven dependency to 2.2
+- **Make the author of the Python grammar and TypeQL Rust "TypeDB Community"**
+  
+  The `author` field of our Python grammar and Rust library is now **TypeDB Community** with the email being **community@typedb.com**.
+  
+  
+- **Update error messages to match Rust and Java implementations**
+  We fixed various logical and grammatical issues in the Java and Rust error messages, aiming to have similar errors from both implementations.
+  
+  
+- **Java and Rust error messages: grammatical fixes**
+  
+  We fixed various grammatical issues in the Java and Rust error messages.
+  
+  
+- **Update readme**
+  
+    
+

VERSION

@@ -1 +1 @@
-2.28.1
+2.28.5

WORKSPACE

@@ -53,7 +53,7 @@ rust_analyzer_dependencies()
 load("@rules_rust//rust:defs.bzl", "rust_common")
 rust_register_toolchains(
     edition = "2021",
-    versions = ["1.70.0"],
+    versions = ["1.80.0"],
 )
 
 rust_analyzer_toolchain_tools_repository(

dependencies/maven/artifacts.snapshot

@@ -9,7 +9,7 @@
 @maven//:com_google_guava_failureaccess_1_0_1
 @maven//:com_google_guava_guava_30_1_jre
 @maven//:com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava
-@maven//:com_google_http_client_google_http_client_1_34_2
+@maven//:com_google_http_client_google_http_client_1_41_4
 @maven//:com_google_j2objc_j2objc_annotations_1_3
 @maven//:com_vdurmont_semver4j_3_1_0
 @maven//:commons_codec_commons_codec_1_13
@@ -26,15 +26,15 @@
 @maven//:io_cucumber_datatable_3_2_1
 @maven//:io_cucumber_docstring_5_1_3
 @maven//:io_cucumber_tag_expressions_2_0_4
-@maven//:io_grpc_grpc_context_1_22_1
-@maven//:io_opencensus_opencensus_api_0_24_0
-@maven//:io_opencensus_opencensus_contrib_http_util_0_24_0
+@maven//:io_grpc_grpc_context_1_27_2
+@maven//:io_opencensus_opencensus_api_0_31_0
+@maven//:io_opencensus_opencensus_contrib_http_util_0_31_0
 @maven//:junit_junit_4_12
 @maven//:org_antlr_antlr4_runtime_4_8
 @maven//:org_apache_commons_commons_compress_1_21
 @maven//:org_apache_commons_commons_lang3_3_9
-@maven//:org_apache_httpcomponents_httpclient_4_5_11
-@maven//:org_apache_httpcomponents_httpcore_4_4_13
+@maven//:org_apache_httpcomponents_httpclient_4_5_13
+@maven//:org_apache_httpcomponents_httpcore_4_4_15
 @maven//:org_apiguardian_apiguardian_api_1_1_0
 @maven//:org_checkerframework_checker_qual_3_5_0
 @maven//:org_hamcrest_hamcrest_core_1_3

dependencies/vaticle/repositories.bzl

@@ -7,13 +7,13 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 def vaticle_dependencies():
     git_repository(
         name = "vaticle_dependencies",
-        remote = "https://github.com/vaticle/dependencies",
-        commit = "729d960a92e145e03794395bbe59e02f122f1aee", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
+        remote = "https://github.com/typedb/dependencies",
+        commit = "5387f4df1c571e5c3e6dd1139a3e3b321f3538cd", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
     )
 
 def vaticle_typedb_behaviour():
     git_repository(
         name = "vaticle_typedb_behaviour",
-        remote = "https://github.com/vaticle/typedb-behaviour",
-        commit = "d7066eef79bd9ae2d4ac5b16c1867d72ed73a8b8", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
+        remote = "https://github.com/typedb/typedb-behaviour",
+        commit = "8098e03c3c7be016e709b51744ebfd5c2c06cda1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
     )

grammar/python/BUILD

@@ -62,8 +62,8 @@ assemble_pip(
         "Topic :: Database :: Front-Ends"
     ],
     url = "https://github.com/vaticle/typeql",
-    author = "Vaticle",
-    author_email = "community@vaticle.com",
+    author = "TypeDB Community",
+    author_email = "community@typedb.com",
     license = "AGPLv3",
     requirements_file = "//:requirements.txt",
     keywords = ["typeql", "typedb", "database", "strongly-typed"],

java/common/exception/ErrorMessage.java

@@ -19,7 +19,7 @@ public class ErrorMessage extends com.vaticle.typedb.common.exception.ErrorMessa
     public static final ErrorMessage MISSING_PATTERNS =
             new ErrorMessage(5, "The query has not been provided with any patterns.");
     public static final ErrorMessage VARIABLE_NAME_CONFLICT =
-            new ErrorMessage(6, "The variable(s) named '%s' cannot be used for both concept variables and a value variables.");
+            new ErrorMessage(6, "The variable(s) named '%s' cannot be used for both a concept variable and a value variable.");
     public static final ErrorMessage MISSING_DEFINABLES =
             new ErrorMessage(7, "The query has not been provided with any definables.");
     public static final ErrorMessage MATCH_HAS_NO_BOUNDING_NAMED_VARIABLE =
@@ -29,7 +29,7 @@ public class ErrorMessage extends com.vaticle.typedb.common.exception.ErrorMessa
     public static final ErrorMessage MATCH_PATTERN_STATEMENT_HAS_NO_NAMED_VARIABLE =
             new ErrorMessage(10, "The pattern '%s' has no named variable.");
     public static final ErrorMessage MATCH_HAS_UNBOUNDED_NESTED_PATTERN =
-            new ErrorMessage(11, "The match query contains a nested pattern is not bounded: '%s'.");
+            new ErrorMessage(11, "The match query contains an unbounded nested pattern: '%s'.");
     public static final ErrorMessage MISSING_GET_FILTER =
             new ErrorMessage(12, "The get query cannot be constructed with NULL filter variable collection.");
     public static final ErrorMessage INVALID_IID_STRING =
@@ -59,7 +59,7 @@ public class ErrorMessage extends com.vaticle.typedb.common.exception.ErrorMessa
     public static final ErrorMessage INVALID_CONSTRAINT_DATETIME_PRECISION =
             new ErrorMessage(26, "Attempted to assign DateTime value of '%s' which is more precise than 1 millisecond.");
     public static final ErrorMessage INVALID_DEFINE_QUERY_VARIABLE =
-            new ErrorMessage(27, "Invalid define/undefine query. User defined variables are not accepted in define/undefine query.");
+            new ErrorMessage(27, "Invalid define/undefine query. User-defined variables are not accepted in a define/undefine query.");
     public static final ErrorMessage INVALID_UNDEFINE_QUERY_RULE =
             new ErrorMessage(28, "Invalid undefine query: the rule body of '%s' ('when' or 'then') cannot be undefined. The rule must be undefined entirely by referring to its label.");
     public static final ErrorMessage INVALID_RULE_WHEN_MISSING_PATTERNS =
@@ -89,7 +89,7 @@ public class ErrorMessage extends com.vaticle.typedb.common.exception.ErrorMessa
     public static final ErrorMessage ILLEGAL_GRAMMAR =
             new ErrorMessage(41, "Illegal grammar: '%s'");
     public static final ErrorMessage INVALID_TYPE_LABEL =
-            new ErrorMessage(42, "The type label '%s' is invalid. Type labels must be valid unicode identifiers.");
+            new ErrorMessage(42, "The type label '%s' is invalid. Type labels must be valid Unicode identifiers with restrictions on the leading character.");
     public static final ErrorMessage INVALID_ANNOTATION =
             new ErrorMessage(43, "Invalid annotation '%s' on '%s' constraint");
 

rust/BUILD

@@ -49,7 +49,7 @@ assemble_crate(
     homepage = "https://github.com/vaticle/typeql",
     repository = "https://github.com/vaticle/typeql",
     keywords = ["typeql", "typedb", "database", "strongly-typed"],
-    authors = ["Vaticle <community@vaticle.com>"]
+    authors = ["TypeDB Community <community@typedb.com>"]
 )
 
 deploy_crate(

rust/common/error/mod.rs

@@ -93,11 +93,11 @@ error_messages! { TypeQLError
     MatchHasNoBoundingNamedVariable =
         7: "The match query does not have named variables to bound the nested disjunction/negation pattern(s).",
     VariableNameConflict { names: String } =
-        8: "The variable names {names} cannot be used for both concept variables and value variables.",
+        8: "The variable(s) named {names} cannot be used for both a concept variable and a value variable.",
     MatchStatementHasNoNamedVariable { pattern: Pattern } =
         9: "The statement '{pattern}' has no named variable.",
     MatchHasUnboundedNestedPattern { pattern: Pattern } =
-        10: "The match query contains a nested pattern is not bounded: '{pattern}'.",
+        10: "The match query contains an unbounded nested pattern: '{pattern}'.",
     InvalidIIDString { iid: String } =
         11: "Invalid IID: '{iid}'. IIDs must follow the regular expression: '0x[0-9a-f]+'.",
     InvalidAttributeTypeRegex { regex: String } =
@@ -129,7 +129,7 @@ error_messages! { TypeQLError
     InvalidConstraintDatetimePrecision { date_time: NaiveDateTime } =
         25: "Attempted to assign DateTime value of '{date_time}' which is more precise than 1 millisecond.",
     InvalidDefineQueryVariable =
-        26: "Invalid define/undefine query. User defined variables are not accepted in define/undefine query.",
+        26: "Invalid define/undefine query. User-defined variables are not accepted in a define/undefine query.",
     InvalidUndefineQueryRule { rule_label: Label } =
         27: "Invalid undefine query: the rule body of '{rule_label}' ('when' or 'then') cannot be undefined. The rule must be undefined entirely by referring to its label.",
     InvalidRuleWhenMissingPatterns { rule_label: Label } =
@@ -153,5 +153,5 @@ error_messages! { TypeQLError
     IllegalGrammar { input: String } =
         37: "Illegal grammar: '{input}'",
     InvalidTypeLabel { label: String } =
-        38: "The type label '{label}' is invalid. Type labels must be valid utf-8 identifiers without a leading underscore.",
+        38: "The type label '{label}' is invalid. Type labels must be valid Unicode identifiers with restrictions on the leading character.",
 }

rust/pattern/statement/mod.rs

@@ -16,7 +16,6 @@ pub use thing::ThingStatement;
 pub use type_::TypeStatement;
 pub use value::ValueStatement;
 
-pub use crate::variable::{variable::Variable, variable_concept::ConceptVariable, variable_value::ValueVariable};
 use crate::{
     common::{error::TypeQLError, validatable::Validatable, Result},
     enum_wrapper,