Skip to content

P
Postgres FD Implementation
Commit f41dcbe4 authored by Peter Mount's avatar Peter Mount
Browse files
Options

Major update part I involving delayed patches, reworked Makefile, and how 

the versioning works. There's also a new utils directory used by Makefile
parent f20d2a87
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1405 additions and 279 deletions
src/interfaces/jdbc/CHANGELOG
View file @ f41dcbe4
Tue Oct 10 13:12:00 BST 2000 peter@retep.org.uk
- DatabaseMetaData.supportsAlterTableWithDropColumn() as psql doesn't
support dropping of individual columns
- Merged in some last patches. Only 1 left, which may not be compatible
with jdbc1
- Merged in my old retepsql project. Makefile now includes it.
Mon Oct 02 12:30:00 BST 2000 peter@retep.org.uk
- Merged in byte[] array allocation changes submitted by Gunnar R|nning
<gunnar@candleweb.no>
Mon Sep 25 14:22:00 BST 2000 peter@retep.org.uk
- Removed the DriverClass kludge. Now the org.postgresql.Driver class
is compiled from a template file, and now has both the connection
class (ie jdbc1/jdbc2) and the current version's from Makefile.global
-
Thu Jul 20 16:30:00 BST 2000 petermount@it.maidstone.gov.uk Thu Jul 20 16:30:00 BST 2000 petermount@it.maidstone.gov.uk
- Fixed DatabaseMetaData.getTableTypes() - Fixed DatabaseMetaData.getTableTypes()
......
src/interfaces/jdbc/Makefile
View file @ f41dcbe4
...@@ -4,10 +4,15 @@ ...@@ -4,10 +4,15 @@
# Makefile for Java JDBC interface # Makefile for Java JDBC interface
# #
# IDENTIFICATION # IDENTIFICATION
# $Id: Makefile,v 1.24 2000/09/12 04:58:46 momjian Exp $ # $Id: Makefile,v 1.25 2000/10/12 08:55:23 peter Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
subdir = src/interfaces
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
CP = cp
FIND = find FIND = find
IDL2JAVA = idltojava -fno-cpp -fno-tie IDL2JAVA = idltojava -fno-cpp -fno-tie
JAR = jar JAR = jar
...@@ -17,6 +22,9 @@ JAVADOC = javadoc ...@@ -17,6 +22,9 @@ JAVADOC = javadoc
RM = rm -f RM = rm -f
TOUCH = touch TOUCH = touch
BUILDDRIVER = sh utils/buildDriver
CHANGELOG = perl utils/changelog.pl
# This defines how to compile a java class # This defines how to compile a java class
.java.class: .java.class:
$(JAVAC) $< $(JAVAC) $<
...@@ -28,9 +36,18 @@ TOUCH = touch ...@@ -28,9 +36,18 @@ TOUCH = touch
# postgresql to org/postgresql # postgresql to org/postgresql
PGBASE = org/postgresql PGBASE = org/postgresql
# New for 7.1: The jar filename
JARFILE = postgresql.jar
# Yet another attempt to check the version. In theory, any JVM that fails
# this is breaking the versioning specifications released by Javasoft.
#
all: utils/CheckVersion.class
@$(MAKE) `$(JAVA) utils.CheckVersion`
# For 6.5.3 and 7.0+, we need to select the correct JDBC API, so prompt # For 6.5.3 and 7.0+, we need to select the correct JDBC API, so prompt
# for the version. # for the version.
all: huho:
@echo ------------------------------------------------------------ @echo ------------------------------------------------------------
@echo Due to problems with some JVMs that dont return a meaningful @echo Due to problems with some JVMs that dont return a meaningful
@echo version number, we have had to make the choice of what jdbc @echo version number, we have had to make the choice of what jdbc
...@@ -38,15 +55,20 @@ all: ...@@ -38,15 +55,20 @@ all:
@echo @echo
@echo If you are using JDK1.1.x, you will need the JDBC1.2 driver. @echo If you are using JDK1.1.x, you will need the JDBC1.2 driver.
@echo To compile, type: @echo To compile, type:
@echo " make jdbc1 jar" @echo " make jdbc1"
@echo @echo
@echo "If you are using JDK1.2 (aka Java2) you need the JDBC2." @echo "If you are using JDK1.2 (aka Java2) you need the JDBC2."
@echo To compile, type: @echo To compile, type:
@echo " make jdbc2 jar" @echo " make jdbc2"
@echo
@echo "If you are using the Java2 Enterprise Edition, you can use"
@echo "either the standard driver above, or compile the standard"
@echo "extensions version of the driver. Type:"
@echo " make enterprise"
@echo @echo
@echo Once you have done this, a postgresql.jar file will be @echo Once you have done this, a postgresql.jar file will be
@echo produced. This file will only work with that particular @echo produced. This file will only work with that particular
@echo JVM. @echo version of virtual machine.
@echo @echo
@echo ------------------------------------------------------------ @echo ------------------------------------------------------------
...@@ -76,6 +98,10 @@ msg: ...@@ -76,6 +98,10 @@ msg:
@echo @echo
@echo "To make the tests, type:" @echo "To make the tests, type:"
@echo " make tests" @echo " make tests"
@echo
@echo "To build the GUI Shell, type:"
@echo " make retepsql"
@echo
@echo ------------------------------------------------------------ @echo ------------------------------------------------------------
@echo @echo
...@@ -93,7 +119,6 @@ doc: ...@@ -93,7 +119,6 @@ doc:
# the jar file. # the jar file.
OBJ_COMMON= $(PGBASE)/Connection.class \ OBJ_COMMON= $(PGBASE)/Connection.class \
$(PGBASE)/Driver.class \ $(PGBASE)/Driver.class \
$(PGBASE)/DriverClass.class \
$(PGBASE)/Field.class \ $(PGBASE)/Field.class \
$(PGBASE)/PG_Stream.class \ $(PGBASE)/PG_Stream.class \
$(PGBASE)/ResultSet.class \ $(PGBASE)/ResultSet.class \
...@@ -136,53 +161,79 @@ OBJ_JDBC2= $(PGBASE)/jdbc2/ResultSet.class \ ...@@ -136,53 +161,79 @@ OBJ_JDBC2= $(PGBASE)/jdbc2/ResultSet.class \
$(PGBASE)/jdbc2/Statement.class \ $(PGBASE)/jdbc2/Statement.class \
$(PGBASE)/largeobject/PGblob.class $(PGBASE)/largeobject/PGblob.class
# These files are unique to the JDBC2 Enterprise driver
OBJ_ENTER= $(OBJ_JDBC2) \
$(PGBASE)/PostgresqlDataSource.class \
$(PGBASE)/xa/ClientConnection.class \
$(PGBASE)/xa/TwoPhaseConnection.class \
$(PGBASE)/xa/TxConnection.class \
$(PGBASE)/xa/XAConnectionImpl.class \
$(PGBASE)/xa/XADataSourceImpl.class
# This rule builds the JDBC1 compliant driver # This rule builds the JDBC1 compliant driver
jdbc1: jdbc1:
(echo "package org.postgresql;" ;\ $(BUILDDRIVER) $(VERSION) org.postgresql.jdbc1.Connection JDBC1.1 $(PGBASE)/Driver.java
echo "public class DriverClass {" ;\
echo "public static String connectClass=\"org.postgresql.jdbc1.Connection\";" ;\
echo "}" \
) >$(PGBASE)/DriverClass.java
-$(RM) postgresql.jar -$(RM) postgresql.jar
@$(MAKE) jdbc1real @$(MAKE) jdbc1real
# This rule does the real work for JDBC1.2, however do not call it directly. # This rule does the real work for JDBC1.2, however do not call it directly.
# This is because the JDBC driver relies on the org.postgresql.DriverClass # This is because the JDBC driver relies on the org.postgresql.DriverClass
# class to determine the driver version. # class to determine the driver version.
jdbc1real: $(PGBASE)/DriverClass.class \ jdbc1real: $(OBJ_COMMON) $(OBJ_JDBC1) $(JARFILE) msg
$(OBJ_COMMON) $(OBJ_JDBC1) postgresql.jar msg
# This rule builds the JDBC2 compliant driver # This rule builds the JDBC2 compliant driver
jdbc2: jdbc2:
(echo "package org.postgresql;" ;\ @$(MAKE) jdbc2internal msg
echo "public class DriverClass {" ;\
echo "public static String connectClass=\"org.postgresql.jdbc2.Connection\";" ;\ # This allows us to build the jdbc2 driver without displaying the msg
echo "}" \ # refer to the retepsql rule to see why.
) >$(PGBASE)/DriverClass.java jdbc2internal:
$(BUILDDRIVER) $(VERSION) org.postgresql.jdbc2.Connection Java2 $(PGBASE)/Driver.java
-$(RM) postgresql.jar -$(RM) postgresql.jar
@$(MAKE) jdbc2real @$(MAKE) jdbc2real
# This rule does the real work for JDBC2, however do not call it directly. # This rule does the real work for JDBC2, however do not call it directly.
# This is because the JDBC driver relies on the org.postgresql.DriverClass # This is because the JDBC driver relies on the org.postgresql.DriverClass
# class to determine the driver version. # class to determine the driver version.
jdbc2real: $(PGBASE)/DriverClass.class \ jdbc2real: $(OBJ_COMMON) $(OBJ_JDBC2) $(JARFILE)
$(OBJ_COMMON) $(OBJ_JDBC2) postgresql.jar msg
# This rule builds the enterprise edition of the driver
enterprise:
$(BUILDDRIVER) $(VERSION) org.postgresql.jdbc2.Connection Enterprise $(PGBASE)/Driver.java
-$(RM) postgresql.jar
@$(MAKE) enterprisereal
# If you have problems with this rule, replace the $( ) with ` ` as some # This rule does the real work for JDBC2 Enterprise Edition, however do not
# shells (mainly sh under Solaris) doesn't recognise $( ) # call it directly. This is because the JDBC driver relies on the
# org.postgresql.DriverClass class to determine the driver version.
enterprisereal: $(OBJ_COMMON) $(OBJ_ENTER) $(JARFILE)
# We use the old `cmd` notation here as some older shells (mainly sh under
# Solaris) don't recognise the newer $(cmd) syntax.
# #
postgresql.jar: $(OBJ) $(OBJ_COMMON) $(JARFILE): $(OBJ) $(OBJ_COMMON)
$(JAR) -c0f $@ `$(FIND) $(PGBASE) -name "*.class" -print` \ $(JAR) -c0f $@ `$(FIND) $(PGBASE) -name "*.class" -print` \
$(wildcard $(PGBASE)/*.properties) $(wildcard $(PGBASE)/*.properties)
# This rule removes any temporary and compiled files from the source tree. # This rule removes any temporary and compiled files from the source tree.
#
clean: clean:
$(FIND) . -name "*~" -exec $(RM) {} \; $(FIND) . -name "*~" -exec $(RM) {} \;
$(FIND) . -name "*.class" -exec $(RM) {} \; $(FIND) . -name "*.class" -exec $(RM) {} \;
$(FIND) . -name "*.html" -exec $(RM) {} \;
-$(RM) -rf stock example/corba/stock.built -$(RM) -rf stock example/corba/stock.built
-$(RM) postgresql.jar org/postgresql/DriverClass.java -$(RM) postgresql.jar org/postgresql/Driver.java
-$(RM) -rf Package-postgresql *output -$(RM) -rf Package-postgresql *output
-$(RM) retepsql.jar manifest
# New for 7.1
install: $(JARFILE)
$(CP) $(JARFILE) $(libdir)
# This converts CHANGELOG into an html format - used by peter@retep.org.uk
# to produce an online version
changelog: changelog.html
changelog.html: CHANGELOG
$(CHANGELOG) $< >$@
####################################################################### #######################################################################
# This helps make workout what classes are from what source files # This helps make workout what classes are from what source files
...@@ -311,3 +362,60 @@ example/corba/stock.built: example/corba/stock.idl ...@@ -311,3 +362,60 @@ example/corba/stock.built: example/corba/stock.idl
# tip: we cant use $(wildcard stock/*.java) in the above rule as a race # tip: we cant use $(wildcard stock/*.java) in the above rule as a race
# condition occurs, where javac is passed no arguments # condition occurs, where javac is passed no arguments
####################################################################### #######################################################################
#
# JPGSql This isn't really an example, but an entire frontend
# for PostgreSQL via Java & JDBC.
#
# Requirements: Java2 platform (JDK1.2.x or 1.3)
#
retepsql: jdbc2internal postgresql.jar
-$(RM) retepsql.jar
@$(MAKE) retepsql.jar
@echo
@echo "The retepsql application has now been built. To run, simply"
@echo "type:"
@echo
@echo " java -jar retepsql.jar"
@echo
@echo "Note: Some operating systems recognise .jar as an executable,"
@echo " so on those (and Windows is one of them), you can simply"
@echo " double click the jar file to start it."
# All my classes have this prefix
RETEP= uk/org/retep
# These classes form part of my personal swing library. I have placed these
# into the public domain, so there are no license issues... enjoy...
RETEPUTILS= $(RETEP)/swing/SwingApplication.class \
$(RETEP)/swing/SwingApplication.class \
# This is my postgresql frontend. As it's never been released before, I've
# decided not only to publish it under the same licence as the JDBC driver,
# but also to put it along side the driver. To me it makes sense as it's the
# best example I have on showing how to use the driver ;-)
RETEPSQL= $(RETEP)/sql/DBConnection.class \
$(RETEP)/sql/RetepSQL.class \
# Some ancilary files which are included in the jar file
RETEPSQLAUX= $(RETEP)/icons/ \
# The big rule, this builds the jpgsql.jar file which contains the entire
# application. DONT call this rule directly, but use the retepsql one, as
# it ensures that jdbc is also compiled first.
#
# Note: We include the postgresql.jar contents in this as well. Also the
# manifest entry MUST be immediately after $@ (note the -m option to jar).
#
retepsql.jar: $(RETEPUTILS) \
$(RETEPSQL)
(echo "Manifest-Version: 1.0"; \
echo "Created-By: 1.2 (Sun Microsystems Inc.)"; \
echo "Main-Class: uk.org.retep.sql.RetepSQL"; \
) >manifest
$(JAR) -c0fm $@ manifest \
`$(FIND) $(PGBASE) -name "*.class" -print` \
$(wildcard $(PGBASE)/*.properties) \
`$(FIND) $(RETEP) -name "*.class" -print` \
$(RETEPSQLAUX)
#######################################################################
src/interfaces/jdbc/example/psql.java
View file @ f41dcbe4
This diff is collapsed.
src/interfaces/jdbc/example/threadsafe.java
View file @ f41dcbe4
...@@ -145,7 +145,7 @@ public class threadsafe ...@@ -145,7 +145,7 @@ public class threadsafe
// manner. (DateStyles are PostgreSQL's way of handling different methods // manner. (DateStyles are PostgreSQL's way of handling different methods
// of representing dates in the Date data type.) // of representing dates in the Date data type.)
PreparedStatement ps = db.prepareStatement("insert into basic1 values (?,?)"); PreparedStatement ps = db.prepareStatement("insert into basic1 values (?,?)");
for(int i=2;i<200;i++) { for(int i=2;i<2000;i++) {
ps.setInt(1,4); // "column a" = 5 ps.setInt(1,4); // "column a" = 5
ps.setInt(2,i); // "column b" = i ps.setInt(2,i); // "column b" = i
ps.executeUpdate(); // executeUpdate because insert returns no data ps.executeUpdate(); // executeUpdate because insert returns no data
...@@ -212,7 +212,7 @@ public class threadsafe ...@@ -212,7 +212,7 @@ public class threadsafe
// manner. (DateStyles are PostgreSQL's way of handling different methods // manner. (DateStyles are PostgreSQL's way of handling different methods
// of representing dates in the Date data type.) // of representing dates in the Date data type.)
PreparedStatement ps = db.prepareStatement("insert into basic2 values (?,?)"); PreparedStatement ps = db.prepareStatement("insert into basic2 values (?,?)");
for(int i=2;i<200;i++) { for(int i=2;i<2000;i++) {
ps.setInt(1,4); // "column a" = 5 ps.setInt(1,4); // "column a" = 5
ps.setInt(2,i); // "column b" = i ps.setInt(2,i); // "column b" = i
ps.executeUpdate(); // executeUpdate because insert returns no data ps.executeUpdate(); // executeUpdate because insert returns no data
......
src/interfaces/jdbc/org/postgresql/Connection.java
View file @ f41dcbe4
...@@ -10,7 +10,7 @@ import org.postgresql.largeobject.*; ...@@ -10,7 +10,7 @@ import org.postgresql.largeobject.*;
import org.postgresql.util.*; import org.postgresql.util.*;
/** /**
* $Id: Connection.java,v 1.8 2000/10/09 16:48:16 momjian Exp $ * $Id: Connection.java,v 1.9 2000/10/12 08:55:24 peter Exp $
* *
* This abstract class is used by org.postgresql.Driver to open either the JDBC1 or * This abstract class is used by org.postgresql.Driver to open either the JDBC1 or
* JDBC2 versions of the Connection class. * JDBC2 versions of the Connection class.
...@@ -81,6 +81,11 @@ public abstract class Connection ...@@ -81,6 +81,11 @@ public abstract class Connection
// The PID an cancellation key we get from the backend process // The PID an cancellation key we get from the backend process
public int pid; public int pid;
public int ckey; public int ckey;
// This receive_sbuf should be used by the different methods
// that call pg_stream.ReceiveString() in this Connection, so
// so we avoid uneccesary new allocations.
byte receive_sbuf[] = new byte[8192];
/** /**
* This is called by Class.forName() from within org.postgresql.Driver * This is called by Class.forName() from within org.postgresql.Driver
...@@ -165,7 +170,7 @@ public abstract class Connection ...@@ -165,7 +170,7 @@ public abstract class Connection
// "User authentication failed" // "User authentication failed"
// //
throw new SQLException(pg_stream.ReceiveString throw new SQLException(pg_stream.ReceiveString
(4096, getEncoding())); (receive_sbuf, 4096, getEncoding()));
case 'R': case 'R':
// Get the type of request // Get the type of request
...@@ -236,7 +241,7 @@ public abstract class Connection ...@@ -236,7 +241,7 @@ public abstract class Connection
case 'E': case 'E':
case 'N': case 'N':
throw new SQLException(pg_stream.ReceiveString throw new SQLException(pg_stream.ReceiveString
(4096, getEncoding())); (receive_sbuf, 4096, getEncoding()));
default: default:
throw new PSQLException("postgresql.con.setup"); throw new PSQLException("postgresql.con.setup");
} }
...@@ -248,7 +253,7 @@ public abstract class Connection ...@@ -248,7 +253,7 @@ public abstract class Connection
break; break;
case 'E': case 'E':
case 'N': case 'N':
throw new SQLException(pg_stream.ReceiveString(4096)); throw new SQLException(pg_stream.ReceiveString(receive_sbuf, 4096, getEncoding()));
default: default:
throw new PSQLException("postgresql.con.setup"); throw new PSQLException("postgresql.con.setup");
} }
...@@ -322,6 +327,12 @@ public abstract class Connection ...@@ -322,6 +327,12 @@ public abstract class Connection
{ {
// added Oct 7 1998 to give us thread safety. // added Oct 7 1998 to give us thread safety.
synchronized(pg_stream) { synchronized(pg_stream) {
// Deallocate all resources in the stream associated
// with a previous request.
// This will let the driver reuse byte arrays that has already
// been allocated instead of allocating new ones in order
// to gain performance improvements.
pg_stream.deallocate();
Field[] fields = null; Field[] fields = null;
Vector tuples = new Vector(); Vector tuples = new Vector();
...@@ -353,7 +364,7 @@ public abstract class Connection ...@@ -353,7 +364,7 @@ public abstract class Connection
{ {
pg_stream.SendChar('Q'); pg_stream.SendChar('Q');
buf = sql.getBytes(); buf = sql.getBytes();
pg_stream.Send(buf); pg_stream.Send(sql.getBytes());
pg_stream.SendChar(0); pg_stream.SendChar(0);
pg_stream.flush(); pg_stream.flush();
} catch (IOException e) { } catch (IOException e) {
...@@ -370,7 +381,7 @@ public abstract class Connection ...@@ -370,7 +381,7 @@ public abstract class Connection
{ {
case 'A': // Asynchronous Notify case 'A': // Asynchronous Notify
pid = pg_stream.ReceiveInteger(4); pid = pg_stream.ReceiveInteger(4);
msg = pg_stream.ReceiveString(8192); msg = pg_stream.ReceiveString(receive_sbuf,8192,getEncoding());
break; break;
case 'B': // Binary Data Transfer case 'B': // Binary Data Transfer
if (fields == null) if (fields == null)
...@@ -381,7 +392,7 @@ public abstract class Connection ...@@ -381,7 +392,7 @@ public abstract class Connection
tuples.addElement(tup); tuples.addElement(tup);
break; break;
case 'C': // Command Status case 'C': // Command Status
recv_status = pg_stream.ReceiveString(8192); recv_status = pg_stream.ReceiveString(receive_sbuf,8192,getEncoding());
// Now handle the update count correctly. // Now handle the update count correctly.
if(recv_status.startsWith("INSERT") || recv_status.startsWith("UPDATE") || recv_status.startsWith("DELETE")) { if(recv_status.startsWith("INSERT") || recv_status.startsWith("UPDATE") || recv_status.startsWith("DELETE")) {
...@@ -423,7 +434,7 @@ public abstract class Connection ...@@ -423,7 +434,7 @@ public abstract class Connection
tuples.addElement(tup); tuples.addElement(tup);
break; break;
case 'E': // Error Message case 'E': // Error Message
msg = pg_stream.ReceiveString(4096); msg = pg_stream.ReceiveString(receive_sbuf,4096,getEncoding());
final_error = new SQLException(msg); final_error = new SQLException(msg);
hfr = true; hfr = true;
break; break;
...@@ -438,10 +449,10 @@ public abstract class Connection ...@@ -438,10 +449,10 @@ public abstract class Connection
hfr = true; hfr = true;
break; break;
case 'N': // Error Notification case 'N': // Error Notification
addWarning(pg_stream.ReceiveString(4096)); addWarning(pg_stream.ReceiveString(receive_sbuf,4096,getEncoding()));
break; break;
case 'P': // Portal Name case 'P': // Portal Name
String pname = pg_stream.ReceiveString(8192); String pname = pg_stream.ReceiveString(receive_sbuf,8192,getEncoding());
break; break;
case 'T': // MetaData Field Description case 'T': // MetaData Field Description
if (fields != null) if (fields != null)
...@@ -474,7 +485,7 @@ public abstract class Connection ...@@ -474,7 +485,7 @@ public abstract class Connection
for (i = 0 ; i < nf ; ++i) for (i = 0 ; i < nf ; ++i)
{ {
String typname = pg_stream.ReceiveString(8192); String typname = pg_stream.ReceiveString(receive_sbuf,8192,getEncoding());
int typid = pg_stream.ReceiveIntegerR(4); int typid = pg_stream.ReceiveIntegerR(4);
int typlen = pg_stream.ReceiveIntegerR(2); int typlen = pg_stream.ReceiveIntegerR(2);
int typmod = pg_stream.ReceiveIntegerR(4); int typmod = pg_stream.ReceiveIntegerR(4);
......
src/interfaces/jdbc/org/postgresql/Driver.java → src/interfaces/jdbc/org/postgresql/Driver.java.in
View file @ f41dcbe4
...@@ -26,10 +26,6 @@ import org.postgresql.util.PSQLException; ...@@ -26,10 +26,6 @@ import org.postgresql.util.PSQLException;
*/ */
public class Driver implements java.sql.Driver public class Driver implements java.sql.Driver
{ {
// These should be in sync with the backend that the driver was
// distributed with
static final int MAJORVERSION = 7;
static final int MINORVERSION = 0;
static static
{ {
...@@ -117,10 +113,8 @@ public class Driver implements java.sql.Driver ...@@ -117,10 +113,8 @@ public class Driver implements java.sql.Driver
if((props = parseURL(url,info))==null) if((props = parseURL(url,info))==null)
return null; return null;
DriverManager.println("Using "+DriverClass.connectClass);
try { try {
org.postgresql.Connection con = (org.postgresql.Connection)(Class.forName(DriverClass.connectClass).newInstance()); org.postgresql.Connection con = (org.postgresql.Connection)(Class.forName("%JDBCCONNECTCLASS%").newInstance());
con.openConnection (host(), port(), props, database(), url, this); con.openConnection (host(), port(), props, database(), url, this);
return (java.sql.Connection)con; return (java.sql.Connection)con;
} catch(ClassNotFoundException ex) { } catch(ClassNotFoundException ex) {
...@@ -198,7 +192,7 @@ public class Driver implements java.sql.Driver ...@@ -198,7 +192,7 @@ public class Driver implements java.sql.Driver
*/ */
public int getMajorVersion() public int getMajorVersion()
{ {
return MAJORVERSION; return %MAJORVERSION%;
} }
/** /**
...@@ -208,9 +202,17 @@ public class Driver implements java.sql.Driver ...@@ -208,9 +202,17 @@ public class Driver implements java.sql.Driver
*/ */
public int getMinorVersion() public int getMinorVersion()
{ {
return MINORVERSION; return %MINORVERSION%;
} }
/**
* Returns the VERSION variable from Makefile.global
*/
public static String getVersion()
{
return "%VERSION%";
}
/** /**
* Report whether the driver is a genuine JDBC compliant driver. A * Report whether the driver is a genuine JDBC compliant driver. A
* driver may only report "true" here if it passes the JDBC compliance * driver may only report "true" here if it passes the JDBC compliance
......
src/interfaces/jdbc/org/postgresql/PG_Stream.java
View file @ f41dcbe4
...@@ -23,6 +23,9 @@ public class PG_Stream ...@@ -23,6 +23,9 @@ public class PG_Stream
private InputStream pg_input; private InputStream pg_input;
private BufferedOutputStream pg_output; private BufferedOutputStream pg_output;
BytePoolDim1 bytePoolDim1 = new BytePoolDim1();
BytePoolDim2 bytePoolDim2 = new BytePoolDim2();
/** /**
* Constructor: Connect to the PostgreSQL back end and return * Constructor: Connect to the PostgreSQL back end and return
* a stream connection. * a stream connection.
...@@ -70,7 +73,7 @@ public class PG_Stream ...@@ -70,7 +73,7 @@ public class PG_Stream
*/ */
public void SendInteger(int val, int siz) throws IOException public void SendInteger(int val, int siz) throws IOException
{ {
byte[] buf = new byte[siz]; byte[] buf = bytePoolDim1.allocByte(siz);
while (siz-- > 0) while (siz-- > 0)
{ {
...@@ -94,7 +97,7 @@ public class PG_Stream ...@@ -94,7 +97,7 @@ public class PG_Stream
*/ */
public void SendIntegerReverse(int val, int siz) throws IOException public void SendIntegerReverse(int val, int siz) throws IOException
{ {
byte[] buf = new byte[siz]; byte[] buf = bytePoolDim1.allocByte(siz);
int p=0; int p=0;
while (siz-- > 0) while (siz-- > 0)
{ {
...@@ -236,15 +239,27 @@ public class PG_Stream ...@@ -236,15 +239,27 @@ public class PG_Stream
return n; return n;
} }
public String ReceiveString(int maxsize) throws SQLException {
return ReceiveString(maxsize, null);
}
/** /**
* Receives a null-terminated string from the backend. Maximum of * Receives a null-terminated string from the backend. Maximum of
* maxsiz bytes - if we don't see a null, then we assume something * maxsiz bytes - if we don't see a null, then we assume something
* has gone wrong. * has gone wrong.
* *
* @param maxsiz maximum length of string
* @return string from back end
* @exception SQLException if an I/O error occurs
*/
public String ReceiveString(int maxsiz) throws SQLException
{
byte[] rst = bytePoolDim1.allocByte(maxsiz);
return ReceiveString(rst, maxsiz, null);
}
/**
* Receives a null-terminated string from the backend. Maximum of
* maxsiz bytes - if we don't see a null, then we assume something
* has gone wrong.
*
* @param maxsiz maximum length of string
* @param encoding the charset encoding to use. * @param encoding the charset encoding to use.
* @param maxsiz maximum length of string in bytes * @param maxsiz maximum length of string in bytes
* @return string from back end * @return string from back end
...@@ -252,7 +267,25 @@ public class PG_Stream ...@@ -252,7 +267,25 @@ public class PG_Stream
*/ */
public String ReceiveString(int maxsiz, String encoding) throws SQLException public String ReceiveString(int maxsiz, String encoding) throws SQLException
{ {
byte[] rst = new byte[maxsiz]; byte[] rst = bytePoolDim1.allocByte(maxsiz);
return ReceiveString(rst, maxsiz, encoding);
}
/**
* Receives a null-terminated string from the backend. Maximum of
* maxsiz bytes - if we don't see a null, then we assume something
* has gone wrong.
*
* @param rst byte array to read the String into. rst.length must
* equal to or greater than maxsize.
* @param maxsiz maximum length of string in bytes
* @param encoding the charset encoding to use.
* @return string from back end
* @exception SQLException if an I/O error occurs
*/
public String ReceiveString(byte rst[], int maxsiz, String encoding)
throws SQLException
{
int s = 0; int s = 0;
try try
...@@ -262,9 +295,10 @@ public class PG_Stream ...@@ -262,9 +295,10 @@ public class PG_Stream
int c = pg_input.read(); int c = pg_input.read();
if (c < 0) if (c < 0)
throw new PSQLException("postgresql.stream.eof"); throw new PSQLException("postgresql.stream.eof");
else if (c == 0) else if (c == 0) {
break; rst[s] = 0;
else break;
} else
rst[s++] = (byte)c; rst[s++] = (byte)c;
} }
if (s >= maxsiz) if (s >= maxsiz)
...@@ -299,7 +333,7 @@ public class PG_Stream ...@@ -299,7 +333,7 @@ public class PG_Stream
{ {
int i, bim = (nf + 7)/8; int i, bim = (nf + 7)/8;
byte[] bitmask = Receive(bim); byte[] bitmask = Receive(bim);
byte[][] answer = new byte[nf][0]; byte[][] answer = bytePoolDim2.allocByte(nf);
int whichbit = 0x80; int whichbit = 0x80;
int whichbyte = 0; int whichbyte = 0;
...@@ -337,7 +371,7 @@ public class PG_Stream ...@@ -337,7 +371,7 @@ public class PG_Stream
*/ */
private byte[] Receive(int siz) throws SQLException private byte[] Receive(int siz) throws SQLException
{ {
byte[] answer = new byte[siz]; byte[] answer = bytePoolDim1.allocByte(siz);
Receive(answer,0,siz); Receive(answer,0,siz);
return answer; return answer;
} }
...@@ -395,4 +429,152 @@ public class PG_Stream ...@@ -395,4 +429,152 @@ public class PG_Stream
pg_input.close(); pg_input.close();
connection.close(); connection.close();
} }
/**
* Deallocate all resources that has been associated with any previous
* query.
*/
public void deallocate(){
bytePoolDim1.deallocate();
bytePoolDim2.deallocate();
}
}
/**
* A simple and fast object pool implementation that can pool objects
* of any type. This implementation is not thread safe, it is up to the users
* of this class to assure thread safety.
*/
class ObjectPool {
int cursize = 0;
int maxsize = 16;
Object arr[] = new Object[maxsize];
public void add(Object o){
if(cursize >= maxsize){
Object newarr[] = new Object[maxsize*2];
System.arraycopy(arr, 0, newarr, 0, maxsize);
maxsize = maxsize * 2;
arr = newarr;
}
arr[cursize++] = o;
}
public Object remove(){
return arr[--cursize];
}
public boolean isEmpty(){
return cursize == 0;
}
public int size(){
return cursize;
}
public void addAll(ObjectPool pool){
int srcsize = pool.size();
if(srcsize == 0)
return;
int totalsize = srcsize + cursize;
if(totalsize > maxsize){
Object newarr[] = new Object[totalsize*2];
System.arraycopy(arr, 0, newarr, 0, cursize);
maxsize = maxsize = totalsize * 2;
arr = newarr;
}
System.arraycopy(pool.arr, 0, arr, cursize, srcsize);
cursize = totalsize;
}
public void clear(){
cursize = 0;
}
} }
/**
* A simple and efficient class to pool one dimensional byte arrays
* of different sizes.
*/
class BytePoolDim1 {
int maxsize = 256;
ObjectPool notusemap[] = new ObjectPool[maxsize];
ObjectPool inusemap[] = new ObjectPool[maxsize];
byte binit[][] = new byte[maxsize][0];
public BytePoolDim1(){
for(int i = 0; i < maxsize; i++){
binit[i] = new byte[i];
inusemap[i] = new ObjectPool();
notusemap[i] = new ObjectPool();
}
}
public byte[] allocByte(int size){
if(size > maxsize){
return new byte[size];
}
ObjectPool not_usel = notusemap[size];
ObjectPool in_usel = inusemap[size];
byte b[] = null;
if(!not_usel.isEmpty()) {
Object o = not_usel.remove();
b = (byte[]) o;
} else
b = new byte[size];
in_usel.add(b);
return b;
}
public void deallocate(){
for(int i = 0; i < maxsize; i++){
notusemap[i].addAll(inusemap[i]);
inusemap[i].clear();
}
}
}
/**
* A simple and efficient class to pool two dimensional byte arrays
* of different sizes.
*/
class BytePoolDim2 {
int maxsize = 32;
ObjectPool notusemap[] = new ObjectPool[maxsize];
ObjectPool inusemap[] = new ObjectPool[maxsize];
public BytePoolDim2(){
for(int i = 0; i < maxsize; i++){
inusemap[i] = new ObjectPool();
notusemap[i] = new ObjectPool();
}
}
public byte[][] allocByte(int size){
if(size > maxsize){
return new byte[size][0];
}
ObjectPool not_usel = notusemap[size];
ObjectPool in_usel = inusemap[size];
byte b[][] = null;
if(!not_usel.isEmpty()) {
Object o = not_usel.remove();
b = (byte[][]) o;
} else
b = new byte[size][0];
in_usel.add(b);
return b;
}
public void deallocate(){
for(int i = 0; i < maxsize; i++){
notusemap[i].addAll(inusemap[i]);
inusemap[i].clear();
}
}
}
src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java 0 → 100644
View file @ f41dcbe4
This diff is collapsed.
src/interfaces/jdbc/org/postgresql/errors.properties
View file @ f41dcbe4
# This is the default errors # This is the default errors
postgresql.drv.version:An internal error has occured. Please recompile the driver.
postgresql.con.auth:The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client's IP address or Subnet, and that it is using an authentication scheme supported by the driver. postgresql.con.auth:The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client's IP address or Subnet, and that it is using an authentication scheme supported by the driver.
postgresql.con.authfail:An error occured while getting the authentication request. postgresql.con.authfail:An error occured while getting the authentication request.
postgresql.con.call:Callable Statements are not supported at this time. postgresql.con.call:Callable Statements are not supported at this time.
......
src/interfaces/jdbc/org/postgresql/errors_it.properties 0 → 100644
View file @ f41dcbe4
# This is the italian version of some errors. Errors not in this file
# are handled by the parent errors.properties file.
#
# Daniele Arduini <darduini@deis.unibo.it>
# Wed Aug 9 12:18:31 CEST 2000
#
postgresql.con.auth:L'autenticazione di tipo {0} non è supportata. Verificare che nel file di configurazione pg_hba.conf sia presente l'indirizzo IP o la sotto-rete del client, e che lo schema di autenticazione utilizzato sia supportato dal driver.
postgresql.con.authfail:Si è verificato un errore durante la richiesta di autenticazione.
postgresql.con.call:I ``Callable Statements'' non sono supportati al momento.
postgresql.con.creobj:Fallita la creazione dell'oggetto per {0} {1}
postgresql.con.failed:Il tentativo di connessione è fallito perché {0}
#postgresql.con.fathom:Unable to fathom update count {0}
postgresql.con.garbled:Ricevuti dati incomprensibili.
postgresql.con.ioerror:Si è verificato un errore di I/O nella spedizione di dati al backend - {0}
postgresql.con.kerb4:L'autenticazione di tipo ``Kerberos 4'' non è supportata da questo driver.
postgresql.con.kerb5:L'autenticazione di tipo ``Kerberos 5'' non è supportata da questo driver.
postgresql.con.multres:Impossibile gestire gruppi multipli di risultati.
postgresql.con.pass:La proprietà ``password'' è mancante. E` obbligatoria.
postgresql.con.refused:Connessione rifiutata. Controllare che il nome dell'host e la porta siano corretti, e che il server (postmaster) è in esecuzione con l'opzione -i, che abilita le connessioni attraverso la rete TCP/IP.
postgresql.con.setup:Errore di protocollo. Fallita l'impostazione della sessione.
postgresql.con.strobj:L'oggetto potrebbe non essere stato memorizzato. Controllare che ogni tabella richiesta è stata creata nel database.
postgresql.con.strobjex:Fallita la memorizzazione dell'oggetto - {0}
postgresql.con.toolong:L'istruzione SQL è troppo lunga - {0}
postgresql.con.isolevel:Il livello d'isolamento delle transazioni {0} non è supportato.
postgresql.con.tuple:Tupla ricevuta prima del MetaData.
postgresql.con.type:Tipo di risposta sconosciuta {0}
postgresql.con.user:La proprietà ``user'' è mancante. E` obbligatoria.
postgresql.fp.error:La chiamata a FastPath ha restituito {0}
postgresql.fp.expint:Chiamata Fastpath {0} - Nessun risultato restituito mentre ci si aspettava un intero.
postgresql.fp.protocol:Errore nel protocollo FastPath: {0}
postgresql.fp.send:Fallita la spedizione della chiamata fastpath {0} {1}
postgresql.fp.unknown:La funzione fastpath {0} è sconosciuta.
postgresql.geo.box:Fallita la conversione di un ``box'' - {0}
postgresql.geo.circle:Fallita la conversione di un ``circle'' - {0}
postgresql.geo.line:Fallita la conversione di una ``line'' - {0}
postgresql.geo.lseg:Fallita la conversione di un ``lseg'' - {0}
postgresql.geo.path:Impossibile stabilire se il ``path'' è aperto o chiuso.
postgresql.geo.point:Fallita la conversione di un ``point'' - {0}
postgresql.jvm.version:Il file ``postgresql.jar'' non contiene le classi JDBC corrette per questa JVM. Provare a ricompilarle. Se il problema persiste, tentare di forzare la versione fornendola nella linea di comando con l'opzione -Djava.version=1.1 or -Djava.version=1.2\nL'eccezione ricevuta è stata {0}
postgresql.lo.init:Inizializzazione di LargeObject API fallita.
postgresql.money:Fallita la conversione di un ``money'' - {0}.
postgresql.prep.is:InputStream come parametro non è supportato
postgresql.prep.param:Nessun valore specificato come parametro {0}.
postgresql.prep.range:Indice di parametro fuori dall'intervallo.
postgresql.prep.type:Valore di tipo sconosciuto.
postgresql.res.badbigdec:Cattivo BigDecimal {0}
postgresql.res.badbyte:Cattivo Byte {0}
postgresql.res.baddate:Cattivo Date Format a {0} in {1}
postgresql.res.baddouble:Cattivo Double {0}
postgresql.res.badfloat:Cattivo Float {0}
postgresql.res.badint:Cattivo Integer {0}
postgresql.res.badlong:Cattivo Long {0}
postgresql.res.badshort:Cattivo Short {0}
postgresql.res.badtime:Cattivo Time {0}
postgresql.res.badtimestamp:Cattivo Timestamp Format a {0} in {1}
postgresql.res.colname:Colonna denominata {0} non trovata.
postgresql.res.colrange:Indice di colonna fuori dall'intervallo.
postgresql.serial.interface:Impossibile serializzare una interfaccia.
postgresql.serial.namelength:La lunghezza dei nomi per Class & Package non può essere superiore a 32 caratteri. {0} è di {1} caratteri.
postgresql.serial.noclass:Nessuna classe trovata per {0}.
postgresql.serial.table:La tabella per {0} non è nel database. Contattare il DBA, visto che il database è in uno stato incosistente.
postgresql.serial.underscore:Il nome di una classe non può contenere il carattere ``_''. E` stato fornito {0}.
postgresql.stat.batch.empty:La sequenza di operazioni è vuota. Non c'è niente da eseguire.
postgresql.stat.batch.error:L'operazione {0} {1} della sequenza è stata annullata.
postgresql.stat.maxfieldsize:Fallito un tentativo a setMaxFieldSize() - verrà utilizzato il valore predefinito a tempo di compilazione.
postgresql.stat.noresult:Nessun risultato è stato restituito dalla query.
postgresql.stat.result:Un risultato è stato restituito dallo statement, quando ci si aspettava nulla.
postgresql.stream.eof:Il backend ha interrotto la connessione. Probabilmente la tua azione ha causato la sua uscita.
postgresql.stream.flush:Si è verificato un errore di I/O mentre si svuotava il buffer d'uscita - {0}
postgresql.stream.ioerror:Si è verificato un errore di I/O mentre si leggevano dati dal backend - {0}
postgresql.stream.toomuch:Troppi dati ricevuti.
postgresql.unusual:Qualcosa di insolito si è verificato causando il fallimento del driver. Per favore riferire allo sviluppatore questa eccezione: {0}
postgresql.unimplemented:Questo metodo non è stato ancora implementato.
postgresql.unexpected:Un risultato inaspettato è stato ricevuto dalla query.
src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
View file @ f41dcbe4
...@@ -179,7 +179,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -179,7 +179,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public String getDatabaseProductVersion() throws SQLException public String getDatabaseProductVersion() throws SQLException
{ {
return ("7.0.2"); return connection.this_driver.getVersion();
} }
/** /**
...@@ -203,7 +203,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -203,7 +203,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public String getDriverVersion() throws SQLException public String getDriverVersion() throws SQLException
{ {
return Integer.toString(connection.this_driver.getMajorVersion())+"."+Integer.toString(connection.this_driver.getMinorVersion()); return connection.this_driver.getVersion();
} }
/** /**
...@@ -453,14 +453,14 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -453,14 +453,14 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
/** /**
* Is "ALTER TABLE" with a drop column supported? * Is "ALTER TABLE" with a drop column supported?
* Yes for PostgreSQL 6.1 * Peter 10/10/2000 This was set to true, but 7.1devel doesn't support it!
* *
* @return true if so * @return true if so
* @exception SQLException if a database access error occurs * @exception SQLException if a database access error occurs
*/ */
public boolean supportsAlterTableWithDropColumn() throws SQLException public boolean supportsAlterTableWithDropColumn() throws SQLException
{ {
return true; return false;
} }
/** /**
......
src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
View file @ f41dcbe4
...@@ -179,7 +179,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -179,7 +179,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public String getDatabaseProductVersion() throws SQLException public String getDatabaseProductVersion() throws SQLException
{ {
return ("7.0.2"); return connection.this_driver.getVersion();
} }
/** /**
...@@ -203,7 +203,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -203,7 +203,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public String getDriverVersion() throws SQLException public String getDriverVersion() throws SQLException
{ {
return Integer.toString(connection.this_driver.getMajorVersion())+"."+Integer.toString(connection.this_driver.getMinorVersion()); return connection.this_driver.getVersion();
} }
/** /**
...@@ -453,14 +453,14 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -453,14 +453,14 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
/** /**
* Is "ALTER TABLE" with a drop column supported? * Is "ALTER TABLE" with a drop column supported?
* Yes for PostgreSQL 6.1 * Peter 10/10/2000 This was set to true, but 7.1devel doesn't support it!
* *
* @return true if so * @return true if so
* @exception SQLException if a database access error occurs * @exception SQLException if a database access error occurs
*/ */
public boolean supportsAlterTableWithDropColumn() throws SQLException public boolean supportsAlterTableWithDropColumn() throws SQLException
{ {
return true; return false;
} }
/** /**
...@@ -523,7 +523,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData ...@@ -523,7 +523,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
} }
/** /**
* Are expressions in "ORCER BY" lists supported? * Are expressions in "ORDER BY" lists supported?
* *
* <br>e.g. select * from t order by a + b; * <br>e.g. select * from t order by a + b;
* *
......
src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
View file @ f41dcbe4
...@@ -730,6 +730,11 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu ...@@ -730,6 +730,11 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
if (columnIndex < 1 || columnIndex > fields.length) if (columnIndex < 1 || columnIndex > fields.length)
throw new PSQLException("postgresql.res.colrange"); throw new PSQLException("postgresql.res.colrange");
wasNullFlag = (this_row[columnIndex - 1] == null);
if(wasNullFlag)
return null;
field = fields[columnIndex - 1]; field = fields[columnIndex - 1];
// some fields can be null, mainly from those returned by MetaData methods // some fields can be null, mainly from those returned by MetaData methods
......
src/interfaces/jdbc/utils/CheckVersion.java 0 → 100644
View file @ f41dcbe4
package utils;
/**
* This little app checks to see what version of JVM is being used.
* It does this by checking first the java.vm.version property, and
* if that fails, it looks for certain classes that should be present.
*/
public class CheckVersion
{
/**
* Check for the existence of a class by attempting to load it
*/
public static boolean checkClass(String c) {
try {
Class.forName(c);
} catch(Exception e) {
return false;
}
return true;
}
/**
* This first checks java.vm.version for 1.1, 1.2 or 1.3.
*
* It writes jdbc1 to stdout for the 1.1.x VM.
*
* For 1.2 or 1.3, it checks for the existence of the javax.sql.DataSource
* interface, and if found writes enterprise to stdout. If the interface
* is not found, it writes jdbc2 to stdout.
*
* PS: It also looks for the existence of java.lang.Byte which appeared in
* JDK1.1.0 incase java.vm.version is not heeded by some JVM's.
*
* If it can't work it out, it writes huho to stdout.
*
* The make file uses the written results to determine which rule to run.
*
* Bugs: This needs thorough testing.
*/
public static void main(String args[])
{
String vmversion = System.getProperty("java.vm.version");
// We are running a 1.1 JVM
if(vmversion.startsWith("1.1")) {
System.out.println("jdbc1");
System.exit(0);
}
// We are running a 1.2 or 1.3 JVM
if(vmversion.startsWith("1.2") ||
vmversion.startsWith("1.3") ||
checkClass("java.lang.Byte")
) {
// Check to see if we have the standard extensions. If so, then
// we want the enterprise edition, otherwise the jdbc2 driver.
if(checkClass("javax.sql.DataSource"))
System.out.println("enterprise");
else
System.out.println("jdbc2");
System.exit(0);
}
System.out.println("huho");
System.exit(0);
}
}
src/interfaces/jdbc/utils/buildDriver 0 → 100755
View file @ f41dcbe4
#!/bin/sh
#
# $Id: buildDriver,v 1.1 2000/10/12 08:55:28 peter Exp $
#
# This script generates the org/postgresql/Driver.java file from the template
# org/postgresql/Driver.java.in
#
# We do this because we need to include the version number from Makefile.global
# and some other goodies.
#
# This used to be in Makefile, but as it's now done three times, it's better
# to have it as a separate script.
#
# If you have any problems, please let us know ;-)
#
# Syntax: buildDriver version class
#
# Where:
# version The version string from Makefile.global
# class The class implementing java.sql.Connection
# edition The driver edition being built
# source The file to build. We assume that ${source}.in exists
#
VERSION=$1
CLASS=$2
EDITION=$3
SOURCE=$4
#---------------------------------------------------------------------------
# Extract the version. This will work until version x.9 (and assuming we don't
# have 7.10 etc). We only handle 1 digit for MINORVERSION to handle things like
# 7.1devel etc
#
MAJORVERSION=`echo $VERSION | cut -f1 -d'.'`
MINORVERSION=`echo $VERSION | cut -f2 -d'.' | cut -c1`
#---------------------------------------------------------------------------
# Now finally build the driver
sed \
-e "s/%JDBCCONNECTCLASS%/$CLASS/g" \
-e "s/%VERSION%/$VERSION $EDITION/g" \
-e "s/%MAJORVERSION%/$MAJORVERSION/g" \
-e "s/%MINORVERSION%/$MINORVERSION/g" \
<${SOURCE}.in \
>$SOURCE
#---------------------------------------------------------------------------
src/interfaces/jdbc/utils/changelog.pl 0 → 100644
View file @ f41dcbe4
#!/bin/perl
while(<>) {
chomp();
s/\t+/ /g;
if(substr($_,0,3) eq ' - ') {
print "<ul>" if !$inlist;
$inlist=1;
print "<li>".substr($_,3)."\n";
} else {
if($_ eq "" || $_ eq " ") {
print "</ul>" if $inlist;
$inlist=0;
print "<br>\n";
} elsif(substr($_,0,1) eq " ") {
print $_;
} else {
print "</ul>" if $inlist;
$inlist=0;
print "<h4>".$_."</h4>\n";
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment