10:58 a.m.
Author: steve.ebersole(a)jboss.com
Date: 2008-09-16 11:58:53 -0400 (Tue, 16 Sep 2008)
New Revision: 15201
Added:
core/branches/Branch_3_3/core/src/test/java/org/hibernate/engine/
core/branches/Branch_3_3/core/src/test/java/org/hibernate/engine/query/
core/branches/Branch_3_3/core/src/test/java/org/hibernate/engine/query/ParameterParserTest.java
Modified:
core/branches/Branch_3_3/core/src/main/java/org/hibernate/engine/query/ParameterParser.java
Log:
HHH-3216 : ParameterParser + escaped function call syntax
Modified:
core/branches/Branch_3_3/core/src/main/java/org/hibernate/engine/query/ParameterParser.java
===================================================================
---
core/branches/Branch_3_3/core/src/main/java/org/hibernate/engine/query/ParameterParser.java 2008-09-16
15:57:19 UTC (rev 15200)
+++
core/branches/Branch_3_3/core/src/main/java/org/hibernate/engine/query/ParameterParser.java 2008-09-16
15:58:53 UTC (rev 15201)
@@ -46,8 +46,10 @@
public void other(char character);
}
+ /**
+ * Direct instantiation of ParameterParser disallowed.
+ */
private ParameterParser() {
- // disallow instantiation
}
/**
@@ -60,12 +62,10 @@
*
* @param sqlString The string to be parsed/tokenized.
* @param recognizer The thing which handles recognition events.
- * @throws QueryException
+ * @throws QueryException Indicates unexpected parameter conditions.
*/
public static void parse(String sqlString, Recognizer recognizer) throws QueryException
{
- boolean hasMainOutputParameter = sqlString.indexOf( "call" ) > 0
&&
- sqlString.indexOf( "?" ) <
sqlString.indexOf( "call" ) &&
- sqlString.indexOf( "=" ) <
sqlString.indexOf( "call" );
+ boolean hasMainOutputParameter = startsWithEscapeCallTemplate( sqlString );
boolean foundMainOutputParam = false;
int stringLength = sqlString.length();
@@ -89,8 +89,9 @@
int chopLocation = right < 0 ? sqlString.length() : right;
String param = sqlString.substring( indx + 1, chopLocation );
if ( StringHelper.isEmpty( param ) ) {
- throw new QueryException("Space is not allowed after parameter prefix
':' '"
- + sqlString + "'");
+ throw new QueryException(
+ "Space is not allowed after parameter prefix ':' [" + sqlString
+ "]"
+ );
}
recognizer.namedParameter( param, indx );
indx = chopLocation - 1;
@@ -129,4 +130,34 @@
}
}
+ public static boolean startsWithEscapeCallTemplate(String sqlString) {
+ if ( ! ( sqlString.startsWith( "{" ) && sqlString.endsWith(
"}" ) ) ) {
+ return false;
+ }
+
+ int chopLocation = sqlString.indexOf( "call" );
+ if ( chopLocation <= 0 ) {
+ return false;
+ }
+
+ final String checkString = sqlString.substring( 1, chopLocation + 4 );
+ final String fixture = "?=call";
+ int fixturePosition = 0;
+ boolean matches = true;
+ for ( int i = 0, max = checkString.length(); i < max; i++ ) {
+ final char c = Character.toLowerCase( checkString.charAt( i ) );
+ if ( Character.isWhitespace( c ) ) {
+ continue;
+ }
+ if ( c == fixture.charAt( fixturePosition ) ) {
+ fixturePosition++;
+ continue;
+ }
+ matches = false;
+ break;
+ }
+
+ return matches;
+ }
+
}
Added:
core/branches/Branch_3_3/core/src/test/java/org/hibernate/engine/query/ParameterParserTest.java
===================================================================
---
core/branches/Branch_3_3/core/src/test/java/org/hibernate/engine/query/ParameterParserTest.java
(rev 0)
+++
core/branches/Branch_3_3/core/src/test/java/org/hibernate/engine/query/ParameterParserTest.java 2008-09-16
15:58:53 UTC (rev 15201)
@@ -0,0 +1,39 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ *
+ */
+package org.hibernate.engine.query;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit tests of the ParameterParser class
+ *
+ * @author Steve Ebersole
+ */
+public class ParameterParserTest extends TestCase {
+ public void testEscapeCallRecognition() {
+ assertTrue( ParameterParser.startsWithEscapeCallTemplate( "{ ? = call abc(?)
}" ) );
+ assertFalse( ParameterParser.startsWithEscapeCallTemplate( "from User u where
u.userName = ? and u.userType = 'call'" ) );
+ }
+}