Add NUMERIC tests to jdbc code.

David Esposito

diff --git a/contrib/retep/build.xml b/contrib/retep/build.xml
index 0b3342f96829c3e905488aa74db71e5cfa4ea1d4..a5a168ea30ae03518f7376ac18926bd4ae063f7b 100644 (file)
--- a/contrib/retep/build.xml
+++ b/contrib/retep/build.xml
@@ -2,7 +2,7 @@
 
   build file to build the donated retep tools packages
 
-  $Id: build.xml,v 1.5 2001/05/16 16:20:51 momjian Exp $
+  $Id: build.xml,v 1.6 2001/05/16 17:09:25 momjian Exp $
 
 -->
 
@@ -43,6 +43,7 @@
   <target name="compile" depends="checks,prepare,warning" if="jdk1.2+">
     <javac srcdir="${src}" destdir="${dest}">
       <include name="${package}/**" />
+      <exclude name="${package}/**" unless="jdk1.2+" />
     </javac>
   </target>
 

diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index ac18c5331a0eff4a1271f82b06afb74af2079f1d..5c31201bf8ff070e8819b351f83b855a9ecacde9 100644 (file)
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -3,7 +3,7 @@
   build file to allow ant (http://jakarta.apache.org/ant/) to be used
   to build the PostgreSQL JDBC Driver.
 
-  $Id: build.xml,v 1.9 2001/05/16 16:20:52 momjian Exp $
+  $Id: build.xml,v 1.10 2001/05/16 17:09:26 momjian Exp $
 
 -->
 
@@ -120,7 +120,7 @@
     <javac srcdir="${src}" destdir="${dest}">
       <include name="example/**" />
       <exclude name="example/corba/**"/>
-      <exclude name="example/blobtest.java" unless="jdk1.2+" />
+      <exclude name="example/blobtest.java" unless="jdk1.2+"/>
     </javac>
   </target>
 

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java
index a78612b085b9b9b6cd9428f212f16456bc7b2aff..c39afa34b3327e72de687a10148875f609028913 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java
@@ -290,6 +290,12 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
        return 16;
       case Types.VARCHAR:
        return 0;
+      case Types.NUMERIC:
+       Field f = getField(column);
+       if(f != null)
+               return ((0xFFFF0000)&f.mod)>>16;
+       else
+               return 0;
       default:
        return 0;
       }
@@ -321,6 +327,12 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
        return 16;
       case Types.VARCHAR:
        return 0;
+      case Types.NUMERIC:
+       Field f = getField(column);
+       if(f != null)
+               return (((0x0000FFFF)&f.mod)-4);
+       else
+               return 0;
       default:
        return 0;
       }

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java
index ebcf137a1ebfaa5772354b92d9c956f11935c737..7e38236552a865718933f6c530c4164d58c0d071 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java
@@ -285,6 +285,12 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
        return 16;
       case Types.VARCHAR:
        return 0;
+      case Types.NUMERIC:
+       Field f = getField(column);
+       if(f != null)
+               return ((0xFFFF0000)&f.mod)>>16;
+       else
+               return 0;
       default:
        return 0;
       }
@@ -316,6 +322,12 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
        return 16;
       case Types.VARCHAR:
        return 0;
+      case Types.NUMERIC:
+       Field f = getField(column);
+       if(f != null)
+               return (((0x0000FFFF)&f.mod)-4);
+       else
+               return 0;
       default:
        return 0;
       }