From commits-return-2454-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Thu Oct 18 01:38:20 2007 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 64038 invoked from network); 18 Oct 2007 01:38:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Oct 2007 01:38:20 -0000 Received: (qmail 69497 invoked by uid 500); 18 Oct 2007 01:38:08 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 69487 invoked by uid 500); 18 Oct 2007 01:38:08 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 69478 invoked by uid 99); 18 Oct 2007 01:38:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2007 18:38:08 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2007 01:38:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C62B11A9832; Wed, 17 Oct 2007 18:37:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r585774 - in /openjpa: branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ trunk/o... Date: Thu, 18 Oct 2007 01:37:58 -0000 To: commits@openjpa.apache.org From: kwsutter@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071018013759.C62B11A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwsutter Date: Wed Oct 17 18:37:58 2007 New Revision: 585774 URL: http://svn.apache.org/viewvc?rev=585774&view=rev Log: OPENJPA-399. Committing Teresa's most recent patch for this Issue. Should be ready for resolution now. Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java?rev=585774&r1=585773&r2=585774&view=diff ============================================================================== --- openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java (original) +++ openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java Wed Oct 17 18:37:58 2007 @@ -819,8 +819,10 @@ if (_log.isTraceEnabled()) _log.trace(_loc.get("gen-seqs", schemaName, sequenceName)); + // since all the sequences are generated under the default schema + // therefore, we can use the null schemaname to search Sequence[] seqs = _dict.getSequences(meta, conn.getCatalog(), - schemaName, sequenceName, conn); + null, sequenceName, conn); SchemaGroup group = getSchemaGroup(); Schema schema; Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=585774&r1=585773&r2=585774&view=diff ============================================================================== --- openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original) +++ openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Oct 17 18:37:58 2007 @@ -94,7 +94,7 @@ "LONG VARCHAR FOR BIT DATA", "LONG VARCHAR", "LONG VARGRAPHIC", })); systemSchemas = new String( - "SYSCAT, SYSIBM, SYSSTAT, SYSIBMADM, SYSTOOLS"); + "SYSCAT,SYSIBM,SYSSTAT,SYSIBMADM,SYSTOOLS"); maxConstraintNameLength = 18; maxIndexNameLength = 18; maxColumnNameLength = 30; Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=585774&r1=585773&r2=585774&view=diff ============================================================================== --- openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original) +++ openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Wed Oct 17 18:37:58 2007 @@ -3341,7 +3341,7 @@ try { int idx = 1; if (schemaName != null) - stmnt.setString(idx++, schemaName); + stmnt.setString(idx++, schemaName.toUpperCase()); if (sequenceName != null) stmnt.setString(idx++, sequenceName); @@ -3685,13 +3685,21 @@ if (objectName == null) return null; - if (SCHEMA_CASE_LOWER.equals(schemaCase)) + String scase = getSchemaCase(); + if (SCHEMA_CASE_LOWER.equals(scase)) return objectName.toLowerCase(); - if (SCHEMA_CASE_PRESERVE.equals(schemaCase)) + if (SCHEMA_CASE_PRESERVE.equals(scase)) return objectName; return objectName.toUpperCase(); } + /** + * Return DB specific schemaCase + */ + public String getSchemaCase(){ + return schemaCase; + } + /** * Prepared the connection for metadata operations. */ Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java?rev=585774&r1=585773&r2=585774&view=diff ============================================================================== --- openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java (original) +++ openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java Wed Oct 17 18:37:58 2007 @@ -42,6 +42,7 @@ private static final Localizer _loc = Localizer.forPackage (SQLServerDictionary.class); + private String schemaCase = SCHEMA_CASE_PRESERVE; /** * Flag whether to treat UNIQUEIDENTIFIER as VARBINARY or VARCHAR */ @@ -229,5 +230,12 @@ append(getTypeName(type)); appendLength(buf, type); buf.append("')"); + } + + /** + * Return DB specific schemaCase + */ + public String getSchemaCase() { + return schemaCase; } } Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java?rev=585774&r1=585773&r2=585774&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java Wed Oct 17 18:37:58 2007 @@ -819,8 +819,10 @@ if (_log.isTraceEnabled()) _log.trace(_loc.get("gen-seqs", schemaName, sequenceName)); + // since all the sequences are generated under the default schema + // therefore, we can use the null schemaname to search Sequence[] seqs = _dict.getSequences(meta, conn.getCatalog(), - schemaName, sequenceName, conn); + null, sequenceName, conn); SchemaGroup group = getSchemaGroup(); Schema schema; Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=585774&r1=585773&r2=585774&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Oct 17 18:37:58 2007 @@ -94,7 +94,7 @@ "LONG VARCHAR FOR BIT DATA", "LONG VARCHAR", "LONG VARGRAPHIC", })); systemSchemas = new String( - "SYSCAT, SYSIBM, SYSSTAT, SYSIBMADM, SYSTOOLS"); + "SYSCAT,SYSIBM,SYSSTAT,SYSIBMADM,SYSTOOLS"); maxConstraintNameLength = 18; maxIndexNameLength = 18; maxColumnNameLength = 30; Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=585774&r1=585773&r2=585774&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Wed Oct 17 18:37:58 2007 @@ -3364,7 +3364,7 @@ try { int idx = 1; if (schemaName != null) - stmnt.setString(idx++, schemaName); + stmnt.setString(idx++, schemaName.toUpperCase()); if (sequenceName != null) stmnt.setString(idx++, sequenceName); @@ -3708,13 +3708,21 @@ if (objectName == null) return null; - if (SCHEMA_CASE_LOWER.equals(schemaCase)) + String scase = getSchemaCase(); + if (SCHEMA_CASE_LOWER.equals(scase)) return objectName.toLowerCase(); - if (SCHEMA_CASE_PRESERVE.equals(schemaCase)) + if (SCHEMA_CASE_PRESERVE.equals(scase)) return objectName; return objectName.toUpperCase(); } - + + /** + * Return DB specific schemaCase + */ + public String getSchemaCase(){ + return schemaCase; + } + /** * Prepared the connection for metadata operations. */ Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java?rev=585774&r1=585773&r2=585774&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java Wed Oct 17 18:37:58 2007 @@ -42,6 +42,7 @@ private static final Localizer _loc = Localizer.forPackage (SQLServerDictionary.class); + private String schemaCase = SCHEMA_CASE_PRESERVE; /** * Flag whether to treat UNIQUEIDENTIFIER as VARBINARY or VARCHAR */ @@ -229,5 +230,12 @@ append(getTypeName(type)); appendLength(buf, type); buf.append("')"); + } + + /** + * Return DB specific schemaCase + */ + public String getSchemaCase() { + return schemaCase; } }