From 9d230fbde8bfa6e784cd7fb886868f874bb5d97b Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 8 Apr 2014 15:00:55 +0200 Subject: [PATCH] [#3162] NullPointerException when referencing window name that was not declared --- .../src/main/java/org/jooq/impl/Function.java | 14 +++- .../java/org/jooq/test/ExceptionsTest.java | 66 +++++++++++++++++++ 2 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 jOOQ/src/test/java/org/jooq/test/ExceptionsTest.java diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java index 577adb1d76..f07b10a9eb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function.java @@ -367,11 +367,19 @@ class Function extends AbstractField implements Map map = (Map) ctx.data(DATA_LOCALLY_SCOPED_DATA_MAP); QueryPartList windows = (QueryPartList) map.get(DATA_WINDOW_DEFINITIONS); - for (WindowDefinition window : windows) { - if (((WindowDefinitionImpl) window).getName().equals(windowName)) { - return window; + if (windows != null) { + for (WindowDefinition window : windows) { + if (((WindowDefinitionImpl) window).getName().equals(windowName)) { + return window; + } } } + + // [#3162] If a window specification is missing from the query's WINDOW clause, + // jOOQ should just render the window name regardless of the SQL dialect + else { + return windowName; + } } return null; diff --git a/jOOQ/src/test/java/org/jooq/test/ExceptionsTest.java b/jOOQ/src/test/java/org/jooq/test/ExceptionsTest.java new file mode 100644 index 0000000000..dd1aea0aff --- /dev/null +++ b/jOOQ/src/test/java/org/jooq/test/ExceptionsTest.java @@ -0,0 +1,66 @@ +/** + * Copyright (c) 2009-2014, Data Geekery GmbH (http://www.datageekery.com) + * All rights reserved. + * + * This work is dual-licensed + * - under the Apache Software License 2.0 (the "ASL") + * - under the jOOQ License and Maintenance Agreement (the "jOOQ License") + * ============================================================================= + * You may choose which license applies to you: + * + * - If you're using this work with Open Source databases, you may choose + * either ASL or jOOQ License. + * - If you're using this work with at least one commercial database, you must + * choose jOOQ License + * + * For more information, please visit http://www.jooq.org/licenses + * + * Apache Software License 2.0: + * ----------------------------------------------------------------------------- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * jOOQ License and Maintenance Agreement: + * ----------------------------------------------------------------------------- + * Data Geekery grants the Customer the non-exclusive, timely limited and + * non-transferable license to install and use the Software under the terms of + * the jOOQ License and Maintenance Agreement. + * + * This library is distributed with a LIMITED WARRANTY. See the jOOQ License + * and Maintenance Agreement for more details: http://www.jooq.org/licensing + */ +package org.jooq.test; + +import static org.jooq.impl.DSL.count; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Common tests related to jOOQ's exception handling + * + * @author Lukas Eder + */ +public class ExceptionsTest extends AbstractTest { + + @Test + public void testMissingWindowSpecification() { + + // [#3162] If a window specification is missing from the query's WINDOW clause, + // jOOQ should just render the window name regardless of the SQL dialect + assertTrue( + create.select(count().over("window")) + .getSQL() + .contains("over (`window`)") + ); + } +}