Skip to content

Commit 25cdb77

Browse files
bobstarbirdbobstarbird
authored
Merge pull request #6 from bobstarbird/master
Fixes for Issues #2, #3, #4 and release jar
2 parents 0073eb9 + d2916e0 commit 25cdb77

File tree

7 files changed

+276
-11
lines changed

7 files changed

+276
-11
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ SET DateStyle = 'ISO';SET extra_float_digits = 2;show transaction_isolation
563563
show transaction_isolation;SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL READ COMMITTED
564564
```
565565
```
566-
select * from (select schema as nspname, table as relname, name as attname, pg_type_id(type) as atttypid, type as typname, cid as attnum, pg_type_size(type) as attlen, -1 as atttypmod, 'notnull' as attnotnull, 0 as relhasrules, type as relkind, 0 as oid, 0, 0, -1, 1, '' from sys.sys_columns) where 1 and relname like 'MHF' and nspname like 'Beacon' order by nspname, relname, attnum
566+
select * from (select schema as nspname, table as relname, name as attname, pg_type_id(type) as atttypid, type as typname, cid as attnum, pg_type_size(type) as attlen, 0 as atttypmod, 'notnull' as attnotnull, 0 as relhasrules, type as relkind, 0 as oid, 0, 0, -1, 1, '' from sys.sys_columns) where 1 and relname like 'MHF' and nspname like 'Beacon' order by nspname, relname, attnum
567567
```
568568
```
569569
select * from (select name as relname, schema as nspname, type as relkind from sys.sys_tables) where 1 and nspname like '%' and relname like '%'
@@ -616,7 +616,7 @@ sys.sys_tables) where 1 and nspname not in ('sys')]
616616

617617
-- [select * from (select schema as nspname, table as relname, name as attname,
618618
pg_type_id(type) as atttypid, type as typname, cid as attnum, pg_type_size(type)
619-
as attlen, -1 as atttypmod, 'notnull' as attnotnull, 0 as relhasrules, type as
619+
as attlen, 0 as atttypmod, 'notnull' as attnotnull, 0 as relhasrules, type as
620620
relkind, 0 as oid, 0, 0, -1 from sys.sys_columns) where 1 and relname like
621621
'employees' and nspname like 'main' order by nspname, relname, attnum]
622622

@@ -626,7 +626,7 @@ relkind, 0 as oid, 0, 0, -1 from sys.sys_columns) where 1 and relname like
626626
SQLGetTypeInfo
627627
-- [select * from (select schema as nspname, table as relname, name as attname,
628628
pg_type_id(type) as atttypid, type as typname, cid as attnum, pg_type_size(type)
629-
as attlen, -1 as atttypmod, 'notnull' as attnotnull, 0 as relhasrules, type as
629+
as attlen, 0 as atttypmod, 'notnull' as attnotnull, 0 as relhasrules, type as
630630
relkind, 0 as oid, 0, 0, -1 from sys.sys_columns) where 1 and relname like
631631
'employees' and nspname like 'main' order by nspname, relname, attnum]
632632
[select * from (select -1, type as relkind from sys.sys_tables) where 1 and name

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id "idea"
44
}
55

6-
version = '1.0'
6+
version = '0.3'
77
sourceCompatibility = 1.8
88
targetCompatibility = 1.8
99

‎gradlew

+172
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
#!/usr/bin/env sh
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
26+
27+
APP_NAME="Gradle"
28+
APP_BASE_NAME=`basename "$0"`
29+
30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
33+
# Use the maximum available, or set MAX_FD != -1 to use that value.
34+
MAX_FD="maximum"
35+
36+
warn ( ) {
37+
echo "$*"
38+
}
39+
40+
die ( ) {
41+
echo
42+
echo "$*"
43+
echo
44+
exit 1
45+
}
46+
47+
# OS specific support (must be 'true' or 'false').
48+
cygwin=false
49+
msys=false
50+
darwin=false
51+
nonstop=false
52+
case "`uname`" in
53+
CYGWIN* )
54+
cygwin=true
55+
;;
56+
Darwin* )
57+
darwin=true
58+
;;
59+
MINGW* )
60+
msys=true
61+
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
65+
esac
66+
67+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68+
69+
# Determine the Java command to use to start the JVM.
70+
if [ -n "$JAVA_HOME" ] ; then
71+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72+
# IBM's JDK on AIX uses strange locations for the executables
73+
JAVACMD="$JAVA_HOME/jre/sh/java"
74+
else
75+
JAVACMD="$JAVA_HOME/bin/java"
76+
fi
77+
if [ ! -x "$JAVACMD" ] ; then
78+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79+
80+
Please set the JAVA_HOME variable in your environment to match the
81+
location of your Java installation."
82+
fi
83+
else
84+
JAVACMD="java"
85+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86+
87+
Please set the JAVA_HOME variable in your environment to match the
88+
location of your Java installation."
89+
fi
90+
91+
# Increase the maximum file descriptors if we can.
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93+
MAX_FD_LIMIT=`ulimit -H -n`
94+
if [ $? -eq 0 ] ; then
95+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96+
MAX_FD="$MAX_FD_LIMIT"
97+
fi
98+
ulimit -n $MAX_FD
99+
if [ $? -ne 0 ] ; then
100+
warn "Could not set maximum file descriptor limit: $MAX_FD"
101+
fi
102+
else
103+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104+
fi
105+
fi
106+
107+
# For Darwin, add options to specify how the application appears in the dock
108+
if $darwin; then
109+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110+
fi
111+
112+
# For Cygwin, switch paths to Windows format before running java
113+
if $cygwin ; then
114+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Escape application args
158+
save ( ) {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
161+
}
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

‎gradlew.bat

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
set DIRNAME=%~dp0
12+
if "%DIRNAME%" == "" set DIRNAME=.
13+
set APP_BASE_NAME=%~n0
14+
set APP_HOME=%DIRNAME%
15+
16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windows variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
53+
:win9xME_args
54+
@rem Slurp the command line arguments.
55+
set CMD_LINE_ARGS=
56+
set _SKIP=2
57+
58+
:win9xME_args_slurp
59+
if "x%~1" == "x" goto execute
60+
61+
set CMD_LINE_ARGS=%*
62+
63+
:execute
64+
@rem Setup the command line
65+
66+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67+
68+
@rem Execute Gradle
69+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70+
71+
:end
72+
@rem End local scope for the variables with windows NT shell
73+
if "%ERRORLEVEL%"=="0" goto mainEnd
74+
75+
:fail
76+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77+
rem the _cmd.exe /c_ return code!
78+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79+
exit /b 1
80+
81+
:mainEnd
82+
if "%OS%"=="Windows_NT" endlocal
83+
84+
:omega

‎mljdbc-42.1.4.jar

-154 KB
Binary file not shown.

‎src/main/java/org/postgresql/PGProperty.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public enum PGProperty {
129129
/**
130130
* Puts this connection in read-only mode.
131131
*/
132-
READ_ONLY("readOnly", "false", "Puts this connection in read-only mode"),
132+
READ_ONLY("readOnly", "true", "Puts this connection in read-only mode"),
133133

134134
/**
135135
* Comma separated list of types to enable binary transfer. Either OID numbers or names

‎src/main/java/org/postgresql/jdbc/PgConnection.java

+15-6
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ public class PgConnection implements BaseConnection {
120120
// Connection's autocommit state.
121121
private boolean autoCommit = true;
122122
// Connection's readonly state.
123-
private boolean readOnly = false;
123+
// private boolean readOnly = false;
124+
private boolean readOnly = true;
124125

125126
// Bind String to UNSPECIFIED or VARCHAR?
126127
private final boolean bindStringAsVarchar;
@@ -437,8 +438,8 @@ public void execSQLUpdate(String s) throws SQLException {
437438
BaseStatement stmt = (BaseStatement) createStatement();
438439
if (stmt.executeWithFlags(s, QueryExecutor.QUERY_NO_METADATA | QueryExecutor.QUERY_NO_RESULTS
439440
| QueryExecutor.QUERY_SUPPRESS_BEGIN)) {
440-
throw new PSQLException(GT.tr("A result was returned when none was expected."),
441-
PSQLState.TOO_MANY_RESULTS);
441+
// throw new PSQLException(GT.tr("A result was returned when none was expected."),
442+
// PSQLState.TOO_MANY_RESULTS);
442443
}
443444

444445
// Transfer warnings to the connection, since the user never
@@ -715,12 +716,20 @@ public void setAutoCommit(boolean autoCommit) throws SQLException {
715716
return;
716717
}
717718

719+
if (!autoCommit) {
720+
throw new PSQLException(GT.tr("AutoCommit false setting is not supported."),
721+
PSQLState.NOT_IMPLEMENTED);
722+
}
718723
if (!this.autoCommit) {
719-
commit();
724+
throw new PSQLException(GT.tr("AutoCommit false default is not supported."),
725+
PSQLState.NOT_IMPLEMENTED);
720726
}
727+
// if (!this.autoCommit) {
728+
// commit();
729+
// }
721730

722-
this.autoCommit = autoCommit;
723-
LOGGER.log(Level.FINE, " setAutoCommit = {0}", autoCommit);
731+
// this.autoCommit = autoCommit;
732+
// LOGGER.log(Level.FINE, " setAutoCommit = {0}", autoCommit);
724733
}
725734

726735
public boolean getAutoCommit() throws SQLException {

0 commit comments

Comments
 (0)