Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for CalVer (4.x) #5965

Merged
merged 4 commits into from
Jan 28, 2025
Merged

Fix for CalVer (4.x) #5965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f623c7e
Fix for CalVer
angrykoala Jan 24, 2025
d319959
Fix integration tests
angrykoala Jan 28, 2025
c4b253f
Remove add-pull-request-to-triage workflow
angrykoala Jan 28, 2025
8b7c4ee
Change expectations on id for subscriptions
angrykoala Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/serious-paws-hunt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@neo4j/graphql": patch
---

Add support for CalVer editions of neo4j
22 changes: 0 additions & 22 deletions .github/workflows/pull-request-opened.yml
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions packages/graphql/src/classes/Neo4jDatabaseInfo.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,9 @@ describe("Neo4jDatabaseInfo", () => {
return new Neo4jDatabaseInfo("this_seems_not_valid", "enterprise");
}).toThrow();
});

test("should accept CalVar", () => {
const dbInfo = new Neo4jDatabaseInfo("2025.01.0-aura", "enterprise");
expect(dbInfo).toBeInstanceOf(Neo4jDatabaseInfo);
});
});
2 changes: 2 additions & 0 deletions packages/graphql/src/classes/Neo4jDatabaseInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ export class Neo4jDatabaseInfo {
public edition: Neo4jEdition | undefined;

constructor(version: string, edition?: Neo4jEdition) {
// Quick hack to support CalVar
version = version.replace(/\.0([0-9]+)/, ".$1");
this.version = this.toSemVer(version);
this.rawVersion = version;
this.edition = edition;
Expand Down
34 changes: 17 additions & 17 deletions packages/graphql/tests/integration/subscriptions/create-relationship/create.int.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import { graphql } from "graphql";
import type { Driver } from "neo4j-driver";
import { cleanNodes } from "../../../utils/clean-nodes";
import { Neo4jGraphQL } from "../../../../src";
import { cleanNodes } from "../../../utils/clean-nodes";
import { UniqueType } from "../../../utils/graphql-types";
import { TestSubscriptionsEngine } from "../../../utils/TestSubscriptionsEngine";
import Neo4j from "../../neo4j";
Expand Down Expand Up @@ -194,7 +194,7 @@ describe("Subscriptions connect with create", () => {
expect(plugin.eventList).toEqual(
expect.arrayContaining([
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -217,7 +217,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -240,7 +240,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -263,7 +263,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand Down Expand Up @@ -355,7 +355,7 @@ describe("Subscriptions connect with create", () => {
expect(plugin.eventList).toEqual(
expect.arrayContaining([
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -378,7 +378,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand Down Expand Up @@ -463,7 +463,7 @@ describe("Subscriptions connect with create", () => {
expect(plugin.eventList).toEqual(
expect.arrayContaining([
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -487,7 +487,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand Down Expand Up @@ -647,7 +647,7 @@ describe("Subscriptions connect with create", () => {
expect(plugin.eventList).toEqual(
expect.arrayContaining([
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -671,7 +671,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -694,7 +694,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -717,7 +717,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -740,7 +740,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -764,7 +764,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -788,7 +788,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -812,7 +812,7 @@ describe("Subscriptions connect with create", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand Down
7 changes: 4 additions & 3 deletions packages/graphql/tests/integration/subscriptions/create-relationship/delete.int.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import { graphql } from "graphql";
import type { Driver, Session } from "neo4j-driver";
import { cleanNodes } from "../../../utils/clean-nodes";
import { Neo4jGraphQL } from "../../../../src";
import { cleanNodes } from "../../../utils/clean-nodes";
import { UniqueType } from "../../../utils/graphql-types";
import { TestSubscriptionsEngine } from "../../../utils/TestSubscriptionsEngine";
import Neo4j from "../../neo4j";
Expand Down Expand Up @@ -165,10 +165,11 @@ describe("Subscriptions connect with delete", () => {
});

expect(gqlResult.errors).toBeUndefined();

expect(plugin.eventList).toEqual(
expect.arrayContaining([
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand All @@ -190,7 +191,7 @@ describe("Subscriptions connect with delete", () => {
toTypename: typeMovie.name,
},
{
id: expect.any(Number),
id: expect.anything(),
id_from: expect.any(Number),
id_to: expect.any(Number),
timestamp: expect.any(Number),
Expand Down
Loading