open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The patch does the following:

Browse Source 
Allows you to set the loglevel at runtime by adding ?loglevel=X to the connection URL, where 1 = INFO and 2 = DEBUG.
  Automatically turns on logging by calling DriverManager.setPrintWriter(new PrintWriter(System.out)) if one is not already set.
Adds a Driver.info() message that prints out the version number
Adds member variables logDebug and logInfo that can be checked before making logging methods calls
Adds a build number to the version number string.  This build number will need to be manually incremented when we see fit.

----------------------------------------------------------------------
Modified Files:
 	org/postgresql/Connection.java org/postgresql/Driver.java.in
 	org/postgresql/fastpath/Fastpath.java
 	org/postgresql/jdbc1/DatabaseMetaData.java
 	org/postgresql/jdbc2/Connection.java
 	org/postgresql/jdbc2/DatabaseMetaData.java
 	org/postgresql/largeobject/LargeObjectManager.java
 	org/postgresql/util/PSQLException.java
 	org/postgresql/util/Serialize.java
----------------------------------------------------------------------
ecpg_big_bison
Barry Lind 24 years ago
parent 8d1c1d40ec
commit b465f5307f
8 changed files with 1378 additions and 1412 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2461
      src/interfaces/jdbc/org/postgresql/Connection.java
  2. 124
      src/interfaces/jdbc/org/postgresql/Driver.java.in
  3. 4
      src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
  4. 5
      src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
  5. 10
      src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
  6. 160
      src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
  7. 3
      src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java
  8. 23
      src/interfaces/jdbc/org/postgresql/util/Serialize.java

2461
src/interfaces/jdbc/org/postgresql/Connection.java
View File

File diff suppressed because it is too large Load Diff

124
src/interfaces/jdbc/org/postgresql/Driver.java.in
Unescape View File

@ -29,13 +29,10 @@ public class Driver implements java.sql.Driver
// make these public so they can be used in setLogLevel below
public static final int DEBUG = 0;
public static final int DEBUG = 2;
public static final int INFO = 1;
public static final int WARN = 2;
public static final int ERROR = 3;
public static final int FATAL = 4;
private static int logLevel = FATAL;
public static boolean logDebug = false;
public static boolean logInfo = false;
static
{
@ -46,7 +43,6 @@ public class Driver implements java.sql.Driver
// my early jdbc work did - and that was based on other examples).
// Placing it here, means that the driver is registered once only.
java.sql.DriverManager.registerDriver(new Driver());
}
catch (SQLException e)
{
@ -106,7 +102,12 @@ public class Driver implements java.sql.Driver
* to/from the database to unicode. If multibyte is enabled on the
* server then the character set of the database is used as the default,
* otherwise the jvm character encoding is used as the default.
* compatible - This is used to toggle
* loglevel - (optional) Enable logging of messages from the driver.
* The value is an integer from 1 to 2 where:
* INFO = 1, DEBUG = 2
* The output is sent to DriverManager.getPrintWriter() if set,
* otherwise it is sent to System.out.
* compatible - (optional) This is used to toggle
* between different functionality as it changes across different releases
* of the jdbc driver code. The values here are versions of the jdbc
* client and not server versions. For example in 7.1 get/setBytes
@ -140,12 +141,12 @@ public class Driver implements java.sql.Driver
{
if ((props = parseURL(url, info)) == null)
{
Driver.debug("Error in url" + url);
if (Driver.logDebug) Driver.debug("Error in url" + url);
return null;
}
try
{
Driver.debug("connect " + url);
if (Driver.logDebug) Driver.debug("connect " + url);
org.postgresql.Connection con = (org.postgresql.Connection)(Class.forName("@JDBCCONNECTCLASS@").newInstance());
con.openConnection (host(), port(), props, database(), url, this);
@ -153,7 +154,7 @@ public class Driver implements java.sql.Driver
}
catch (ClassNotFoundException ex)
{
Driver.debug("error", ex);
if (Driver.logDebug) Driver.debug("error", ex);
throw new PSQLException("postgresql.jvm.version", ex);
}
catch (PSQLException ex1)
@ -164,7 +165,7 @@ public class Driver implements java.sql.Driver
}
catch (Exception ex2)
{
Driver.debug("error", ex2);
if (Driver.logDebug) Driver.debug("error", ex2);
throw new PSQLException("postgresql.unusual", ex2);
}
}
@ -251,7 +252,7 @@ public class Driver implements java.sql.Driver
*/
public static String getVersion()
{
return "@VERSION@";
return "@VERSION@ jdbc driver build " + m_buildNumber;
}
/*
@ -293,12 +294,6 @@ public class Driver implements java.sql.Driver
{
String token = st.nextToken();
// PM June 29 1997
// Added this, to help me understand how this works.
// Unless you want each token to be processed, leave this commented out
// but don't delete it.
//DriverManager.println("wellFormedURL: state="+state+" count="+count+" token='"+token+"'");
// PM Aug 2 1997 - Modified to allow multiple backends
if (count <= 3)
{
@ -379,7 +374,6 @@ public class Driver implements java.sql.Driver
else if (state == -5)
{
value = token;
//DriverManager.println("put("+key+","+value+")");
urlProps.put(key, value);
state = -2;
}
@ -387,13 +381,6 @@ public class Driver implements java.sql.Driver
}
}
// PM June 29 1997
// This now outputs the properties only if we are logging
// PM Sep 13 1999 Commented out, as it throws a Deprecation warning
// when compiled under JDK1.2.
//if (DriverManager.getLogStream() != null)
// urlProps.list(DriverManager.getLogStream());
return urlProps;
}
@ -446,12 +433,13 @@ public class Driver implements java.sql.Driver
* used to turn logging on to a certain level, can be called
* by specifying fully qualified class ie org.postgresql.Driver.setLogLevel()
* @param int logLevel sets the level which logging will respond to
* FATAL being almost no messages
* INFO being almost no messages
* DEBUG most verbose
*/
public static void setLogLevel(int logLevel)
{
Driver.logLevel = logLevel;
logDebug = (logLevel >= DEBUG) ? true : false;
logInfo = (logLevel >= INFO) ? true : false;
}
/*
* logging message at the debug level
@ -459,7 +447,7 @@ public class Driver implements java.sql.Driver
*/
public static void debug(String msg)
{
if (logLevel <= DEBUG)
if (logDebug)
{
DriverManager.println(msg);
}
@ -470,7 +458,7 @@ public class Driver implements java.sql.Driver
*/
public static void debug(String msg, Exception ex)
{
if (logLevel <= DEBUG)
if (logDebug)
{
DriverManager.println(msg + ex != null ? ex.getMessage() : "null Exception");
}
@ -481,7 +469,7 @@ public class Driver implements java.sql.Driver
*/
public static void info(String msg)
{
if (logLevel <= INFO)
if (logInfo)
{
DriverManager.println(msg);
}
@ -492,75 +480,13 @@ public class Driver implements java.sql.Driver
*/
public static void info(String msg, Exception ex)
{
if (logLevel <= INFO)
{
DriverManager.println(msg + ex != null ? ex.getMessage() : "null Exception");
}
}
/*
* logging message at warn level
* messages will be printed if the logging level is less or equal to WARN
*/
public static void warn(String msg)
{
if (logLevel <= WARN)
{
DriverManager.println(msg);
}
}
/*
* logging message at warn level
* messages will be printed if the logging level is less or equal to WARN
*/
public static void warn(String msg, Exception ex)
{
if (logLevel <= WARN)
{
DriverManager.println(msg + ex != null ? ex.getMessage() : "null Exception");
}
}
/*
* logging message at error level
* messages will be printed if the logging level is less or equal to ERROR
*/
public static void error(String msg)
{
if (logLevel <= ERROR)
{
DriverManager.println(msg);
}
}
/*
* logging message at error level
* messages will be printed if the logging level is less or equal to ERROR
*/
public static void error(String msg, Exception ex)
{
if (logLevel <= ERROR)
{
DriverManager.println(msg + ex != null ? ex.getMessage() : "null Exception");
}
}
/*
* logging message at fatal level
* messages will be printed if the logging level is less or equal to FATAL
*/
public static void fatal(String msg)
{
if (logLevel <= FATAL)
{
DriverManager.println(msg);
}
}
/*
* logging message at fatal level
* messages will be printed if the logging level is less or equal to FATAL
*/
public static void fatal(String msg, Exception ex)
{
if (logLevel <= FATAL)
if (logInfo)
{
DriverManager.println(msg + ex != null ? ex.getMessage() : "null Exception");
}
}
//The build number should be incremented for every new build
private static int m_buildNumber = 100;
}

4
src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
Unescape View File

@ -1,5 +1,6 @@
package org.postgresql.fastpath;
import org.postgresql.Driver;
import java.io.*;
import java.lang.*;
import java.net.*;
@ -44,7 +45,6 @@ public class Fastpath
{
this.conn = conn;
this.stream = stream;
//DriverManager.println("Fastpath initialised");
}
/*
@ -174,7 +174,7 @@ public class Fastpath
*/
public Object fastpath(String name, boolean resulttype, FastpathArg[] args) throws SQLException
{
//DriverManager.println("Fastpath: calling "+name);
if (Driver.logDebug) Driver.debug("Fastpath: calling "+name);
return fastpath(getID(name), resulttype, args);
}

5
src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
Unescape View File

@ -13,7 +13,7 @@ import org.postgresql.util.PSQLException;
/*
* This class provides information about the database as a whole.
*
* $Id: DatabaseMetaData.java,v 1.45 2002/06/06 14:47:52 davec Exp $
* $Id: DatabaseMetaData.java,v 1.46 2002/06/11 02:55:16 barry Exp $
*
* <p>Many of the methods here return lists of information in ResultSets. You
* can use the normal ResultSet methods such as getString and getInt to
@ -1731,7 +1731,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
String relKind;
switch (r.getBytes(3)[0])
{
case (byte) 'r':
case (byte) 'r':
if ( r.getString(1).startsWith("pg_") )
{
relKind = "SYSTEM TABLE";
@ -2108,7 +2108,6 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
{
byte[][] tuple = new byte[8][0];
tuple[0] = tuple[1] = "".getBytes();
DriverManager.println("relname=\"" + r.getString(1) + "\" relacl=\"" + r.getString(2) + "\"");
// For now, don't add to the result as relacl needs to be processed.
//v.addElement(tuple);

10
src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
Unescape View File

@ -17,7 +17,7 @@ import org.postgresql.largeobject.*;
import org.postgresql.util.*;
/*
* $Id: Connection.java,v 1.18 2002/03/26 05:52:50 barry Exp $
* $Id: Connection.java,v 1.19 2002/06/11 02:55:16 barry Exp $
*
* A Connection represents a session with a specific database. Within the
* context of a Connection, SQL statements are executed and results are
@ -318,6 +318,14 @@ public class Connection extends org.postgresql.Connection implements java.sql.Co
Types.ARRAY
};
//Because the get/setLogStream methods are deprecated in JDBC2
//we use the get/setLogWriter methods here for JDBC2 by overriding
//the base version of this method
protected void enableDriverManagerLogging() {
if (DriverManager.getLogWriter() == null) {
DriverManager.setLogWriter(new PrintWriter(System.out));
}
}
}

160
src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
Unescape View File

@ -15,7 +15,7 @@ import org.postgresql.util.PSQLException;
/*
* This class provides information about the database as a whole.
*
* $Id: DatabaseMetaData.java,v 1.54 2002/06/06 14:47:52 davec Exp $
* $Id: DatabaseMetaData.java,v 1.55 2002/06/11 02:55:16 barry Exp $
*
* <p>Many of the methods here return lists of information in ResultSets. You
* can use the normal ResultSet methods such as getString and getInt to
@ -62,7 +62,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean allProceduresAreCallable() throws SQLException
{
Driver.debug("allProceduresAreCallable");
if (Driver.logDebug) Driver.debug("allProceduresAreCallable");
return true; // For now...
}
@ -75,7 +75,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean allTablesAreSelectable() throws SQLException
{
Driver.debug("allTablesAreSelectable");
if (Driver.logDebug) Driver.debug("allTablesAreSelectable");
return true; // For now...
}
@ -88,7 +88,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public String getURL() throws SQLException
{
String url = connection.getURL();
Driver.debug("getURL " + url);
if (Driver.logDebug) Driver.debug("getURL " + url);
return url;
}
@ -101,7 +101,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public String getUserName() throws SQLException
{
String userName = connection.getUserName();
Driver.debug("getUserName " + userName);
if (Driver.logDebug) Driver.debug("getUserName " + userName);
return userName;
}
@ -114,7 +114,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean isReadOnly() throws SQLException
{
boolean isReadOnly = connection.isReadOnly();
Driver.debug("isReadOnly " + isReadOnly);
if (Driver.logDebug) Driver.debug("isReadOnly " + isReadOnly);
return isReadOnly;
}
@ -127,7 +127,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean nullsAreSortedHigh() throws SQLException
{
boolean nullSortedHigh = connection.haveMinimumServerVersion("7.2");
Driver.debug("nullsAreSortedHigh " + nullSortedHigh);
if (Driver.logDebug) Driver.debug("nullsAreSortedHigh " + nullSortedHigh);
return nullSortedHigh;
}
@ -139,7 +139,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean nullsAreSortedLow() throws SQLException
{
Driver.debug("nullsAreSortedLow false");
if (Driver.logDebug) Driver.debug("nullsAreSortedLow false");
return false;
}
@ -151,7 +151,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean nullsAreSortedAtStart() throws SQLException
{
Driver.debug("nullsAreSortedAtStart false");
if (Driver.logDebug) Driver.debug("nullsAreSortedAtStart false");
return false;
}
@ -164,7 +164,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean nullsAreSortedAtEnd() throws SQLException
{
boolean nullsAreSortedAtEnd = ! connection.haveMinimumServerVersion("7.2");
Driver.debug("nullsAreSortedAtEnd " + nullsAreSortedAtEnd);
if (Driver.logDebug) Driver.debug("nullsAreSortedAtEnd " + nullsAreSortedAtEnd);
return nullsAreSortedAtEnd;
}
@ -177,7 +177,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public String getDatabaseProductName() throws SQLException
{
Driver.debug("getDatabaseProductName PostgresSQL");
if (Driver.logDebug) Driver.debug("getDatabaseProductName PostgresSQL");
return "PostgreSQL";
}
@ -190,7 +190,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public String getDatabaseProductVersion() throws SQLException
{
String versionNumber = connection.getDBVersionNumber();
Driver.debug("getDatabaseProductVersion " + versionNumber);
if (Driver.logDebug) Driver.debug("getDatabaseProductVersion " + versionNumber);
return versionNumber;
}
@ -204,7 +204,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public String getDriverName() throws SQLException
{
String driverName = "PostgreSQL Native Driver";
Driver.debug("getDriverName" + driverName);
if (Driver.logDebug) Driver.debug("getDriverName" + driverName);
return driverName;
}
@ -218,7 +218,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public String getDriverVersion() throws SQLException
{
String driverVersion = connection.this_driver.getVersion();
Driver.debug("getDriverVersion " + driverVersion);
if (Driver.logDebug) Driver.debug("getDriverVersion " + driverVersion);
return driverVersion;
}
@ -230,7 +230,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public int getDriverMajorVersion()
{
int majorVersion = connection.this_driver.getMajorVersion();
Driver.debug("getMajorVersion " + majorVersion);
if (Driver.logDebug) Driver.debug("getMajorVersion " + majorVersion);
return majorVersion;
}
@ -242,7 +242,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public int getDriverMinorVersion()
{
int minorVersion = connection.this_driver.getMinorVersion();
Driver.debug("getMinorVersion " + minorVersion);
if (Driver.logDebug) Driver.debug("getMinorVersion " + minorVersion);
return minorVersion;
}
@ -255,7 +255,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean usesLocalFiles() throws SQLException
{
Driver.debug("usesLocalFiles " + false);
if (Driver.logDebug) Driver.debug("usesLocalFiles " + false);
return false;
}
@ -268,7 +268,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean usesLocalFilePerTable() throws SQLException
{
Driver.debug("usesLocalFilePerTable " + false);
if (Driver.logDebug) Driver.debug("usesLocalFilePerTable " + false);
return false;
}
@ -286,7 +286,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsMixedCaseIdentifiers() throws SQLException
{
Driver.debug("supportsMixedCaseIdentifiers " + false);
if (Driver.logDebug) Driver.debug("supportsMixedCaseIdentifiers " + false);
return false;
}
@ -298,7 +298,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean storesUpperCaseIdentifiers() throws SQLException
{
Driver.debug("storesUpperCaseIdentifiers " + false);
if (Driver.logDebug) Driver.debug("storesUpperCaseIdentifiers " + false);
return false;
}
@ -310,7 +310,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean storesLowerCaseIdentifiers() throws SQLException
{
Driver.debug("storesLowerCaseIdentifiers " + true);
if (Driver.logDebug) Driver.debug("storesLowerCaseIdentifiers " + true);
return true;
}
@ -322,7 +322,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean storesMixedCaseIdentifiers() throws SQLException
{
Driver.debug("storesMixedCaseIdentifiers " + false);
if (Driver.logDebug) Driver.debug("storesMixedCaseIdentifiers " + false);
return false;
}
@ -336,7 +336,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException
{
Driver.debug("supportsMixedCaseQuotedIdentifiers " + true);
if (Driver.logDebug) Driver.debug("supportsMixedCaseQuotedIdentifiers " + true);
return true;
}
@ -348,7 +348,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean storesUpperCaseQuotedIdentifiers() throws SQLException
{
Driver.debug("storesUpperCaseQuotedIdentifiers " + false);
if (Driver.logDebug) Driver.debug("storesUpperCaseQuotedIdentifiers " + false);
return false;
}
@ -360,7 +360,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean storesLowerCaseQuotedIdentifiers() throws SQLException
{
Driver.debug("storesLowerCaseQuotedIdentifiers " + false);
if (Driver.logDebug) Driver.debug("storesLowerCaseQuotedIdentifiers " + false);
return false;
}
@ -372,7 +372,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean storesMixedCaseQuotedIdentifiers() throws SQLException
{
Driver.debug("storesMixedCaseQuotedIdentifiers " + false);
if (Driver.logDebug) Driver.debug("storesMixedCaseQuotedIdentifiers " + false);
return false;
}
@ -386,7 +386,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public String getIdentifierQuoteString() throws SQLException
{
Driver.debug("getIdentifierQuoteString \"" );
if (Driver.logDebug) Driver.debug("getIdentifierQuoteString \"" );
return "\"";
}
@ -408,35 +408,35 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public String getSQLKeywords() throws SQLException
{
Driver.debug("getSQLKeyWords");
if (Driver.logDebug) Driver.debug("getSQLKeyWords");
return "abort,acl,add,aggregate,append,archive,arch_store,backward,binary,change,cluster,copy,database,delimiters,do,extend,explain,forward,heavy,index,inherits,isnull,light,listen,load,merge,nothing,notify,notnull,oids,purge,rename,replace,retrieve,returns,rule,recipe,setof,stdin,stdout,store,vacuum,verbose,version";
}
public String getNumericFunctions() throws SQLException
{
// XXX-Not Implemented
Driver.debug("getNumericFunctions");
if (Driver.logDebug) Driver.debug("getNumericFunctions");
return "";
}
public String getStringFunctions() throws SQLException
{
// XXX-Not Implemented
Driver.debug("getStringFunctions");
if (Driver.logDebug) Driver.debug("getStringFunctions");
return "";
}
public String getSystemFunctions() throws SQLException
{
// XXX-Not Implemented
Driver.debug("getSystemFunctions");
if (Driver.logDebug) Driver.debug("getSystemFunctions");
return "";
}
public String getTimeDateFunctions() throws SQLException
{
// XXX-Not Implemented
Driver.debug("getTimeDateFunctions");
if (Driver.logDebug) Driver.debug("getTimeDateFunctions");
return "";
}
@ -449,7 +449,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public String getSearchStringEscape() throws SQLException
{
Driver.debug("getSearchStringEscape");
if (Driver.logDebug) Driver.debug("getSearchStringEscape");
return "\\";
}
@ -466,7 +466,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public String getExtraNameCharacters() throws SQLException
{
Driver.debug("getExtraNameCharacters");
if (Driver.logDebug) Driver.debug("getExtraNameCharacters");
return "";
}
@ -479,7 +479,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsAlterTableWithAddColumn() throws SQLException
{
Driver.debug("supportsAlterTableWithAddColumn " + true);
if (Driver.logDebug) Driver.debug("supportsAlterTableWithAddColumn " + true);
return true;
}
@ -492,7 +492,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsAlterTableWithDropColumn() throws SQLException
{
Driver.debug("supportsAlterTableWithDropColumn " + false);
if (Driver.logDebug) Driver.debug("supportsAlterTableWithDropColumn " + false);
return false;
}
@ -516,7 +516,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsColumnAliasing() throws SQLException
{
Driver.debug("supportsColumnAliasing " + true);
if (Driver.logDebug) Driver.debug("supportsColumnAliasing " + true);
return true;
}
@ -529,21 +529,21 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean nullPlusNonNullIsNull() throws SQLException
{
Driver.debug("nullPlusNonNullIsNull " + true);
if (Driver.logDebug) Driver.debug("nullPlusNonNullIsNull " + true);
return true;
}
public boolean supportsConvert() throws SQLException
{
// XXX-Not Implemented
Driver.debug("supportsConvert " + false);
if (Driver.logDebug) Driver.debug("supportsConvert " + false);
return false;
}
public boolean supportsConvert(int fromType, int toType) throws SQLException
{
// XXX-Not Implemented
Driver.debug("supportsConvert " + false);
if (Driver.logDebug) Driver.debug("supportsConvert " + false);
return false;
}
@ -556,7 +556,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsTableCorrelationNames() throws SQLException
{
Driver.debug("supportsTableCorrelationNames " + true);
if (Driver.logDebug) Driver.debug("supportsTableCorrelationNames " + true);
return true;
}
@ -569,7 +569,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsDifferentTableCorrelationNames() throws SQLException
{
Driver.debug("supportsDifferentTableCorrelationNames " + false);
if (Driver.logDebug) Driver.debug("supportsDifferentTableCorrelationNames " + false);
return false;
}
@ -583,7 +583,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsExpressionsInOrderBy() throws SQLException
{
Driver.debug("supportsExpressionsInOrderBy " + true);
if (Driver.logDebug) Driver.debug("supportsExpressionsInOrderBy " + true);
return true;
}
@ -596,7 +596,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean supportsOrderByUnrelated() throws SQLException
{
boolean supportsOrderByUnrelated = connection.haveMinimumServerVersion("6.4");
Driver.debug("supportsOrderByUnrelated " + supportsOrderByUnrelated);
if (Driver.logDebug) Driver.debug("supportsOrderByUnrelated " + supportsOrderByUnrelated);
return supportsOrderByUnrelated;
}
@ -609,7 +609,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsGroupBy() throws SQLException
{
Driver.debug("supportsGroupBy " + true);
if (Driver.logDebug) Driver.debug("supportsGroupBy " + true);
return true;
}
@ -622,7 +622,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean supportsGroupByUnrelated() throws SQLException
{
boolean supportsGroupByUnrelated = connection.haveMinimumServerVersion("6.4");
Driver.debug("supportsGroupByUnrelated " + supportsGroupByUnrelated);
if (Driver.logDebug) Driver.debug("supportsGroupByUnrelated " + supportsGroupByUnrelated);
return supportsGroupByUnrelated;
}
@ -639,7 +639,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean supportsGroupByBeyondSelect() throws SQLException
{
boolean supportsGroupByBeyondSelect = connection.haveMinimumServerVersion("6.4");
Driver.debug("supportsGroupByUnrelated " + supportsGroupByBeyondSelect);
if (Driver.logDebug) Driver.debug("supportsGroupByUnrelated " + supportsGroupByBeyondSelect);
return supportsGroupByBeyondSelect;
}
@ -653,7 +653,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean supportsLikeEscapeClause() throws SQLException
{
boolean supportsLikeEscapeClause = connection.haveMinimumServerVersion("7.1");
Driver.debug("supportsLikeEscapeClause " + supportsLikeEscapeClause);
if (Driver.logDebug) Driver.debug("supportsLikeEscapeClause " + supportsLikeEscapeClause);
return supportsLikeEscapeClause;
}
@ -667,7 +667,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsMultipleResultSets() throws SQLException
{
Driver.debug("supportsMultipleResultSets " + false);
if (Driver.logDebug) Driver.debug("supportsMultipleResultSets " + false);
return false;
}
@ -681,7 +681,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsMultipleTransactions() throws SQLException
{
Driver.debug("supportsMultipleTransactions " + true);
if (Driver.logDebug) Driver.debug("supportsMultipleTransactions " + true);
return true;
}
@ -697,7 +697,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsNonNullableColumns() throws SQLException
{
Driver.debug("supportsNonNullableColumns true");
if (Driver.logDebug) Driver.debug("supportsNonNullableColumns true");
return true;
}
@ -715,7 +715,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsMinimumSQLGrammar() throws SQLException
{
Driver.debug("supportsMinimumSQLGrammar TRUE");
if (Driver.logDebug) Driver.debug("supportsMinimumSQLGrammar TRUE");
return true;
}
@ -728,7 +728,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsCoreSQLGrammar() throws SQLException
{
Driver.debug("supportsCoreSQLGrammar FALSE ");
if (Driver.logDebug) Driver.debug("supportsCoreSQLGrammar FALSE ");
return false;
}
@ -742,7 +742,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsExtendedSQLGrammar() throws SQLException
{
Driver.debug("supportsExtendedSQLGrammar FALSE");
if (Driver.logDebug) Driver.debug("supportsExtendedSQLGrammar FALSE");
return false;
}
@ -761,7 +761,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean supportsANSI92EntryLevelSQL() throws SQLException
{
boolean schemas = connection.haveMinimumServerVersion("7.3");
Driver.debug("supportsANSI92EntryLevelSQL " + schemas);
if (Driver.logDebug) Driver.debug("supportsANSI92EntryLevelSQL " + schemas);
return schemas;
}
@ -775,7 +775,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsANSI92IntermediateSQL() throws SQLException
{
Driver.debug("supportsANSI92IntermediateSQL false ");
if (Driver.logDebug) Driver.debug("supportsANSI92IntermediateSQL false ");
return false;
}
@ -787,7 +787,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsANSI92FullSQL() throws SQLException
{
Driver.debug("supportsANSI92FullSQL false ");
if (Driver.logDebug) Driver.debug("supportsANSI92FullSQL false ");
return false;
}
@ -800,7 +800,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsIntegrityEnhancementFacility() throws SQLException
{
Driver.debug("supportsIntegrityEnhancementFacility false ");
if (Driver.logDebug) Driver.debug("supportsIntegrityEnhancementFacility false ");
return false;
}
@ -813,7 +813,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean supportsOuterJoins() throws SQLException
{
boolean supportsOuterJoins = connection.haveMinimumServerVersion("7.1");
Driver.debug("supportsOuterJoins " + supportsOuterJoins);
if (Driver.logDebug) Driver.debug("supportsOuterJoins " + supportsOuterJoins);
return supportsOuterJoins;
}
@ -826,7 +826,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean supportsFullOuterJoins() throws SQLException
{
boolean supportsFullOuterJoins = connection.haveMinimumServerVersion("7.1");
Driver.debug("supportsFullOuterJoins " + supportsFullOuterJoins);
if (Driver.logDebug) Driver.debug("supportsFullOuterJoins " + supportsFullOuterJoins);
return supportsFullOuterJoins;
}
@ -839,7 +839,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
public boolean supportsLimitedOuterJoins() throws SQLException
{
boolean supportsLimitedOuterJoins = connection.haveMinimumServerVersion("7.1");
Driver.debug("supportsFullOuterJoins " + supportsLimitedOuterJoins);
if (Driver.logDebug) Driver.debug("supportsFullOuterJoins " + supportsLimitedOuterJoins);
return supportsLimitedOuterJoins;
}
@ -853,7 +853,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public String getSchemaTerm() throws SQLException
{
Driver.debug("getSchemaTerm schema");
if (Driver.logDebug) Driver.debug("getSchemaTerm schema");
return "schema";
}
@ -866,7 +866,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public String getProcedureTerm() throws SQLException
{
Driver.debug("getProcedureTerm function ");
if (Driver.logDebug) Driver.debug("getProcedureTerm function ");
return "function";
}
@ -878,7 +878,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public String getCatalogTerm() throws SQLException
{
Driver.debug("getCatalogTerm database ");
if (Driver.logDebug) Driver.debug("getCatalogTerm database ");
return "database";
}
@ -893,7 +893,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
{
// return true here; we return false for every other catalog function
// so it won't matter what we return here D.C.
Driver.debug("isCatalogAtStart not implemented");
if (Driver.logDebug) Driver.debug("isCatalogAtStart not implemented");
return true;
}
@ -907,7 +907,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
{
// Give them something to work with here
// everything else returns false so it won't matter what we return here D.C.
Driver.debug("getCatalogSeparator not implemented ");
if (Driver.logDebug) Driver.debug("getCatalogSeparator not implemented ");
return ".";
}
@ -919,7 +919,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsSchemasInDataManipulation() throws SQLException
{
Driver.debug("supportsSchemasInDataManipulation false");
if (Driver.logDebug) Driver.debug("supportsSchemasInDataManipulation false");
return false;
}
@ -931,7 +931,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsSchemasInProcedureCalls() throws SQLException
{
Driver.debug("supportsSchemasInProcedureCalls false");
if (Driver.logDebug) Driver.debug("supportsSchemasInProcedureCalls false");
return false;
}
@ -945,7 +945,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
{
boolean schemas = connection.haveMinimumServerVersion("7.3");
Driver.debug("supportsSchemasInTableDefinitions " + schemas);
if (Driver.logDebug) Driver.debug("supportsSchemasInTableDefinitions " + schemas);
return schemas;
}
@ -957,7 +957,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsSchemasInIndexDefinitions() throws SQLException
{
Driver.debug("supportsSchemasInIndexDefinitions false");
if (Driver.logDebug) Driver.debug("supportsSchemasInIndexDefinitions false");
return false;
}
@ -969,7 +969,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException
{
Driver.debug("supportsSchemasInPrivilegeDefinitions false");
if (Driver.logDebug) Driver.debug("supportsSchemasInPrivilegeDefinitions false");
return false;
}
@ -981,7 +981,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsCatalogsInDataManipulation() throws SQLException
{
Driver.debug("supportsCatalogsInDataManipulation false");
if (Driver.logDebug) Driver.debug("supportsCatalogsInDataManipulation false");
return false;
}
@ -993,7 +993,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsCatalogsInProcedureCalls() throws SQLException
{
Driver.debug("supportsCatalogsInDataManipulation false");
if (Driver.logDebug) Driver.debug("supportsCatalogsInDataManipulation false");
return false;
}
@ -1005,7 +1005,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsCatalogsInTableDefinitions() throws SQLException
{
Driver.debug("supportsCatalogsInTableDefinitions false");
if (Driver.logDebug) Driver.debug("supportsCatalogsInTableDefinitions false");
return false;
}
@ -1017,7 +1017,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsCatalogsInIndexDefinitions() throws SQLException
{
Driver.debug("supportsCatalogsInIndexDefinitions false");
if (Driver.logDebug) Driver.debug("supportsCatalogsInIndexDefinitions false");
return false;
}
@ -1029,7 +1029,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException
{
Driver.debug("supportsCatalogsInPrivilegeDefinitions false");
if (Driver.logDebug) Driver.debug("supportsCatalogsInPrivilegeDefinitions false");
return false;
}
@ -1042,7 +1042,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsPositionedDelete() throws SQLException
{
Driver.debug("supportsPositionedDelete false");
if (Driver.logDebug) Driver.debug("supportsPositionedDelete false");
return false; // For now...
}
@ -1054,7 +1054,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/
public boolean supportsPositionedUpdate() throws SQLException
{
Driver.debug("supportsPositionedUpdate false");
if (Driver.logDebug) Driver.debug("supportsPositionedUpdate false");
return false; // For now...
}
@ -2212,7 +2212,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
{
byte[][] tuple = new byte[8][0];
tuple[0] = tuple[1] = "".getBytes();
DriverManager.println("relname=\"" + r.getString(1) + "\" relacl=\"" + r.getString(2) + "\"");
if (Driver.logDebug) Driver.debug("relname=\"" + r.getString(1) + "\" relacl=\"" + r.getString(2) + "\"");
// For now, don't add to the result as relacl needs to be processed.
//v.addElement(tuple);
@ -2275,7 +2275,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
{
byte[][] tuple = new byte[8][0];
tuple[0] = tuple[1] = "".getBytes();
DriverManager.println("relname=\"" + r.getString(1) + "\" relacl=\"" + r.getString(2) + "\"");
if (Driver.logDebug) Driver.debug("relname=\"" + r.getString(1) + "\" relacl=\"" + r.getString(2) + "\"");
// For now, don't add to the result as relacl needs to be processed.
//v.addElement(tuple);

3
src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java
Unescape View File

@ -1,5 +1,6 @@
package org.postgresql.largeobject;
import org.postgresql.Driver;
import java.io.*;
import java.lang.*;
import java.net.*;
@ -117,7 +118,7 @@ public class LargeObjectManager
fp.addFunctions(res);
res.close();
DriverManager.println("Large Object initialised");
if (Driver.logDebug) Driver.debug("Large Object initialised");
}
/*

23
src/interfaces/jdbc/org/postgresql/util/Serialize.java
Unescape View File

@ -1,5 +1,6 @@
package org.postgresql.util;
import org.postgresql.Driver;
import java.io.*;
import java.lang.*;
import java.lang.reflect.*;
@ -128,14 +129,14 @@ public class Serialize
try
{
conn = c;
DriverManager.println("Serialize: initializing instance for type: " + type);
if (Driver.logDebug) Driver.debug("Serialize: initializing instance for type: " + type);
tableName = toPostgreSQL(type);
className = type;
ourClass = Class.forName(className);
}
catch (ClassNotFoundException cnfe)
{
DriverManager.println("Serialize: " + className + " java class not found");
if (Driver.logDebug) Driver.debug("Serialize: " + className + " java class not found");
throw new PSQLException("postgresql.serial.noclass", type);
}
@ -147,14 +148,14 @@ public class Serialize
if (rs.next())
{
status = true;
DriverManager.println("Serialize: " + tableName + " table found");
if (Driver.logDebug) Driver.debug("Serialize: " + tableName + " table found");
}
rs.close();
}
// This should never occur, as org.postgresql has it's own internal checks
if (!status)
{
DriverManager.println("Serialize: " + tableName + " table not found");
if (Driver.logDebug) Driver.debug("Serialize: " + tableName + " table not found");
throw new PSQLException("postgresql.serial.table", type);
}
// Finally cache the fields within the table
@ -186,9 +187,9 @@ public class Serialize
{
try
{
DriverManager.println("Serialize.fetch: " + "attempting to instantiate object of type: " + ourClass.getName() );
if (Driver.logDebug) Driver.debug("Serialize.fetch: " + "attempting to instantiate object of type: " + ourClass.getName() );
Object obj = ourClass.newInstance();
DriverManager.println("Serialize.fetch: " + "instantiated object of type: " + ourClass.getName() );
if (Driver.logDebug) Driver.debug("Serialize.fetch: " + "instantiated object of type: " + ourClass.getName() );
// NB: we use java.lang.reflect here to prevent confusion with
// the org.postgresql.Field
@ -219,7 +220,7 @@ public class Serialize
sb.append(" where oid=");
sb.append(oid);
DriverManager.println("Serialize.fetch: " + sb.toString());
if (Driver.logDebug) Driver.debug("Serialize.fetch: " + sb.toString());
ResultSet rs = conn.ExecSQL(sb.toString());
if (rs != null)
@ -388,7 +389,7 @@ public class Serialize
sb.append(')');
}
DriverManager.println("Serialize.store: " + sb.toString() );
if (Driver.logDebug) Driver.debug("Serialize.store: " + sb.toString() );
org.postgresql.ResultSet rs = (org.postgresql.ResultSet) conn.ExecSQL(sb.toString());
// fetch the OID for returning
@ -495,13 +496,13 @@ public class Serialize
ResultSet rs = con.ExecSQL("select relname from pg_class where relname = '" + tableName + "'");
if ( rs.next() )
{
DriverManager.println("Serialize.create: table " + tableName + " exists, skipping");
if (Driver.logDebug) Driver.debug("Serialize.create: table " + tableName + " exists, skipping");
rs.close();
return;
}
// else table not found, so create it
DriverManager.println("Serialize.create: table " + tableName + " not found, creating" );
if (Driver.logDebug) Driver.debug("Serialize.create: table " + tableName + " not found, creating" );
// No entries returned, so the table doesn't exist
StringBuffer sb = new StringBuffer("create table ");
@ -547,7 +548,7 @@ public class Serialize
sb.append(")");
// Now create the table
DriverManager.println("Serialize.create: " + sb );
if (Driver.logDebug) Driver.debug("Serialize.create: " + sb );
con.ExecSQL(sb.toString());
}

Write Preview
Loading…
Cancel
Save