From 464f007a5e1edcd80bf9e7b2acbc5e9be77d798c Mon Sep 17 00:00:00 2001 From: Andrew Rueckert Date: Thu, 31 Mar 2016 16:03:22 -0700 Subject: [PATCH 1/3] DefaultBindings for OffsetTime and OffsetDateTime handle negative offsets [#4338] added support for converting PostgreSQL-formatted timestamps into OffsetDateTime's, but did not correct for negative offsets. --- jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java index 50e641372a..ff994edfe9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java @@ -1486,7 +1486,7 @@ public class DefaultBinding implements Binding { return null; // [#4338] PostgreSQL is more lenient regarding the offset format - if (string.lastIndexOf('+') == string.length() - 3) + if (string.lastIndexOf('+') == string.length() - 3 || string.lastIndexOf('-') == string.length() - 3) string = string + ":00"; return OffsetTime.parse(string); @@ -1497,7 +1497,7 @@ public class DefaultBinding implements Binding { return null; // [#4338] PostgreSQL is more lenient regarding the offset format - if (string.lastIndexOf('+') == string.length() - 3) + if (string.lastIndexOf('+') == string.length() - 3 || string.lastIndexOf('-') == string.length() - 3) string = string + ":00"; // [#4338] SQL supports the alternative ISO 8601 date format, where a From 48c624f3cf9978232aa1b57062a245012d6d6362 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Sun, 3 Apr 2016 19:36:08 +0200 Subject: [PATCH 2/3] [#5186] Excessive log level when ignoring foreign key referencing an out-of-scope schema --- jOOQ-meta/src/main/java/org/jooq/util/DefaultRelations.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jOOQ-meta/src/main/java/org/jooq/util/DefaultRelations.java b/jOOQ-meta/src/main/java/org/jooq/util/DefaultRelations.java index 52f7de7e31..f64b3a15ec 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/DefaultRelations.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/DefaultRelations.java @@ -160,7 +160,7 @@ public class DefaultRelations implements Relations { // [#1134] Prevent NPE's when a foreign key references a unique key // from another schema if (uniqueKeySchema == null) { - log.warn("Ignoring foreign key", foreignKeyName + " (" + foreignKeyColumn + ") referencing " + uniqueKeyName + " references a schema out of scope for jooq-meta: " + uniqueKeySchema); + log.info("Ignoring foreign key", foreignKeyName + " (" + foreignKeyColumn + ") referencing " + uniqueKeyName + " references a schema out of scope for jooq-meta: " + uniqueKeySchema); return; } From f8e28549e8c9d9e91cb86f0493d16b9d74b71ec1 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Sun, 3 Apr 2016 20:10:08 +0200 Subject: [PATCH 3/3] [#5180] Added issue reference to comment --- jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java index ff994edfe9..71c701a900 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java @@ -1485,7 +1485,7 @@ public class DefaultBinding implements Binding { if (string == null) return null; - // [#4338] PostgreSQL is more lenient regarding the offset format + // [#4338] [#5180] PostgreSQL is more lenient regarding the offset format if (string.lastIndexOf('+') == string.length() - 3 || string.lastIndexOf('-') == string.length() - 3) string = string + ":00"; @@ -1496,7 +1496,7 @@ public class DefaultBinding implements Binding { if (string == null) return null; - // [#4338] PostgreSQL is more lenient regarding the offset format + // [#4338] [#5180] PostgreSQL is more lenient regarding the offset format if (string.lastIndexOf('+') == string.length() - 3 || string.lastIndexOf('-') == string.length() - 3) string = string + ":00";