@neo4j-cypher/query-tools 2.0.0-next.21 → 2.0.0-next.23

package/src/schemaPoller.ts

@@ -13,7 +13,7 @@ import {
 } from './metadataPoller';
 import { Neo4jConnection } from './neo4jConnection';
 import { listDatabases } from './queries/databases.js';
-import { getCypherVersions } from './queries/version';
+import { getVersion } from './queries/version';
 
 export type ConnnectionResult = {
   success: boolean;
@@ -152,6 +152,29 @@ export class Neo4jSchemaPoller {
     clearTimeout(this.reconnectionTimeout);
   }
 
+  private async getAvailableCypherVersions(): Promise<string[]> {
+    // We need to use a query we can fire against the system database
+    // because we might not have no information on what user database
+    // we could use to try a simpler CYPHER 25 RETURN true query
+    const { query: cypherVersionQuery, queryConfig: cypherVersionQueryConfig } =
+      getVersion();
+
+    try {
+      if (this.driver) {
+        await this.driver.executeQuery(
+          'CYPHER 25' + ' ' + cypherVersionQuery,
+          {},
+          cypherVersionQueryConfig,
+        );
+        return ['5', '25'];
+      }
+    } catch (e) {
+      return ['5'];
+    }
+
+    return ['5'];
+  }
+
   private async connectAndStartMetadataPoller(
     url: string,
     credentials: { username: string; password: string },
@@ -180,14 +203,30 @@ export class Neo4jSchemaPoller {
       database,
     );
 
-    const { query: cypherVersionQuery, queryConfig: cypherVersionQueryConfig } =
-      getCypherVersions();
-    const { serverCypherVersions } = await this.driver.executeQuery(
-      cypherVersionQuery,
+    const serverCypherVersions = await this.getAvailableCypherVersions();
+
+    const { query: serverVersionQuery, queryConfig: serverVersionQueryConfig } =
+      getVersion();
+    let { serverVersion } = await this.driver.executeQuery(
+      serverVersionQuery,
       {},
-      cypherVersionQueryConfig,
+      serverVersionQueryConfig,
     );
 
+    // If the server version is 5.27.0 we have to use the agent to
+    // really know whether we are in 2025.01, 2025.02 or 2025.03
+    if (serverVersion?.startsWith('5.27.0')) {
+      const agent = summary.server.agent;
+      if (agent) {
+        const matchedVersion = agent.match(/\d+\.\d+\.\d+/);
+        if (matchedVersion) {
+          serverVersion = matchedVersion[0];
+        }
+      }
+    }
+
+    this.connection.serverVersion = serverVersion;
+
     this.metadata = new ConnectedMetadataPoller(
       databases,
       this.parameters,