Return-Path: X-Original-To: apmail-incubator-empire-db-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-empire-db-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4856673E6 for ; Sun, 13 Nov 2011 18:45:38 +0000 (UTC) Received: (qmail 78700 invoked by uid 500); 13 Nov 2011 18:45:38 -0000 Delivered-To: apmail-incubator-empire-db-commits-archive@incubator.apache.org Received: (qmail 78680 invoked by uid 500); 13 Nov 2011 18:45:38 -0000 Mailing-List: contact empire-db-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@incubator.apache.org Delivered-To: mailing list empire-db-commits@incubator.apache.org Received: (qmail 78671 invoked by uid 99); 13 Nov 2011 18:45:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Nov 2011 18:45:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Nov 2011 18:45:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E1B3C238889B; Sun, 13 Nov 2011 18:45:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1201472 - in /incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db: DBDatabaseDriver.java sqlserver/DBDatabaseDriverMSSQL.java Date: Sun, 13 Nov 2011 18:45:14 -0000 To: empire-db-commits@incubator.apache.org From: doebele@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111113184514.E1B3C238889B@eris.apache.org> Author: doebele Date: Sun Nov 13 18:45:14 2011 New Revision: 1201472 URL: http://svn.apache.org/viewvc?rev=1201472&view=rev Log: EMPIREDB-122 improved function names Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java?rev=1201472&r1=1201471&r2=1201472&view=diff ============================================================================== --- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java (original) +++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java Sun Nov 13 18:45:14 2011 @@ -618,19 +618,19 @@ public abstract class DBDatabaseDriver i switch (type) { case DATE: - return getDateTimeString(value, SQL_DATE_TEMPLATE, SQL_DATE_PATTERN, SQL_CURRENT_DATE); + return getSQLDateTimeString(value, SQL_DATE_TEMPLATE, SQL_DATE_PATTERN, SQL_CURRENT_DATE); case DATETIME: // System date is special case if (!DBDatabase.SYSDATE.equals(value) && value.toString().length()<=10) - return getDateTimeString(value, SQL_DATE_TEMPLATE, SQL_DATE_PATTERN, SQL_CURRENT_DATETIME); + return getSQLDateTimeString(value, SQL_DATE_TEMPLATE, SQL_DATE_PATTERN, SQL_CURRENT_DATETIME); // Complete Date-Time Object with time - return getDateTimeString(value, SQL_DATETIME_TEMPLATE, SQL_DATETIME_PATTERN, SQL_CURRENT_DATETIME); + return getSQLDateTimeString(value, SQL_DATETIME_TEMPLATE, SQL_DATETIME_PATTERN, SQL_CURRENT_DATETIME); case TEXT: case CHAR: case CLOB: case UNIQUEID: { // Text value - return getTextString(type, value); + return getSQLTextString(type, value); } case BOOL: { // Get Boolean value @@ -657,7 +657,7 @@ public abstract class DBDatabaseDriver i * @param sqlCurrentDate * @return */ - protected String getDateTimeString(Object value, int sqlTemplate, int sqlPattern, int sqlCurrentDate) + protected String getSQLDateTimeString(Object value, int sqlTemplate, int sqlPattern, int sqlCurrentDate) { // is it a sysdate expression if (DBDatabase.SYSDATE.equals(value)) @@ -692,12 +692,12 @@ public abstract class DBDatabaseDriver i * @param value the text to be encoded * @return the encoded sql value */ - protected String getTextString(DataType type, Object value) + protected String getSQLTextString(DataType type, Object value) { StringBuilder valBuf = new StringBuilder(); valBuf.append("'"); if (DBDatabase.EMPTY_STRING.equals(value)==false) - appendTextValue(valBuf, value.toString()); + appendSQLTextValue(valBuf, value.toString()); valBuf.append("'"); return valBuf.toString(); } @@ -705,7 +705,7 @@ public abstract class DBDatabaseDriver i /** * this helper function doubles up single quotes for SQL */ - protected void appendTextValue(StringBuilder buf, String value) + protected void appendSQLTextValue(StringBuilder buf, String value) { if (value.indexOf('\'') >= 0) { // a routine to double up single quotes for SQL Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java?rev=1201472&r1=1201471&r2=1201472&view=diff ============================================================================== --- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java (original) +++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java Sun Nov 13 18:45:14 2011 @@ -375,16 +375,16 @@ public class DBDatabaseDriverMSSQL exten } /** - * @see DBDatabaseDriver#getTextString(DataType type, Object value) + * @see DBDatabaseDriver#getSQLTextString(DataType type, Object value) */ @Override - protected String getTextString(DataType type, Object value) + protected String getSQLTextString(DataType type, Object value) { StringBuilder valBuf = new StringBuilder(); // for SQLSERVER utf8 support, see EMPIREDB-122 valBuf.append((useUnicodePrefix) ? "N'" : "'"); if (DBDatabase.EMPTY_STRING.equals(value)==false) - appendTextValue(valBuf, value.toString()); + appendSQLTextValue(valBuf, value.toString()); valBuf.append("'"); return valBuf.toString(); }