From 37b006e074f20676a2be6854047c6982b9bb91b7 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 16 May 2001 17:09:26 +0000
Subject: [PATCH] Add NUMERIC tests to jdbc code.
David Esposito
---
contrib/retep/build.xml | 3 ++-
src/interfaces/jdbc/build.xml | 4 ++--
.../jdbc/org/postgresql/jdbc1/ResultSetMetaData.java | 12 ++++++++++++
.../jdbc/org/postgresql/jdbc2/ResultSetMetaData.java | 12 ++++++++++++
4 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/contrib/retep/build.xml b/contrib/retep/build.xml
index 0b3342f9682..a5a168ea30a 100644
--- 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 ac18c5331a0..5c31201bf8f 100644
--- 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 a78612b085b..c39afa34b33 100644
--- 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 ebcf137a1eb..7e38236552a 100644
--- 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;
}
--
GitLab