Merge remote-tracking branch 'upstream/6.x' into add-breaking-changes-on-migration-guide

Author: MacondoExpress

modules/ROOT/content-nav.adoc

@@ -61,14 +61,6 @@
 
 * xref:introspector.adoc[Introspector]
 
-* xref:ogm/index.adoc[]
-** xref:ogm/installation.adoc[]
-** xref:ogm/directives.adoc[]
-** xref:ogm/selection-set.adoc[]
-** xref:ogm/type-generation.adoc[]
-** xref:ogm/subscriptions.adoc[]
-** xref:ogm/reference.adoc[]
-
 * *Frameworks and integrations*
 
 * xref:integrations/apollo-federation.adoc[]

modules/ROOT/pages/directives/custom-logic.adoc

@@ -1,5 +1,5 @@
 = Custom logic
-:page-aliases: type-definitions/cypher.adoc, type-definitions/default-values.adoc, ogm/examples/custom-resolvers.adoc, custom-resolvers.adoc
+:page-aliases: type-definitions/cypher.adoc, type-definitions/default-values.adoc, custom-resolvers.adoc
 :description: This page describes how to use directives for custom logic.
 
 == `@cypher`

modules/ROOT/pages/directives/index.adoc

@@ -140,17 +140,6 @@ of any required fields that is passed as arguments to the custom resolver.
 
 |===
 
-== OGM
-
-[cols="2,5"]
-|===
-| Directive | Description
-
-| xref::ogm/directives.adoc#_private[`@private`]
-| Protects fields which should only be available through the xref::ogm/index.adoc[OGM].
-
-|===
-
 == Relay
 
 [cols="2,5"]

modules/ROOT/pages/driver-configuration.adoc

@@ -6,7 +6,7 @@ This page describes the configuration of the Neo4j GraphQL Library driver.
 
 == Neo4j Driver
 
-For the Neo4j GraphQL Library to work, either an instance of the https://github.com/neo4j/neo4j-javascript-driver[Neo4j JavaScript driver] must be passed in on construction of your `Neo4jGraphQL` instance (or alternatively, `OGM`), or a driver, session or transaction passed into the `context.executionContext` per request.
+For the Neo4j GraphQL Library to work, either an instance of the https://github.com/neo4j/neo4j-javascript-driver[Neo4j JavaScript driver] must be passed in on construction of your `Neo4jGraphQL` instance, or a driver, session or transaction passed into the `context.executionContext` per request.
 
 The examples in this page assume a Neo4j database running at "bolt://localhost:7687" with a username of "username" and a password of "password".
 
@@ -143,31 +143,10 @@ await startStandaloneServer(server, {
 
 ----
 
-=== OGM
-
-[source, javascript, indent=0]
-----
-import { OGM } from "@neo4j/graphql-ogm";
-import neo4j from "neo4j-driver";
-
-const typeDefs = `#graphql
-    type User @node {
-        name: String
-    }
-`;
-
-const driver = neo4j.driver(
-    "bolt://localhost:7687",
-    neo4j.auth.basic("username", "password")
-);
-
-const ogm = new OGM({ typeDefs, driver });
-----
-
 [[driver-configuration-database-compatibility]]
 == Database compatibility
 
-Use the `checkNeo4jCompat` method available on either a `Neo4jGraphQL` or `OGM` instance to ensure the specified DBMS is of the required version, and has the necessary functions and procedures available. 
+Use the `checkNeo4jCompat` method available on a `Neo4jGraphQL` instance to ensure the specified DBMS is of the required version, and has the necessary functions and procedures available. 
 The `checkNeo4jCompat` throws an `Error` if the DBMS is incompatible, with details of the incompatibilities.
 
 === `Neo4jGraphQL`
@@ -192,28 +171,6 @@ const neoSchema = new Neo4jGraphQL({ typeDefs, driver });
 await neoSchema.checkNeo4jCompat();
 ----
 
-=== `OGM`
-
-[source, javascript, indent=0]
-----
-import { OGM } from "@neo4j/graphql-ogm";
-import neo4j from "neo4j-driver";
-
-const typeDefs = `#graphql
-    type User @node {
-        name: String
-    }
-`;
-
-const driver = neo4j.driver(
-    "bolt://localhost:7687",
-    neo4j.auth.basic("username", "password")
-);
-
-const ogm = new OGM({ typeDefs, driver });
-await ogm.checkNeo4jCompat();
-----
-
 == Specifying the Neo4j database
 
 Specify the database to be used within your DBMS via the `database` field under `sessionConfig` in the `context` that all resolvers share.

modules/ROOT/pages/index.adoc

@@ -31,7 +31,6 @@ For every query and mutation that is executed against this generated schema, the
 - Options for xref::/directives/database-mapping.adoc[Database mapping] and value xref::/directives/autogeneration.adoc[Autogeneration].
 - xref::/queries-aggregations/pagination/index.adoc[Pagination] options.
 - xref::/security/index.adoc[Security options] and additional xref::schema-configuration/index.adoc[Schema Configuration].
-- An xref::ogm/index.adoc[OGM] (Object Graph Mapper) for programmatic interaction with your GraphQL API.
 - A xref::getting-started/toolbox.adoc[Toolbox] (UI) to experiment with your Neo4j GraphQL API on Neo4j Desktop.
 
 

modules/ROOT/pages/migration/index.adoc

@@ -176,7 +176,7 @@ a|
 [source, graphql, indent=0]
 ----
 query {
-  movies(where: { NOT: { title: "The Matrix" } }) {
+  movies(where: { NOT: { title_EQ: "The Matrix" } }) {
     title
   }
 }
@@ -200,7 +200,7 @@ a|
 [source, graphql, indent=0]
 ----
 query {
-  movies(where: { actors_NOT: { name: "Keanu" } }) {
+  movies(where: { actors_NOT: { name_EQ: "Keanu" } }) {
     title
   }
 }
@@ -209,7 +209,7 @@ a|
 [source, graphql, indent=0]
 ----
 query {
-  movies(where: { actors_NONE: { name: "Keanu" } }) {
+  movies(where: { actors_NONE: { name_EQ: "Keanu" } }) {
     title
   }
 }
@@ -300,6 +300,43 @@ a|
 
 == Deprecations and warnings
 
+=== Implicit equality filters are deprecated
+
+The following implicit equality filters are deprecated: 
+
+  - `{ name: "Keanu" }`
+  - `{ count: 10 }` 
+
+You can achieve the same by using `{ name_EQ: "Keanu" }` and `{ count_EQ: 10 }`.
+The deprecated quality filters will be removed in version 7.x.
+
+[cols="1,1"]
+|===
+|Before | Now
+
+a|
+[source, graphql, indent=0]
+----
+query {
+  users(where: { name: "John" }) {
+    id
+    name
+  }
+}
+----
+a|
+[source, graphql, indent=0]
+----
+query {
+  users(where: { name_EQ: "John" }) {
+    id
+    name
+  }
+}
+----
+|===
+
+
 === `@node` will have to be explicitly defined
 
 In the future, types without the `@node` directive will no longer be treated as Neo4j nodes.

modules/ROOT/pages/mutations/create.adoc

@@ -140,7 +140,7 @@ mutation {
     name: "Tom Hanks",
     movies: {
       connectOrCreate: {
-        where: { node: { id: "1234" } }
+        where: { node: { id_EQ: "1234" } }
         onCreate: { node: { title: "Forrest Gump" } }
       }
     }

modules/ROOT/pages/mutations/delete.adoc

@@ -49,7 +49,7 @@ A single post can be deleted by executing the following GraphQL statement:
 ----
 mutation {
     deletePosts(where: {
-        id: "6042E807-47AE-4857-B7FE-1AADF522DE8B"
+        id_EQ: "6042E807-47AE-4857-B7FE-1AADF522DE8B"
     }) {
         nodesDeleted
         relationshipsDeleted
@@ -67,7 +67,7 @@ In case you want to delete a `User` *and* all of their posts, you can use a sing
 [source, graphql, indent=0]
 ----
 mutation {
-  deleteUsers(where: { name: "Jane Doe" }, delete: { posts: {} }) {
+  deleteUsers(where: { name_EQ: "Jane Doe" }, delete: { posts: {} }) {
     nodesDeleted
     relationshipsDeleted
   }
@@ -82,14 +82,14 @@ Essentially, the above query is equivalent to:
 mutation {
     deleteUsers(
         where: {
-            name: "Jane Doe"
+            name_EQ: "Jane Doe"
         },
         delete: {
             posts: [
                 where: {
                     node: {
                         creator: {
-                            name: "Jane Doe"
+                            name_EQ: "Jane Doe"
                         }
                     }
                 }

modules/ROOT/pages/mutations/update.adoc

@@ -59,7 +59,7 @@ The content of a `Post` can be updated by executing the following GraphQL statem
 mutation {
     updatePosts(
         where: {
-            id: "892CC104-A228-4BB3-8640-6ADC9F2C2A5F"
+            id_EQ: "892CC104-A228-4BB3-8640-6ADC9F2C2A5F"
         }
         update: {
             content: "Some new content for this Post!"
@@ -82,7 +82,7 @@ Instead of creating a `Post` with the `create` mutation and then connecting it t
 ----
 mutation {
     updateUsers(
-        where: { name: "John Doe" }
+        where: { name_EQ: "John Doe" }
         update: {
             posts: {
                 create: [
@@ -113,7 +113,7 @@ mutation {
     name: "Tom Hanks",
     movies: {
       connectOrCreate: {
-        where: { node: { id: "1234" } }
+        where: { node: { id_EQ: "1234" } }
         onCreate: { node: { title: "Forrest Gump" } }
       }
     }
@@ -134,12 +134,12 @@ mutation {
       update: {
         movies: {
             connectOrCreate: {
-                where: { node: { id: "1234" } }
+                where: { node: { id_EQ: "1234" } }
                 onCreate: { node: { title: "Forrest Gump" } }
             }
         }
       },
-      where: { name: "Tom Hanks" }
+      where: { name_EQ: "Tom Hanks" }
   ) {
     info {
       nodesCreated
@@ -462,7 +462,7 @@ Here is how you can do that:
 ----
 mutation incrementViewCountMutation {
   updateVideos(
-    where: { id: "VideoID" }
+    where: { id_EQ: "VideoID" }
     update: { views_INCREMENT: 1 }
   ) {
     videos {
@@ -480,7 +480,7 @@ To do that, you have to update the relationship property `revenue`:
 ----
 mutation addRevenueMutation {
   updateUsers(
-    where: { id: "UserID" },
+    where: { id_EQ: "UserID" },
     update: { ownVideo: [{ update: { edge: { revenue_ADD: 0.01 } } }] }
   ) {
     users {