Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion v2/googlecloud-to-neo4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.neo4j.importer</groupId>
<artifactId>import-spec</artifactId>
<version>1.0.0-rc11</version>
<version>1.0.0-rc13</version>
</dependency>
<dependency>
<groupId>com.google.cloud.teleport.v2</groupId>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private static String optionsAsList(Collection<?> value) {
}

public static String propertyType(PropertyType propertyType) {
return switch (propertyType) {
return switch (propertyType.getName()) {
case BOOLEAN -> "BOOLEAN";
case BOOLEAN_ARRAY -> "LIST<BOOLEAN NOT NULL>";
case DATE -> "DATE";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ public void resetDatabase() {
var capabilities = capabilities();

if (capabilities.hasCreateOrReplaceDatabase()) {
recreateDatabase(capabilities);
recreateDatabase();
} else {
deleteData();
dropSchema(capabilities);
dropSchema();
}
} catch (Exception exception) {
LOG.error(
Expand All @@ -128,7 +128,7 @@ public void resetDatabase() {
}
}

private void recreateDatabase(Neo4jCapabilities capabilities) {
private void recreateDatabase() {
try {
String database = !StringUtils.isEmpty(this.database) ? this.database : "neo4j";
String cypher = "CREATE OR REPLACE DATABASE $db WAIT 60 SECONDS";
Expand All @@ -140,7 +140,7 @@ private void recreateDatabase(Neo4jCapabilities capabilities) {
cypher, Map.of("db", database), databaseResetMetadata("create-replace-database"));
} catch (Exception ex) {
deleteData();
dropSchema(capabilities);
dropSchema();
}
}

Expand All @@ -150,7 +150,7 @@ private void deleteData() {
runAutocommit(ddeCypher, databaseResetMetadata("cit-detach-delete"));
}

private void dropSchema(Neo4jCapabilities capabilities) {
private void dropSchema() {
try (var session = getSession()) {
LOG.info("Dropping constraints");
var constraints =
Expand Down
Loading
Loading