Skip to content

Commit b89c347

Browse files
author
Zhen Li
committed
getRT procedure uses null to choose default database. This field is compulsory
1 parent 26aff78 commit b89c347

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

driver/src/main/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Statement procedureStatement( ServerVersion serverVersion, DatabaseName database
5555
{
5656
HashMap<String,Value> map = new HashMap<>();
5757
map.put( ROUTING_CONTEXT, value( context.asMap() ) );
58-
databaseName.databaseName().ifPresent( name -> map.put( DATABASE_NAME, value( name ) ) );
58+
map.put( DATABASE_NAME, value( (Object) databaseName.databaseName().orElse( null ) ) );
5959
return new Statement( MULTI_DB_GET_ROUTING_TABLE, value( map ) );
6060
}
6161

driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class Neo4jRunner
5454
{
5555
private static Neo4jRunner globalInstance;
5656

57-
private static final String DEFAULT_NEOCTRL_ARGS = "-e 4.0";
57+
private static final String DEFAULT_NEOCTRL_ARGS = "-e 3.5.11";
5858
public static final String NEOCTRL_ARGS = System.getProperty( "neoctrl.args", DEFAULT_NEOCTRL_ARGS );
5959
public static final Config DEFAULT_CONFIG = Config.builder().withLogging( console( INFO ) ).withoutEncryption().build();
6060

driver/src/test/resources/acquire_endpoints_v4_verify_connectivity.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
!: AUTO HELLO
44
!: AUTO GOODBYE
55

6-
C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {}} {"mode": "r", "db": "system"}
6+
C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {}, "database": null} {"mode": "r", "db": "system"}
77
PULL {"n": -1}
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]

0 commit comments

Comments
 (0)