svn commit: r898276 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/dba/postgres/ test/java/org/apache/cayenne/dba/postgres/

[ol...@apache.org]

Author: oltka
Date: Tue Jan 12 10:38:13 2010
New Revision: 898276

URL: http://svn.apache.org/viewvc?rev=898276&view=rev
Log:
CAY-1363 Postgress don't support notations float(a, b)

* now we ignore scale in postgres.

Added:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/postgres/
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterTest.java
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java?rev=898276&r1=898275&r2=898276&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java Tue Jan 12 10:38:13 2010
@@ -171,7 +171,9 @@
             // append size and precision (if applicable)
             if (typeSupportsLength(at.getType())) {
                 int len = at.getMaxLength();
-                int scale = TypesMapping.isDecimal(at.getType()) ? at.getScale() : -1;
+                int scale = (TypesMapping.isDecimal(at.getType()) 
+                        && at.getType() != Types.FLOAT) // Postgress don't support notations float(a, b) 
+                        ? at.getScale() : -1;
 
                 // sanity check
                 if (scale > len) {

Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterTest.java?rev=898276&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterTest.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/postgres/PostgresAdapterTest.java Tue Jan 12 10:38:13 2010
@@ -0,0 +1,49 @@
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.
+ ****************************************************************/
+package org.apache.cayenne.dba.postgres;
+
+import java.sql.Types;
+
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+
+import junit.framework.TestCase;
+
+
+public class PostgresAdapterTest extends TestCase {
+    
+    public void testCreateTableWithFloatAttributeWithScale () {
+        PostgresAdapter adapter = new PostgresAdapter();
+        DbEntity e = new DbEntity("Test");
+        DbAttribute dblPrec = new DbAttribute("dbl1");
+        dblPrec.setType(Types.FLOAT);
+        dblPrec.setMaxLength(22);
+        dblPrec.setScale(12);
+        e.addAttribute(dblPrec);
+        
+        String sql = adapter.createTable(e);
+
+        // CAY-1363.
+        // Postgress don't support notations float(a, b) 
+        assertTrue(sql.indexOf("float(22)") > 0);
+        assertEquals(-1, sql.indexOf("float(22, 12)"));
+        assertEquals("CREATE TABLE Test (dbl1 float(22) NULL)", sql);
+    }
+
+}