From 59ea04d3d3fd0700e8c58d65a39504bd99745b3c Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 28 Nov 2013 18:52:23 +0100 Subject: [PATCH] [#2829] Fixed broken PostgreSQL transaction test behaviour --- .../jooq/test/_/testcases/CsvLoaderTests.java | 109 +++++++++--------- 1 file changed, 53 insertions(+), 56 deletions(-) diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java index 72e1cbe33e..1e78b3c941 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java @@ -90,14 +90,13 @@ extends AbstractLoaderTests execute = create().loadInto(TAuthor()) - .loadCSV( - csv) + Loader execute = + create().loadInto(TAuthor()) + .loadCSV(csv) .fields(TAuthor_ID(), TAuthor_FIRST_NAME(), TAuthor_LAST_NAME()) .quote('"') .separator(',') @@ -157,15 +154,15 @@ extends AbstractLoaderTests loader = create().loadInto(TAuthor()) + Loader loader = + create().loadInto(TAuthor()) .onDuplicateKeyError() .onErrorAbort() - .loadCSV( - csv) + .loadCSV(csv) .fields(TAuthor_ID(), TAuthor_LAST_NAME()) .quote('\'') .separator(';') .ignoreRows(0) .execute(); - System.out.println("Loader 4 " + create().selectFrom(TAuthor()).fetch().formatJSON()); + return loader; } @@ -194,13 +191,13 @@ extends AbstractLoaderTests createLoaderAbortingOnConstraintViolationOnLAST_NAME() throws java.io.IOException { String csv = "3\n" + "4"; - Loader execute = create().loadInto(TAuthor()) - .loadCSV( - csv) + Loader execute = + create().loadInto(TAuthor()) + .loadCSV(csv) .fields(TAuthor_ID()) .ignoreRows(0) .execute(); - //System.out.println("Loader 2 "+create().selectFrom(TAuthor()).fetch().formatJSON()); return execute; } @Override protected Loader createForEmptyFile() throws java.io.IOException { - return create().loadInto(TAuthor()) + return + create().loadInto(TAuthor()) .loadCSV("") .fields(TAuthor_ID()) .execute();