From aa35783e556863311461f9a05e2ffee4f4579a2f Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Thu, 9 Jan 2020 08:22:08 +0100 Subject: [PATCH] [jOOQ/jOOQ#9598] Fix race condition caused by Tools#PARSER Since this package private field `Tools#PARSER` isn't used anywhere, it can just be deleted. --- jOOQ-examples/jOOQ-oracle-example/pom.xml | 1 + .../jOOQ-oracle-example/src/main/resources/config.properties | 2 +- .../src/test/java/org/jooq/example/OracleSpatialExamples.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/Tools.java | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml index afdd46a82f..cb6e2d0588 100644 --- a/jOOQ-examples/jOOQ-oracle-example/pom.xml +++ b/jOOQ-examples/jOOQ-oracle-example/pom.xml @@ -190,6 +190,7 @@ false + false org.jooq.example.db.oracle diff --git a/jOOQ-examples/jOOQ-oracle-example/src/main/resources/config.properties b/jOOQ-examples/jOOQ-oracle-example/src/main/resources/config.properties index 39224bb15f..4a8ea45158 100644 --- a/jOOQ-examples/jOOQ-oracle-example/src/main/resources/config.properties +++ b/jOOQ-examples/jOOQ-oracle-example/src/main/resources/config.properties @@ -1,6 +1,6 @@ #Database Configuration db.driver=oracle.jdbc.OracleDriver -db.url=jdbc:oracle:thin:@localhost:1521:xe +db.url=jdbc:oracle:thin:@localhost:1521:ORCLCDB db.username=SP db.password=SP diff --git a/jOOQ-examples/jOOQ-oracle-example/src/test/java/org/jooq/example/OracleSpatialExamples.java b/jOOQ-examples/jOOQ-oracle-example/src/test/java/org/jooq/example/OracleSpatialExamples.java index a8e12d92d3..34ae3d87e2 100644 --- a/jOOQ-examples/jOOQ-oracle-example/src/test/java/org/jooq/example/OracleSpatialExamples.java +++ b/jOOQ-examples/jOOQ-oracle-example/src/test/java/org/jooq/example/OracleSpatialExamples.java @@ -103,7 +103,7 @@ public class OracleSpatialExamples extends Utils { System.out.println("Return the areas of all cola markets."); System.out.println("-------------------------------------"); - dsl.select(SdoGeom.sdoArea2(c_a.SHAPE, val(0.005))) + dsl.select(SdoGeom.sdoArea2(c_a.SHAPE, val(0.005), val("SQ_KM"))) .from(c_a) .fetch() .map(Record1::value1) @@ -117,7 +117,7 @@ public class OracleSpatialExamples extends Utils { System.out.println("Return the distance between two geometries."); System.out.println("-------------------------------------------"); - dsl.select(SdoGeom.sdoDistance2(c_b.SHAPE, c_d.SHAPE, val(0.005))) + dsl.select(SdoGeom.sdoDistance2(c_b.SHAPE, c_d.SHAPE, val(0.005), val("KM"), val("false"))) .from(c_b, c_d) .where(c_b.NAME.eq("cola_b")) .and(c_d.NAME.eq("cola_d")) diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index b680014966..38c23e35a0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -2962,7 +2962,6 @@ final class Tools { static final DSLContext CTX = DSL.using(new DefaultConfiguration()); - static final ParserImpl PARSER = (ParserImpl) CTX.parser(); /** * Return a non-negative hash code for a {@link QueryPart}, taking into