- Clone the PostgreSQL JDBC repository from Github:
+ Clone the PostgreSQL JDBC repository from GitHub:
git clone git://github.com/pgjdbc/pgjdbc.git
diff --git a/docs/documentation/changelog.md b/docs/documentation/changelog.md
index be5c0b64e0..ab66105374 100644
--- a/docs/documentation/changelog.md
+++ b/docs/documentation/changelog.md
@@ -282,7 +282,7 @@ George Kankava (1):
Jeremy Whiting (3):
-* perf: Add optimization to re-write batched insert stataments. [ac8abf3](https://github.com/pgjdbc/pgjdbc/commit/ac8abf3f2acbef3f52eb7874b6815d1adc974299)
+* perf: Add optimization to re-write batched insert statements. [ac8abf3](https://github.com/pgjdbc/pgjdbc/commit/ac8abf3f2acbef3f52eb7874b6815d1adc974299)
* fix: Change optimization to delay parameter and statement re-write to immediately before execution. [e591577](https://github.com/pgjdbc/pgjdbc/commit/e59157742c77769cc19e14aeb5aebd9c042e2050)
* feat: Added to SQL parser to allow inspection of Statement attributes and Command. [4ddb693](https://github.com/pgjdbc/pgjdbc/commit/4ddb693ff073c128116b0d79f5aeb45c5ae7307c)
@@ -385,7 +385,7 @@ John Harvey (1):
Dave Cramer (3):
-* fix:regression from previous behaviour where setObject(index,object,VARHCAR) should call getString if it can't cast it to a string [PR#482](https://github.com/pgjdbc/pgjdbc/pull/482) [9d6389c](https://github.com/pgjdbc/pgjdbc/commit/9d6389c57906c9d491087f8db9fa011d8308f8c2)
+* fix:regression from previous behaviour where setObject(index,object,VARCHAR) should call getString if it can't cast it to a string [PR#482](https://github.com/pgjdbc/pgjdbc/pull/482) [9d6389c](https://github.com/pgjdbc/pgjdbc/commit/9d6389c57906c9d491087f8db9fa011d8308f8c2)
* fix:correct comment [PR#482](https://github.com/pgjdbc/pgjdbc/pull/482) [bfd73c7](https://github.com/pgjdbc/pgjdbc/commit/bfd73c72d3f59af3674e078e0e7c4b227207985d)
* Update README.md [PR#482](https://github.com/pgjdbc/pgjdbc/pull/482) [5a956a3](https://github.com/pgjdbc/pgjdbc/commit/5a956a3720546086b3bb7dd156d1d2e3cdd1ee5a)
@@ -489,7 +489,7 @@ Stephen Nelson (1):
Vladimir Sitnikov (12):
* doc: add coding guidelines to readme [PR#442](https://github.com/pgjdbc/pgjdbc/pull/442) [af62c6d](https://github.com/pgjdbc/pgjdbc/commit/af62c6d211097b7e39c04f6293c6d0f60f817adf)
-* chore: remove docbkx/pgjdbc.xml from reposiory [PR#435](https://github.com/pgjdbc/pgjdbc/pull/435) [92b65f0](https://github.com/pgjdbc/pgjdbc/commit/92b65f04de1240b24bd4f71e34903422656660c5)
+* chore: remove docbkx/pgjdbc.xml from repository [PR#435](https://github.com/pgjdbc/pgjdbc/pull/435) [92b65f0](https://github.com/pgjdbc/pgjdbc/commit/92b65f04de1240b24bd4f71e34903422656660c5)
* chore: move files to "pgjdbc" maven module to prepare for pre-processor fix [PR#435](https://github.com/pgjdbc/pgjdbc/pull/435) [f95b44e](https://github.com/pgjdbc/pgjdbc/commit/f95b44ece4450ac22e98e9c3ef4b1d3ba531698f)
* chore: use java comment preprocessor to build jre6/jre7/jre8 jars from the same sources [PR#435](https://github.com/pgjdbc/pgjdbc/pull/435) [42c2e3b](https://github.com/pgjdbc/pgjdbc/commit/42c2e3b7953b2e68281c4ec269bd9749e135065b)
* doc: fix javadocs warnings when building via java 8 [PR#435](https://github.com/pgjdbc/pgjdbc/pull/435) [3b10873](https://github.com/pgjdbc/pgjdbc/commit/3b10873496c7e7cbd88a748a296c0f04dbce489a)
@@ -1166,7 +1166,7 @@ Author: Dave Cramer
Author: Dave Cramer
- add functions to allow LargeObjectMaager to commit on close from Marc Cousin
+ add functions to allow LargeObjectManager to commit on close from Marc Cousin
Author: tminglei
@@ -1200,7 +1200,7 @@ Date: Thu Oct 17 08:29:07 2013 -0400
Author: Dave Cramer
Date: Tue Oct 15 06:51:45 2013 -0400
- add functions to allow LargeObjectMaager to commit on close from Marc Cousin
+ add functions to allow LargeObjectManager to commit on close from Marc Cousin
Author: halset
Date: Mon Sep 9 12:12:26 2013 +0200
@@ -1237,7 +1237,7 @@ Date: Tue May 21 21:03:21 2013 -0400
Author: Dave Cramer
Date: Tue May 21 20:23:00 2013 -0400
- initialize binaryTranferEnable to null
+ initialize binaryTransferEnable to null
Author: Dave Cramer
Date: Tue May 21 20:08:27 2013 -0400
@@ -1487,7 +1487,7 @@ Date: Mon Mar 12 17:33:27 2012 -0700
Author: Dave Cramer
Date: Mon Feb 13 16:43:57 2012 -0500
- resolve ACL getTablePriveledges for later servers
+ resolve ACL getTablePrivileges for later servers
Author: Kris Jurka
Date: Fri Feb 10 01:13:48 2012 -0800
@@ -1696,7 +1696,7 @@ Date: Thu Oct 17 08:29:07 2013 -0400
Author: Dave Cramer
Date: Tue Oct 15 06:51:45 2013 -0400
- add functions to allow LargeObjectMaager to commit on close from Marc Cousin
+ add functions to allow LargeObjectManager to commit on close from Marc Cousin
Author: Dave Cramer
Date: Tue Sep 10 07:25:06 2013 -0700
@@ -1841,7 +1841,7 @@ Date: Mon May 20 16:57:37 2013 -0700
Author: Dave Cramer
Date: Mon May 20 19:56:30 2013 -0400
- support for materialized views from Thomas Kelllerer
+ support for materialized views from Thomas Kellerer
Author: Dave Cramer
Date: Mon May 20 11:46:52 2013 -0700
@@ -1863,7 +1863,7 @@ Date: Fri Apr 12 17:05:00 2013 +0200
Author: Valentine Gogichashvili
Date: Fri Apr 12 03:31:40 2013 +0200
- Test is checking search_path usage dirctly on TypeInfo methods
+ Test is checking search_path usage directly on TypeInfo methods
Author: Valentine Gogichashvili
Date: Fri Apr 12 02:35:27 2013 +0200
@@ -1874,7 +1874,7 @@ Date: Fri Apr 12 02:35:27 2013 +0200
TypeInfoCache did not consider the current search_path and was choosing
an OID of a type not deterministically. These change will make
the type from the current schema to be chosen. Also this change remains
- backwards compatible with the previous implementation, still being anble
+ backwards compatible with the previous implementation, still being able
to find a type, that is not included into the current search_path.
Provided test fails now, as it does not TypeInfoCache
@@ -1987,7 +1987,7 @@ Date: Thu Feb 7 08:55:06 2013 -0500
log can not be output when using DataSource
property settings were not being copied to the datasource
- these included logLevel, binaryTranfer, sslfactory, applicationName
+ these included logLevel, binaryTransfer, sslfactory, applicationName
patch provided by Chen Huajun
Author: Kris Jurka
@@ -2362,7 +2362,7 @@ jurka.
default transaction isolation level. Committed by jurka. Thanks to Kevin Grittner.
*  Update default permissions to account for changes in
different server versions. 8.2 removed the rule permission while 8.4 added a
- trunctate permission. Committed by jurka.
+ truncate permission. Committed by jurka.
*  Newer server versions (9.0+) allow extra_float_digits
to be set to 3 instead of the old limit of 2 to get the maximum precision of
floating point values out of the server. Committed by jurka.
diff --git a/docs/documentation/head/jndi.md b/docs/documentation/head/jndi.md
index 9975288000..0ee0b74cc7 100644
--- a/docs/documentation/head/jndi.md
+++ b/docs/documentation/head/jndi.md
@@ -10,7 +10,7 @@ next: logging.html
---
All the `ConnectionPoolDataSource` and `DataSource` implementations can be stored
-in JNDI. In the case of the nonpooling implementations, a new instance will be
+in JNDI. In the case of the non-pooling implementations, a new instance will be
created every time the object is retrieved from JNDI, with the same settings as
the instance that was stored. For the pooling implementations, the same instance
will be retrieved as long as it is available (e.g., not a different JVM retrieving
diff --git a/docs/documentation/head/replication.md b/docs/documentation/head/replication.md
index 04a960d4d4..44042c7409 100644
--- a/docs/documentation/head/replication.md
+++ b/docs/documentation/head/replication.md
@@ -227,7 +227,7 @@ OutputPluginWrite(ctx, true);
```
As mentioned previously, replication stream should periodically send feedback to the database to prevent disconnect via
-timeout. Feedback is automatically sent when `read` or `readPending` are called if it's time to send feedback. Feedback can also be sent via `org.postgresql.replication.PGReplicationStream#forceUpdateStatus()` regardless of the timeout. Another important duty of feedback is to provide the server with the Logial Sequence Number (LSN) that has been successfully received and applied to consumer, it is necessary for monitoring and to truncate/archive WAL's that that are no longer needed. In the event that replication has been restarted, it's will start from last successfully processed LSN that was sent via feedback to database.
+timeout. Feedback is automatically sent when `read` or `readPending` are called if it's time to send feedback. Feedback can also be sent via `org.postgresql.replication.PGReplicationStream#forceUpdateStatus()` regardless of the timeout. Another important duty of feedback is to provide the server with the Logical Sequence Number (LSN) that has been successfully received and applied to consumer, it is necessary for monitoring and to truncate/archive WAL's that are no longer needed. In the event that replication has been restarted, it's will start from last successfully processed LSN that was sent via feedback to database.
The API provides the following feedback mechanism to indicate the successfully applied LSN by the current consumer. LSN's before this can be truncated or archived.
`org.postgresql.replication.PGReplicationStream#setFlushedLSN` and
diff --git a/docs/documentation/head/server-prepare.md b/docs/documentation/head/server-prepare.md
index 6953c667c0..1da2617c4c 100644
--- a/docs/documentation/head/server-prepare.md
+++ b/docs/documentation/head/server-prepare.md
@@ -165,7 +165,7 @@ performance by caching the statement. Of course it is better to use `PreparedSta
however the driver has an option to cache simple statements as well.
You can do that by setting `preferQueryMode` to `extendedCacheEverything`.
-Note: the option is more of a diagnostinc/debugging sort, so be careful how you use it .
+Note: the option is more of a diagnostic/debugging sort, so be careful how you use it .
#### Bind placeholder datatypes
diff --git a/pgjdbc-osgi-test/build.gradle.kts b/pgjdbc-osgi-test/build.gradle.kts
index 8c8ebd6c27..79cf66097c 100644
--- a/pgjdbc-osgi-test/build.gradle.kts
+++ b/pgjdbc-osgi-test/build.gradle.kts
@@ -59,7 +59,7 @@ val paxLocalCacheRepository = layout.buildDirectory.dir("pax-repo")
val cleanCachedPgjdbc by tasks.registering(Delete::class) {
description =
- "Removes cached postrgresql.jar from pax-repo folder so pax-exam always resolves the recent one"
+ "Removes cached postgresql.jar from pax-repo folder so pax-exam always resolves the recent one"
delete(paxLocalCacheRepository.map { it.dir("org/postgresql") })
}
diff --git a/pgjdbc/src/main/java/org/postgresql/Driver.java b/pgjdbc/src/main/java/org/postgresql/Driver.java
index 1d3fdc15e1..c8fc22a7e6 100644
--- a/pgjdbc/src/main/java/org/postgresql/Driver.java
+++ b/pgjdbc/src/main/java/org/postgresql/Driver.java
@@ -717,12 +717,12 @@ private static long timeout(Properties props) {
* This method was added in v6.5, and simply throws an SQLException for an unimplemented method. I
* decided to do it this way while implementing the JDBC2 extensions to JDBC, as it should help
* keep the overall driver size down. It now requires the call Class and the function name to help
- * when the driver is used with closed software that don't report the stack strace
+ * when the driver is used with closed software that don't report the stack trace
*
* @param callClass the call Class
* @param functionName the name of the unimplemented function with the type of its arguments
* @return PSQLException with a localized message giving the complete description of the
- * unimplemeted function
+ * unimplemented function
*/
public static SQLFeatureNotSupportedException notImplemented(Class callClass,
String functionName) {
diff --git a/pgjdbc/src/main/java/org/postgresql/PGConnection.java b/pgjdbc/src/main/java/org/postgresql/PGConnection.java
index 97cc1ff321..0273cb2ad9 100644
--- a/pgjdbc/src/main/java/org/postgresql/PGConnection.java
+++ b/pgjdbc/src/main/java/org/postgresql/PGConnection.java
@@ -59,7 +59,7 @@ public interface PGConnection {
* method. Returns null if there have been no notifications. A timeout can be specified so the
* driver waits for notifications.
*
- * @param timeoutMillis when 0, blocks forever. when > 0, blocks up to the specified number of millies
+ * @param timeoutMillis when 0, blocks forever. when > 0, blocks up to the specified number of millis
* or until at least one notification has been received. If more than one notification is
* about to be received, these will be returned in one batch.
* @return notifications that have been received
@@ -253,7 +253,7 @@ public interface PGConnection {
* applications via getParameterStatuses().
PgJDBC exposes individual accessors for some of these parameters as
- * listed below. They are more backwarrds-compatible and should be preferred
+ * listed below. They are more backwards-compatible and should be preferred
* where possible.
Not all parameters are reported, only those marked
@@ -270,7 +270,7 @@ public interface PGConnection {
*
*
* As of PostgreSQL 11 the reportable parameter list, and related PgJDBC
- * interfaces or accesors, are:
+ * interfaces or assessors, are:
*
diff --git a/pgjdbc/src/main/java/org/postgresql/PGProperty.java b/pgjdbc/src/main/java/org/postgresql/PGProperty.java
index d7851d4271..5a5f0b38a3 100644
--- a/pgjdbc/src/main/java/org/postgresql/PGProperty.java
+++ b/pgjdbc/src/main/java/org/postgresql/PGProperty.java
@@ -670,7 +670,7 @@ public enum PGProperty {
SSL_PASSWORD_CALLBACK(
"sslpasswordcallback",
null,
- "A class, implementing javax.security.auth.callback.CallbackHandler that can handle PassworCallback for the ssl password."),
+ "A class, implementing javax.security.auth.callback.CallbackHandler that can handle PasswordCallback for the ssl password."),
/**
* After requesting an upgrade to SSL from the server there are reports of the server not responding due to a failover
diff --git a/pgjdbc/src/main/java/org/postgresql/PGResultSetMetaData.java b/pgjdbc/src/main/java/org/postgresql/PGResultSetMetaData.java
index 92a3ca06a4..b0575cc1fd 100644
--- a/pgjdbc/src/main/java/org/postgresql/PGResultSetMetaData.java
+++ b/pgjdbc/src/main/java/org/postgresql/PGResultSetMetaData.java
@@ -45,7 +45,7 @@ public interface PGResultSetMetaData {
* Is a column Text or Binary?
*
* @param column column position (1-based)
- * @return 0 if column data foramt is TEXT, or 1 if BINARY
+ * @return 0 if column data format is TEXT, or 1 if BINARY
* @throws SQLException if something wrong happens
* @see Field#BINARY_FORMAT
* @see Field#TEXT_FORMAT
diff --git a/pgjdbc/src/main/java/org/postgresql/core/Encoding.java b/pgjdbc/src/main/java/org/postgresql/core/Encoding.java
index e6f327ecb3..6a7b908f6e 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/Encoding.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/Encoding.java
@@ -122,7 +122,7 @@ protected Encoding(Charset encoding) {
}
/**
- * Returns true if this encoding has characters '-' and '0'..'9' in exactly same posision as
+ * Returns true if this encoding has characters '-' and '0'..'9' in exactly same position as
* ascii.
*
* @return true if the bytes can be scanned directly for ascii numbers.
diff --git a/pgjdbc/src/main/java/org/postgresql/core/PGStream.java b/pgjdbc/src/main/java/org/postgresql/core/PGStream.java
index 53ead54d44..db5a4f2b16 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/PGStream.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/PGStream.java
@@ -375,7 +375,7 @@ public void send(byte[] buf) throws IOException {
/**
* Send a fixed-size array of bytes to the backend. If {@code buf.length < siz}, pad with zeros.
- * If {@code buf.lengh > siz}, truncate the array.
+ * If {@code buf.length > siz}, truncate the array.
*
* @param buf the array of bytes to be sent
* @param siz the number of bytes to be sent
diff --git a/pgjdbc/src/main/java/org/postgresql/core/Parser.java b/pgjdbc/src/main/java/org/postgresql/core/Parser.java
index 285e5350e9..b7d1f93456 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/Parser.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/Parser.java
@@ -882,7 +882,7 @@ public static boolean isOperatorChar(char c) {
*/
public static boolean isIdentifierStartChar(char c) {
/*
- * PostgreSQL's implmementation is located in
+ * PostgreSQL's implementation is located in
* pgsql/src/backend/parser/scan.l:
* ident_start [A-Za-z\200-\377_]
* ident_cont [A-Za-z\200-\377_0-9\$]
diff --git a/pgjdbc/src/main/java/org/postgresql/core/QueryExecutor.java b/pgjdbc/src/main/java/org/postgresql/core/QueryExecutor.java
index 87e7309844..9b50e22499 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/QueryExecutor.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/QueryExecutor.java
@@ -412,7 +412,7 @@ Object createQueryKey(String sql, boolean escapeProcessing, boolean isParameteri
*
Don't use this string for logic, only use it when displaying the server version to the user.
* Prefer getServerVersionNum() for all logic purposes.
*
- * @return the server version string from the server_version guc
+ * @return the server version string from the server_version GUC
*/
String getServerVersion();
diff --git a/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java b/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
index c587270396..b06e8c7dd2 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
@@ -102,7 +102,7 @@ public String toString() {
* The yy or zz version parts may be larger than 99. A NumberFormatException is thrown if a
* version part is out of range.
*
- * @param serverVersion server vertion in a XXYYZZ form
+ * @param serverVersion server version in a XXYYZZ form
* @return server version in number form
*/
static int parseServerVersionStr(@Nullable String serverVersion) throws NumberFormatException {
diff --git a/pgjdbc/src/main/java/org/postgresql/core/Utils.java b/pgjdbc/src/main/java/org/postgresql/core/Utils.java
index a754b7f236..a621521159 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/Utils.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/Utils.java
@@ -167,7 +167,7 @@ private static void doAppendEscapedIdentifier(Appendable sbuf, String value) thr
* The yy or zz version parts may be larger than 99. A NumberFormatException is thrown if a
* version part is out of range.
*
- * @param serverVersion server vertion in a XXYYZZ form
+ * @param serverVersion server version in a XXYYZZ form
* @return server version in number form
* @deprecated use specific {@link Version} instance
*/
diff --git a/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java b/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
index b1923a0a17..b17ce21015 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
@@ -807,7 +807,7 @@ public synchronized void processNotifies(int timeoutMillis) throws SQLException
timeoutMillis += startTime - newTimeMillis; // Overflows after 49 days, ignore that
startTime = newTimeMillis;
if (timeoutMillis == 0) {
- timeoutMillis = -1; // Don't accidentially wait forever
+ timeoutMillis = -1; // Don't accidentally wait forever
}
}
break;
@@ -1683,7 +1683,7 @@ private void sendBind(SimpleQuery query, SimpleParameterList params, @Nullable P
// be received from a client. If we have a bigger value
// from either very large parameters or incorrect length
// descriptions of setXXXStream we do not send the bind
- // messsage.
+ // message.
//
if (encodedSize > 0x3fffffff) {
throw new PGBindException(new IOException(GT.tr(
diff --git a/pgjdbc/src/main/java/org/postgresql/ds/PGPooledConnection.java b/pgjdbc/src/main/java/org/postgresql/ds/PGPooledConnection.java
index 1c36d33649..50405b190d 100644
--- a/pgjdbc/src/main/java/org/postgresql/ds/PGPooledConnection.java
+++ b/pgjdbc/src/main/java/org/postgresql/ds/PGPooledConnection.java
@@ -109,7 +109,7 @@ public void close() throws SQLException {
/**
* Gets a handle for a client to use. This is a wrapper around the physical connection, so the
* client can call close and it will just return the connection to the pool without really closing
- * the pgysical connection.
+ * the physical connection.
*
*
* According to the JDBC 2.0 Optional Package spec (6.2.3), only one client may have an active
diff --git a/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java b/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java
index 4a75fdc736..a3dab662d2 100644
--- a/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java
+++ b/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java
@@ -1037,7 +1037,7 @@ public void setAssumeMinServerVersion(@Nullable String minVersion) {
* This is important in pool-by-transaction scenarios in order to make sure that all the statements
* reaches the same connection that is being initialized. If set then we will group the startup
* parameters in a transaction
- * @return whether to group starup parameters or not
+ * @return whether to group startup parameters or not
* @see PGProperty#GROUP_STARTUP_PARAMETERS
*/
public boolean getGroupStartupParameters() {
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/EscapedFunctions2.java b/pgjdbc/src/main/java/org/postgresql/jdbc/EscapedFunctions2.java
index d0219942c5..e35e020912 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/EscapedFunctions2.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/EscapedFunctions2.java
@@ -682,7 +682,7 @@ public static void appendCall(StringBuilder sb, String begin, String separator,
String end, List args) {
int size = begin.length();
// Typically just-in-time compiler would eliminate Iterator in case foreach is used,
- // however the code below uses indexed iteration to keep the conde independent from
+ // however the code below uses indexed iteration to keep the code independent from
// various JIT implementations (== avoid Iterator allocations even for not-so-smart JITs)
// see https://bugs.openjdk.java.net/browse/JDK-8166840
// see http://2016.jpoint.ru/talks/cheremin/ (video and slides)
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgClob.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgClob.java
index b48ead45e4..1e5616e97d 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgClob.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgClob.java
@@ -42,7 +42,7 @@ public synchronized java.io.OutputStream setAsciiStream(long pos) throws SQLExce
public synchronized java.io.Writer setCharacterStream(long pos) throws SQLException {
checkFreed();
- throw org.postgresql.Driver.notImplemented(this.getClass(), "setCharacteStream(long)");
+ throw org.postgresql.Driver.notImplemented(this.getClass(), "setCharacterStream(long)");
}
public synchronized InputStream getAsciiStream() throws SQLException {
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java
index 92e261d815..9bbf5fe9c4 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java
@@ -493,7 +493,7 @@ public void setBinaryStream(@Positive int parameterIndex, @Nullable InputStream
PSQLState.INVALID_PARAMETER_VALUE);
}
- // Version 7.2 supports BinaryStream for for the PG bytea type
+ // Version 7.2 supports BinaryStream for the PG bytea type
// As the spec/javadoc for this method indicate this is to be used for
// large binary values (i.e. LONGVARBINARY) PG doesn't have a separate
// long binary datatype, but with toast the bytea datatype is capable of
@@ -1265,7 +1265,7 @@ public void setCharacterStream(@Positive int i, java.io.@Nullable Reader x,
PSQLState.INVALID_PARAMETER_VALUE);
}
- // Version 7.2 supports CharacterStream for for the PG text types
+ // Version 7.2 supports CharacterStream for the PG text types
// As the spec/javadoc for this method indicate this is to be used for
// large text values (i.e. LONGVARCHAR) PG doesn't have a separate
// long varchar datatype, but with toast all the text datatypes are capable of
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
index 7519bdfc84..26dbdd47a3 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
@@ -116,7 +116,7 @@ public class PgResultSet implements ResultSet, org.postgresql.PGRefCursorResultS
protected final int maxFieldSize; // Maximum field size in this resultset (might be 0).
protected @Nullable List rows; // Current page of results.
- protected int currentRow = -1; // Index into 'rows' of our currrent row (0-based)
+ protected int currentRow = -1; // Index into 'rows' of our current row (0-based)
protected int rowOffset; // Offset of row 0 in the actual resultset
protected @Nullable Tuple thisRow; // copy of the current result row
protected @Nullable SQLWarning warnings = null; // The warning chain
@@ -3987,7 +3987,7 @@ public void updateCharacterStream(@Positive int columnIndex,
@Nullable Reader reader, long length)
throws SQLException {
throw org.postgresql.Driver.notImplemented(this.getClass(),
- "updateCharaceterStream(int, Reader, long)");
+ "updateCharacterStream(int, Reader, long)");
}
public void updateCharacterStream(String columnName,
@@ -3999,7 +3999,7 @@ public void updateCharacterStream(String columnName,
public void updateCharacterStream(@Positive int columnIndex,
@Nullable Reader reader) throws SQLException {
throw org.postgresql.Driver.notImplemented(this.getClass(),
- "updateCharaceterStream(int, Reader)");
+ "updateCharacterStream(int, Reader)");
}
public void updateCharacterStream(String columnName,
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java
index 19f071f77e..270a73292a 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java
@@ -448,7 +448,7 @@ private void executeInternal(CachedQuery cachedQuery,
// Only use named statements after we hit the threshold. Note that only
// named statements can be transferred in binary format.
- // isOneShotQuery will check to see if we have hith the prepareThreshold count
+ // isOneShotQuery will check to see if we have hit the prepareThreshold count
if (isOneShotQuery(cachedQuery)) {
flags |= QueryExecutor.QUERY_ONESHOT;
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java b/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java
index 0e5d9fbdb7..0b4c14b051 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java
@@ -1417,7 +1417,7 @@ private static boolean isSimpleTimeZone(String id) {
*/
public Date convertToDate(long millis, @Nullable TimeZone tz) {
- // no adjustments for the inifity hack values
+ // no adjustments for the infinity hack values
if (millis <= PGStatement.DATE_NEGATIVE_INFINITY
|| millis >= PGStatement.DATE_POSITIVE_INFINITY) {
return new Date(millis);
diff --git a/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java b/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java
index a5392e0507..caf3761499 100644
--- a/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java
+++ b/pgjdbc/src/main/java/org/postgresql/ssl/LazyKeyManager.java
@@ -73,7 +73,7 @@ public LazyKeyManager(@Nullable String certfile, @Nullable String keyfile, Callb
}
/**
- * getCertificateChain and getPrivateKey cannot throw exeptions, therefore any exception is stored
+ * getCertificateChain and getPrivateKey cannot throw exceptions, therefore any exception is stored
* in {@link #error} and can be raised by this method.
*
* @throws PSQLException if any exception is stored in {@link #error} and can be raised
@@ -269,7 +269,7 @@ private static byte[] readFileFully(String path) throws IOException {
// Extract the iteration count and the salt
AlgorithmParameters algParams = ePKInfo.getAlgParameters();
cipher.init(Cipher.DECRYPT_MODE, pbeKey, algParams);
- // Decrypt the encryped private key into a PKCS8EncodedKeySpec
+ // Decrypt the encrypted private key into a PKCS8EncodedKeySpec
KeySpec pkcs8KeySpec = ePKInfo.getKeySpec(cipher);
key = kf.generatePrivate(pkcs8KeySpec);
} catch (GeneralSecurityException ikex) {
diff --git a/pgjdbc/src/main/java/org/postgresql/ssl/PKCS12KeyManager.java b/pgjdbc/src/main/java/org/postgresql/ssl/PKCS12KeyManager.java
index 602e5702cf..dc736888aa 100644
--- a/pgjdbc/src/main/java/org/postgresql/ssl/PKCS12KeyManager.java
+++ b/pgjdbc/src/main/java/org/postgresql/ssl/PKCS12KeyManager.java
@@ -49,7 +49,7 @@ public PKCS12KeyManager(String pkcsFile, CallbackHandler cbh) throws PSQLExcepti
}
/**
- * getCertificateChain and getPrivateKey cannot throw exeptions, therefore any exception is stored
+ * getCertificateChain and getPrivateKey cannot throw exceptions, therefore any exception is stored
* in {@link #error} and can be raised by this method.
*
* @throws PSQLException if any exception is stored in {@link #error} and can be raised
diff --git a/pgjdbc/src/main/java/org/postgresql/sspi/NTDSAPI.java b/pgjdbc/src/main/java/org/postgresql/sspi/NTDSAPI.java
index 7ad92923c6..65f874a769 100644
--- a/pgjdbc/src/main/java/org/postgresql/sspi/NTDSAPI.java
+++ b/pgjdbc/src/main/java/org/postgresql/sspi/NTDSAPI.java
@@ -33,7 +33,7 @@ interface NTDSAPI extends StdCallLibrary {
* @param instanceName SPN instance name (in, null ok)
* @param instancePort SPN port number (in, 0 to omit)
* @param referrer SPN referer (in, null ok)
- * @param spnLength Size of 'spn' buffer (in), actul length of spn created including null
+ * @param spnLength Size of 'spn' buffer (in), actual length of spn created including null
* terminator (out)
* @param spn SPN buffer (in/out)
* @return Error code ERROR_SUCCESS, ERROR_BUFFER_OVERFLOW or ERROR_INVALID_PARAMETER
diff --git a/pgjdbc/src/main/java/org/postgresql/sspi/SSPIClient.java b/pgjdbc/src/main/java/org/postgresql/sspi/SSPIClient.java
index 07739b723a..93ab645ac9 100644
--- a/pgjdbc/src/main/java/org/postgresql/sspi/SSPIClient.java
+++ b/pgjdbc/src/main/java/org/postgresql/sspi/SSPIClient.java
@@ -129,7 +129,7 @@ private String makeSPN() throws PSQLException {
public void startSSPI() throws SQLException, IOException {
/*
- * We usually use SSPI negotiation (spnego), but it's disabled if the client asked for GSSPI and
+ * We usually use SSPI negotiation (spnego), but it's disabled if the client asked for GSSAPI and
* usespngo isn't explicitly turned on.
*/
final String securityPackage = enableNegotiate ? "negotiate" : "kerberos";
diff --git a/pgjdbc/src/main/java/org/postgresql/util/PGPropertyServiceParser.java b/pgjdbc/src/main/java/org/postgresql/util/PGPropertyServiceParser.java
index 20b5c807fc..8ca94e29e1 100644
--- a/pgjdbc/src/main/java/org/postgresql/util/PGPropertyServiceParser.java
+++ b/pgjdbc/src/main/java/org/postgresql/util/PGPropertyServiceParser.java
@@ -85,7 +85,7 @@ private InputStream openInputStream(String resourceName) throws IOException {
// choose resource where to search for service description
private @Nullable String findPgServiceConfResourceName() {
// default file name
- String pgServceConfFileDefaultName = PGEnvironment.PGSERVICEFILE.getDefaultValue();
+ String pgServiceConfFileDefaultName = PGEnvironment.PGSERVICEFILE.getDefaultValue();
// if there is value, use it - 1st priority
{
@@ -116,7 +116,7 @@ private InputStream openInputStream(String resourceName) throws IOException {
in the case that the file is in the user home directory it is prepended with '.'
*/
{
- String resourceName = "." + pgServceConfFileDefaultName;
+ String resourceName = "." + pgServiceConfFileDefaultName;
File resourceFile = new File(OSUtil.getUserConfigRootDirectory(), resourceName);
if (resourceFile.canRead()) {
LOGGER.log(Level.FINE, "Value [{0}] selected because file exist in user home directory", new Object[]{resourceFile.getAbsolutePath()});
@@ -129,13 +129,13 @@ private InputStream openInputStream(String resourceName) throws IOException {
String envVariableName = PGEnvironment.PGSYSCONFDIR.getName();
String pgSysconfDir = System.getenv().get(envVariableName);
if (pgSysconfDir != null && !pgSysconfDir.trim().isEmpty()) {
- String resourceName = pgSysconfDir + File.separator + pgServceConfFileDefaultName;
+ String resourceName = pgSysconfDir + File.separator + pgServiceConfFileDefaultName;
LOGGER.log(Level.FINE, "Value [{0}] selected using environment variable [{1}]", new Object[]{resourceName, envVariableName});
return resourceName;
}
}
// otherwise null
- LOGGER.log(Level.FINE, "Value for resource [{0}] not found", pgServceConfFileDefaultName);
+ LOGGER.log(Level.FINE, "Value for resource [{0}] not found", pgServiceConfFileDefaultName);
return null;
}
diff --git a/pgjdbc/src/main/java/org/postgresql/util/PGbytea.java b/pgjdbc/src/main/java/org/postgresql/util/PGbytea.java
index d5bd03c159..b40cf17cf4 100644
--- a/pgjdbc/src/main/java/org/postgresql/util/PGbytea.java
+++ b/pgjdbc/src/main/java/org/postgresql/util/PGbytea.java
@@ -135,11 +135,11 @@ private static byte[] toBytesOctalEscaped(byte[] s) {
elementAsInt = 256 + elementAsInt;
}
// we escape the same non-printable characters as the backend
- // we must escape all 8bit characters otherwise when convering
+ // we must escape all 8bit characters otherwise when converting
// from java unicode to the db character set we may end up with
// question marks if the character set is SQL_ASCII
if (elementAsInt < 040 || elementAsInt > 0176) {
- // escape charcter with the form \000, but need two \\ because of
+ // escape character with the form \000, but need two \\ because of
// the Java parser
stringBuilder.append("\\");
stringBuilder.append((char) (((elementAsInt >> 6) & 0x3) + 48));
diff --git a/pgjdbc/src/main/java/org/postgresql/util/PGobject.java b/pgjdbc/src/main/java/org/postgresql/util/PGobject.java
index 5861f7abdb..b213ccefa1 100644
--- a/pgjdbc/src/main/java/org/postgresql/util/PGobject.java
+++ b/pgjdbc/src/main/java/org/postgresql/util/PGobject.java
@@ -102,7 +102,7 @@ public Object clone() throws CloneNotSupportedException {
}
/**
- * This is defined here, so user code need not overide it.
+ * This is defined here, so user code need not override it.
*
* @return the value of this object, in the syntax expected by org.postgresql
*/
diff --git a/pgjdbc/src/main/java/org/postgresql/util/SharedTimer.java b/pgjdbc/src/main/java/org/postgresql/util/SharedTimer.java
index 64b9303b40..c875abf0ad 100644
--- a/pgjdbc/src/main/java/org/postgresql/util/SharedTimer.java
+++ b/pgjdbc/src/main/java/org/postgresql/util/SharedTimer.java
@@ -39,7 +39,7 @@ public synchronized Timer getTimer() {
final ClassLoader prevContextCL = Thread.currentThread().getContextClassLoader();
try {
/*
- Scheduled tasks whould not need to use .getContextClassLoader, so we just reset it to null
+ Scheduled tasks should not need to use .getContextClassLoader, so we just reset it to null
*/
Thread.currentThread().setContextClassLoader(null);
diff --git a/pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java b/pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java
index b275b78754..d52cbcf951 100644
--- a/pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java
@@ -63,7 +63,7 @@ public abstract class AbstractArraysTest {
* @param testData
* 3 dimensional array to use for testing.
* @param binarySupported
- * Indicates if binary support is epxected for the type.
+ * Indicates if binary support is expected for the type.
*/
public AbstractArraysTest(A[][] testData, boolean binarySupported, int arrayTypeOid) {
super();
diff --git a/pgjdbc/src/test/java/org/postgresql/jdbc/LargeObjectManagerTest.java b/pgjdbc/src/test/java/org/postgresql/jdbc/LargeObjectManagerTest.java
index 677baff9a9..4c28b0b779 100644
--- a/pgjdbc/src/test/java/org/postgresql/jdbc/LargeObjectManagerTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/jdbc/LargeObjectManagerTest.java
@@ -42,7 +42,7 @@ public void testOpenWithErrorAndSubsequentParameterStatusMessageShouldLeaveConne
LargeObjectManager loManager = con.getLargeObjectAPI();
try {
loManager.open(0, false);
- fail("Succeeded in opening a non-existent large object");
+ fail("Succeeded in opening a nonexistent large object");
} catch (PSQLException e) {
assertEquals(PSQLState.UNDEFINED_OBJECT.getState(), e.getSQLState());
}
diff --git a/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java b/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java
index ea96fbaca5..180cb5cb01 100644
--- a/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java
@@ -50,10 +50,10 @@ public void setUp() throws Exception {
@Test
public void setCharacterStream() throws Exception {
- String exmplar = "value";
+ String example = "value";
SQLXML pgSQLXML = con.createSQLXML();
Writer writer = pgSQLXML.setCharacterStream();
- writer.write(exmplar);
+ writer.write(example);
PreparedStatement preparedStatement = con.prepareStatement("insert into xmltab values (?)");
preparedStatement.setSQLXML(1, pgSQLXML);
preparedStatement.execute();
@@ -63,7 +63,7 @@ public void setCharacterStream() throws Exception {
assertTrue(rs.next());
SQLXML result = rs.getSQLXML(1);
assertNotNull(result);
- assertEquals(exmplar, result.getString());
+ assertEquals(example, result.getString());
}
private static final String LICENSE_URL =
diff --git a/pgjdbc/src/test/java/org/postgresql/replication/CopyBothResponseTest.java b/pgjdbc/src/test/java/org/postgresql/replication/CopyBothResponseTest.java
index 8619d8c8df..74189f3756 100644
--- a/pgjdbc/src/test/java/org/postgresql/replication/CopyBothResponseTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/replication/CopyBothResponseTest.java
@@ -106,13 +106,13 @@ public void testReceiveKeepAliveMessage() throws Exception {
copyDual.endCopy();
assertThat(
- "Streaming replication start with swap keep alive message, we want that first get packege will be keep alive",
+ "Streaming replication start with swap keep alive message, we want that first get package will be keep alive",
code, equalTo((int) 'k')
);
}
@Test
- public void testKeedAliveContaintCorrectLSN() throws Exception {
+ public void testKeedAliveContainsCorrectLSN() throws Exception {
CopyManager cm = ((PGConnection) replConnection).getCopyAPI();
LogSequenceNumber startLsn = getCurrentLSN();
@@ -154,7 +154,7 @@ public void testReceiveXLogData() throws Exception {
assertThat(
"When replication starts via slot and specify LSN that lower than last LSN on server, "
- + "we should get all changes that occurs beetween two LSN",
+ + "we should get all changes that occurs between two LSN",
code, equalTo('w')
);
}
diff --git a/pgjdbc/src/test/java/org/postgresql/replication/LogicalReplicationTest.java b/pgjdbc/src/test/java/org/postgresql/replication/LogicalReplicationTest.java
index 334c13e0fe..fc9d7238d2 100644
--- a/pgjdbc/src/test/java/org/postgresql/replication/LogicalReplicationTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/replication/LogicalReplicationTest.java
@@ -114,7 +114,7 @@ state, equalTo(PSQLState.UNDEFINED_OBJECT.getState())
}
@Test(timeout = 1000)
- public void testReceiveChangesOccursBeforStartReplication() throws Exception {
+ public void testReceiveChangesOccursBeforeStartReplication() throws Exception {
PGConnection pgConnection = (PGConnection) replConnection;
LogSequenceNumber lsn = getCurrentLSN();
@@ -678,7 +678,7 @@ public void testRestartReplicationFromRestartSlotLSNWhenFeedbackAbsent() throws
assertThat(
"If was consume message via logical replication stream but wasn't send feedback about apply and flush "
- + "consumed LSN, if replication crash, server should restart from last success apllyed lsn, "
+ + "consumed LSN, if replication crash, server should restart from last success applied lsn, "
+ "in this case it lsn of start replication slot, so we should consume first 3 message twice",
result, equalTo(wait)
);
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/AutoRollbackTestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/AutoRollbackTestSuite.java
index 212d4e9654..8c816556aa 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/AutoRollbackTestSuite.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/AutoRollbackTestSuite.java
@@ -57,7 +57,7 @@ private enum FailMode {
* Executes DEALLOCATE ALL.
* Mitigation:
* 1) QueryExecutor tracks "DEALLOCATE ALL" responses ({@see org.postgresql.core.QueryExecutor#setFlushCacheOnDeallocate(boolean)}
- * 2) QueryExecutor tracks "prepared statement name is invalid" and unprepares relevant statements ({@link org.postgresql.core.v3.QueryExecutorImpl#processResults(ResultHandler, int)}
+ * 2) QueryExecutor tracks "prepared statement name is invalid" and unprepared relevant statements ({@link org.postgresql.core.v3.QueryExecutorImpl#processResults(ResultHandler, int)}
* 3) "autosave in (always, conservative)"
* 4) Non-transactional cases are healed by retry (when no transaction present, just retry is possible)
*/
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BatchExecuteTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BatchExecuteTest.java
index af040d6f93..92f2e9c52d 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BatchExecuteTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BatchExecuteTest.java
@@ -500,7 +500,7 @@ public void testMixedBatch() throws SQLException {
* The second bind identifies the object class as String so it calls setString internally. This
* sets the type to 1043 (varchar).
*
- * The third and subsequent binds, whether null or non-null, will get type 1043, becaues there's
+ * The third and subsequent binds, whether null or non-null, will get type 1043, because there's
* logic to avoid overwriting a known parameter type with the unknown type oid. This is why the
* issue can only occur when null is the first entry.
*
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ConnectionTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ConnectionTest.java
index 4ccd2e652e..32fc7a8cc7 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ConnectionTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ConnectionTest.java
@@ -239,7 +239,7 @@ public void testReadOnly_always() throws Exception {
assertEquals(9876, rs.getInt(1)); // Should not change!
rs.close();
- // repeat attempt to chagne with auto commit true
+ // repeat attempt to change with auto commit true
con.setAutoCommit(true);
try {
@@ -357,7 +357,7 @@ public void testReadOnly_transaction() throws Exception {
assertEquals(9876, rs.getInt(1)); // Should not change!
rs.close();
- // repeat attempt to chagne with auto commit true
+ // repeat attempt to change with auto commit true
con.setAutoCommit(true);
assertEquals(1, st.executeUpdate("update test_a set image=1111 where id=5678"));
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyTest.java
index 7c10b61487..c85d96693c 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyTest.java
@@ -406,7 +406,7 @@ public void testChangeDateStyle() throws SQLException {
con.commit();
} catch (SQLException ex) {
- // the with xxx is a syntax error which shoud return a state of 42601
+ // the with xxx is a syntax error which should return a state of 42601
// if this fails the 'S' command is not being handled in the copy manager query handler
assertEquals("42601", ex.getSQLState());
con.rollback();
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
index 36530ce92c..96420be1c4 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
@@ -1398,7 +1398,7 @@ public void testInformationAboutArrayTypes() throws SQLException {
}
@Test
- public void testPartionedTablesIndex() throws SQLException {
+ public void testPartitionedTablesIndex() throws SQLException {
if (TestUtil.haveMinimumServerVersion(con, ServerVersion.v11)) {
Statement stmt = null;
try {
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DateStyleTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DateStyleTest.java
index 97850e9c33..b3f4d75cef 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DateStyleTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DateStyleTest.java
@@ -37,7 +37,7 @@ public static Iterable data() {
}
@Test
- public void conenct() throws SQLException {
+ public void connect() throws SQLException {
Statement st = con.createStatement();
try {
st.execute("set DateStyle='" + dateStyle + "'");
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DriverTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DriverTest.java
index dc0fd53794..b9e52fc6a2 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DriverTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DriverTest.java
@@ -192,7 +192,7 @@ public void testConnectService() throws Exception {
// consume service
Resources.with(
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), tempFile.toString(), PGEnvironment.PGSYSCONFDIR.getName(), ""),
- new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-non-existent")
+ new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-nonexistent")
).execute(() -> {
//
// testing that properties overriding priority is correct (POSITIVE cases)
@@ -276,7 +276,7 @@ public void testConnectPassword01() throws Exception {
// ignore pg_service.conf, use .pgpass
Resources.with(
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), "", PGEnvironment.PGSYSCONFDIR.getName(), ""),
- new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-non-existent",
+ new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-nonexistent",
PGEnvironment.ORG_POSTGRESQL_PGPASSFILE.getName(), tempPgPassFile.toString())
).execute(() -> {
// password from .pgpass (correct)
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ReplaceProcessingTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ReplaceProcessingTest.java
index dfa6c56cae..506f0a5daa 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ReplaceProcessingTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ReplaceProcessingTest.java
@@ -34,7 +34,7 @@ public static Iterable data() {
{"{fn ifnull(?,?)}", "coalesce($1,$2)"},
{"{fn database()}", "current_database()"},
// Not yet supported
- // {"{fn timestampadd(SQL_TSI_QUATER, ?, {fn now()})}", "(CAST( $1||' quater' as interval)+ now())"},
+ // {"{fn timestampadd(SQL_TSI_QUARTER, ?, {fn now()})}", "(CAST( $1||' quarter' as interval)+ now())"},
// {"{fn timestampadd(SQL_TSI_FRAC_SECOND, ?, {fn now()})}", "(CAST( $1||' second' as interval)+ now())"},
});
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java
index aa5ed46a85..973d5b8444 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java
@@ -335,7 +335,7 @@ public void testBoolean(String table, int prepareThreshold) throws SQLException
public void testgetBooleanJDBCCompliance() throws SQLException {
// The JDBC specification in Table B-6 "Use of ResultSet getter Methods to Retrieve JDBC Data Types"
// the getBoolean have this Supported JDBC Type: TINYINT, SMALLINT, INTEGER, BIGINT, REAL, FLOAT,
- // DOUBLE, DECIAML, NUMERIC, BIT, BOOLEAN, CHAR, VARCHAR, LONGVARCHAR
+ // DOUBLE, DECIMAL, NUMERIC, BIT, BOOLEAN, CHAR, VARCHAR, LONGVARCHAR
// There is no TINYINT in PostgreSQL
testgetBoolean("int2"); // SMALLINT
@@ -739,7 +739,7 @@ public void testZeroRowResultPositioning() throws SQLException {
Statement stmt =
con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
ResultSet rs =
- stmt.executeQuery("SELECT * FROM pg_database WHERE datname='nonexistantdatabase'");
+ stmt.executeQuery("SELECT * FROM pg_database WHERE datname='nonexistentdatabase'");
assertTrue(!rs.previous());
assertTrue(!rs.previous());
assertTrue(!rs.next());
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java
index cbc84a2b71..0a4be10f9a 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java
@@ -213,7 +213,7 @@ public void testEscapeProcessing() throws SQLException {
rs = stmt.executeQuery("select * from {oj test_statement a left outer join b on (a.i=b.i)} ");
assertTrue(!rs.next());
- // test escape escape character
+ // test escape character
rs = stmt
.executeQuery("select str2 from comparisontest where str1 like '|_abcd' {escape '|'} ");
assertTrue(rs.next());
@@ -435,7 +435,7 @@ public void testDateFunctions() throws SQLException {
// timestampadd(SQL_TSI_MONTH,3,{fn now()})})} ");
// assertTrue(rs.next());
// assertEquals(3,rs.getInt(1));
- // QUARTER => backend assume there are 1 quater even in 270 days...
+ // QUARTER => backend assume there are 1 quarter even in 270 days...
// rs = stmt.executeQuery("select {fn timestampdiff(SQL_TSI_QUARTER,{fn now()},{fn
// timestampadd(SQL_TSI_QUARTER,3,{fn now()})})} ");
// assertTrue(rs.next());
@@ -1091,7 +1091,7 @@ protected void finalize() throws Throwable {
* @throws SQLException if something goes wrong
*/
@Test
- public void testJavascriptFunction() throws SQLException {
+ public void testJavaScriptFunction() throws SQLException {
String str = " var _modules = {};\n"
+ " var _current_stack = [];\n"
+ "\n"
@@ -1107,7 +1107,7 @@ public void testJavascriptFunction() throws SQLException {
ps = con.prepareStatement("select $JAVASCRIPT$" + str + "$JAVASCRIPT$");
ResultSet rs = ps.executeQuery();
rs.next();
- assertEquals("Javascript code has been protected with $JAVASCRIPT$", str, rs.getString(1));
+ assertEquals("JavaScript code has been protected with $JAVASCRIPT$", str, rs.getString(1));
} finally {
TestUtil.closeQuietly(ps);
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimestampTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimestampTest.java
index e801dfedd1..5af5421bd4 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimestampTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimestampTest.java
@@ -38,7 +38,7 @@
/*
* Test get/setTimestamp for both timestamp with time zone and timestamp without time zone datatypes
- * TODO: refactor to a property-based testing or paremeterized testing somehow so adding new times
+ * TODO: refactor to a property-based testing or parameterized testing somehow so adding new times
* don't require to add constants and setters/getters. JUnit 5 would probably help here.
*/
@RunWith(Parameterized.class)
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimezoneTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimezoneTest.java
index 9b4047c8f3..1c3bf30117 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimezoneTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimezoneTest.java
@@ -955,7 +955,7 @@ private void checkDatabaseContents(String query, String[][] correct) throws Exce
*
* @param t The time of day. Must be within -24 and + 24 hours of epoc.
* @param tz The timezone to normalize to.
- * @return the Time nomralized to 0 to 24 hours of epoc adjusted with given timezone.
+ * @return the Time normalized to 0 to 24 hours of epoc adjusted with given timezone.
*/
private Timestamp normalizeTimeOfDayPart(Timestamp t, Calendar tz) {
return new Timestamp(normalizeTimeOfDayPart(t.getTime(), tz.getTimeZone()));
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3BlobTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3BlobTest.java
index 66f3f3c741..e30aa5e981 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3BlobTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3BlobTest.java
@@ -278,7 +278,7 @@ public void readWriteStream(int offset, byte[] data) throws SQLException, IOExce
@Test
public void testPattern() throws SQLException {
- byte[] data = "abcdefghijklmnopqrstuvwxyx0123456789".getBytes();
+ byte[] data = "abcdefghijklmnopqrstuvwxyz0123456789".getBytes();
byte[] pattern = "def".getBytes();
PreparedStatement ps = conn.prepareStatement(INSERT);
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/TestReturning.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/TestReturning.java
index ffe32bf92c..03ad1d1b39 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/TestReturning.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/TestReturning.java
@@ -63,9 +63,9 @@ public String[] getColumnNames() {
@Parameterized.Parameters(name = "returningInQuery = {0}, quoteReturning = {1}")
public static Iterable data() {
Collection ids = new ArrayList();
- for (ColumnsReturned columsReturned : ColumnsReturned.values()) {
+ for (ColumnsReturned columnsReturned : ColumnsReturned.values()) {
for (String q : returningOptions) {
- ids.add(new Object[]{columsReturned, q});
+ ids.add(new Object[]{columnsReturned, q});
}
}
return ids;
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BinaryStreamTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BinaryStreamTest.java
index dd33fd2e88..9ea02d224c 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BinaryStreamTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BinaryStreamTest.java
@@ -51,7 +51,7 @@ private void insertStreamKownLength(byte[] data) throws Exception {
}
}
- private void insertStreamUnkownLength(byte[] data) throws Exception {
+ private void insertStreamUnknownLength(byte[] data) throws Exception {
PreparedStatement updatePS = con.prepareStatement(TestUtil.insertSQL("images", "img", "?"));
try {
updatePS.setBinaryStream(1, new ByteArrayInputStream(data));
@@ -129,35 +129,35 @@ public void testKnownLength200Kb() throws Exception {
@Test
public void testUnknownLengthEmpty() throws Exception {
byte[] data = getTestData(2 * 1024);
- insertStreamUnkownLength(data);
+ insertStreamUnknownLength(data);
validateContent(data);
}
@Test
public void testUnknownLength2Kb() throws Exception {
byte[] data = getTestData(2 * 1024);
- insertStreamUnkownLength(data);
+ insertStreamUnknownLength(data);
validateContent(data);
}
@Test
public void testUnknownLength10Kb() throws Exception {
byte[] data = getTestData(10 * 1024);
- insertStreamUnkownLength(data);
+ insertStreamUnknownLength(data);
validateContent(data);
}
@Test
public void testUnknownLength100Kb() throws Exception {
byte[] data = getTestData(100 * 1024);
- insertStreamUnkownLength(data);
+ insertStreamUnknownLength(data);
validateContent(data);
}
@Test
public void testUnknownLength200Kb() throws Exception {
byte[] data = getTestData(200 * 1024);
- insertStreamUnkownLength(data);
+ insertStreamUnknownLength(data);
validateContent(data);
}
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/ClientInfoTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/ClientInfoTest.java
index 7b167a3fed..84fb9b62ca 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/ClientInfoTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/ClientInfoTest.java
@@ -83,9 +83,9 @@ public void testSetAppNameProps() throws SQLException {
@Test
public void testWarningOnUnknownName() throws SQLException {
try {
- con.setClientInfo("UnexisingClientInfoName", "NoValue");
+ con.setClientInfo("NonexistentClientInfoName", "NoValue");
} catch (SQLClientInfoException e) {
- fail("Trying to set an unexisting name must not throw an exception (spec)");
+ fail("Trying to set a nonexistent name must not throw an exception (spec)");
}
assertNotNull(con.getWarnings());
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataHideUnprivilegedObjectsTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataHideUnprivilegedObjectsTest.java
index a057b36bc7..2e4932b993 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataHideUnprivilegedObjectsTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataHideUnprivilegedObjectsTest.java
@@ -39,11 +39,11 @@
public class DatabaseMetaDataHideUnprivilegedObjectsTest {
public static final String COLUMNS = "digit int4, name text";
private static Connection hidingCon;
- private static Connection nonhidingCon;
+ private static Connection nonHidingCon;
private static Connection privilegedCon;
private static PgConnection pgConnection;
private static DatabaseMetaData hidingDatabaseMetaData;
- private static DatabaseMetaData nonhidingDatabaseMetaData;
+ private static DatabaseMetaData nonHidingDatabaseMetaData;
@BeforeClass
public static void setUp() throws Exception {
@@ -69,7 +69,7 @@ public static void setUp() throws Exception {
stmt.close();
- nonhidingDatabaseMetaData = getNonHidingDatabaseMetaData(props);
+ nonHidingDatabaseMetaData = getNonHidingDatabaseMetaData(props);
hidingDatabaseMetaData = getHidingDatabaseMetaData(props);
}
@@ -84,8 +84,8 @@ private static DatabaseMetaData getHidingDatabaseMetaData(Properties props) thro
}
private static DatabaseMetaData getNonHidingDatabaseMetaData(Properties props) throws Exception {
- nonhidingCon = TestUtil.openDB(props);
- return nonhidingCon.getMetaData();
+ nonHidingCon = TestUtil.openDB(props);
+ return nonHidingCon.getMetaData();
}
private static void createTestDataObjectsWithRangeOfPrivilegesInSchema(String schema)
@@ -227,7 +227,7 @@ private static void createSimpleTablesInSchema(String schema, String[] tables
@AfterClass
public static void tearDown() throws SQLException {
TestUtil.closeDB(hidingCon);
- TestUtil.closeDB(nonhidingCon);
+ TestUtil.closeDB(nonHidingCon);
TestUtil.dropSchema(privilegedCon, "high_privileges_schema");
TestUtil.dropSchema(privilegedCon, "low_privileges_schema");
TestUtil.dropSchema(privilegedCon, "no_privileges_schema");
@@ -254,7 +254,7 @@ public void testGetSchemas() throws SQLException {
assertThat(schemasWithHiding,
not(hasItem("no_privileges_schema")));
- List schemasWithNoHiding = getSchemaNames(nonhidingDatabaseMetaData);
+ List schemasWithNoHiding = getSchemaNames(nonHidingDatabaseMetaData);
assertThat(schemasWithNoHiding,
hasItems("pg_catalog", "information_schema",
"high_privileges_schema", "low_privileges_schema", "no_privileges_schema"));
@@ -283,7 +283,7 @@ public void testGetTables() throws SQLException {
not(hasItem("no_grants_table")));
List tablesWithNoHiding =
- getTableNames(nonhidingDatabaseMetaData, "high_privileges_schema");
+ getTableNames(nonHidingDatabaseMetaData, "high_privileges_schema");
assertThat(tablesWithNoHiding,
hasItems(
"owned_table",
@@ -304,7 +304,7 @@ public void testGetTables() throws SQLException {
not(hasItem("no_grants_table")));
tablesWithNoHiding =
- getTableNames(nonhidingDatabaseMetaData, "low_privileges_schema");
+ getTableNames(nonHidingDatabaseMetaData, "low_privileges_schema");
assertThat(tablesWithNoHiding,
hasItems(
"owned_table",
@@ -313,7 +313,7 @@ public void testGetTables() throws SQLException {
"select_granted_table",
"no_grants_table"));
- // Or should the the tables names not be returned because the schema is not visible?
+ // Or should the tables names not be returned because the schema is not visible?
tablesWithHiding = getTableNames(hidingDatabaseMetaData, "no_privileges_schema");
assertThat(tablesWithHiding,
@@ -326,7 +326,7 @@ public void testGetTables() throws SQLException {
not(hasItem("no_grants_table")));
tablesWithNoHiding =
- getTableNames(nonhidingDatabaseMetaData, "no_privileges_schema");
+ getTableNames(nonHidingDatabaseMetaData, "no_privileges_schema");
assertThat(tablesWithNoHiding,
hasItems(
"owned_table",
@@ -358,7 +358,7 @@ public void testGetViews() throws SQLException {
not(hasItem("no_grants_view")));
List viewsWithNoHiding =
- getViewNames(nonhidingDatabaseMetaData, "high_privileges_schema");
+ getViewNames(nonHidingDatabaseMetaData, "high_privileges_schema");
assertThat(viewsWithNoHiding,
hasItems(
"select_granted_view",
@@ -373,13 +373,13 @@ public void testGetViews() throws SQLException {
not(hasItem("no_grants_view")));
viewsWithNoHiding =
- getViewNames(nonhidingDatabaseMetaData, "low_privileges_schema");
+ getViewNames(nonHidingDatabaseMetaData, "low_privileges_schema");
assertThat(viewsWithNoHiding,
hasItems(
"select_granted_view",
"no_grants_view"));
- // Or should the the view names not be returned because the schema is not visible?
+ // Or should the view names not be returned because the schema is not visible?
viewsWithHiding = getViewNames(hidingDatabaseMetaData, "no_privileges_schema");
assertThat(viewsWithHiding,
@@ -389,7 +389,7 @@ public void testGetViews() throws SQLException {
not(hasItem("no_grants_view")));
viewsWithNoHiding =
- getViewNames(nonhidingDatabaseMetaData, "no_privileges_schema");
+ getViewNames(nonHidingDatabaseMetaData, "no_privileges_schema");
assertThat(viewsWithNoHiding,
hasItems(
"select_granted_view",
@@ -417,7 +417,7 @@ public void testGetFunctions() throws SQLException {
not(hasItem("no_grants_add_function")));
List functionsWithNoHiding =
- getFunctionNames(nonhidingDatabaseMetaData, "high_privileges_schema");
+ getFunctionNames(nonHidingDatabaseMetaData, "high_privileges_schema");
assertThat(functionsWithNoHiding,
hasItems("execute_granted_add_function", "no_grants_add_function"));
@@ -429,11 +429,11 @@ public void testGetFunctions() throws SQLException {
not(hasItem("no_grants_add_function")));
functionsWithNoHiding =
- getFunctionNames(nonhidingDatabaseMetaData, "low_privileges_schema");
+ getFunctionNames(nonHidingDatabaseMetaData, "low_privileges_schema");
assertThat(functionsWithNoHiding,
hasItems("execute_granted_add_function", "no_grants_add_function"));
- // Or should the the function names not be returned because the schema is not visible?
+ // Or should the function names not be returned because the schema is not visible?
functionsWithHiding =
getFunctionNames(hidingDatabaseMetaData, "no_privileges_schema");
assertThat(functionsWithHiding,
@@ -442,7 +442,7 @@ public void testGetFunctions() throws SQLException {
not(hasItem("no_grants_add_function")));
functionsWithNoHiding =
- getFunctionNames(nonhidingDatabaseMetaData, "no_privileges_schema");
+ getFunctionNames(nonHidingDatabaseMetaData, "no_privileges_schema");
assertThat(functionsWithNoHiding,
hasItems("execute_granted_add_function", "no_grants_add_function"));
}
@@ -470,7 +470,7 @@ public void testGetProcedures() throws SQLException {
not(hasItem(noGrants)));
List proceduresWithNoHiding =
- getProcedureNames(nonhidingDatabaseMetaData, "high_privileges_schema");
+ getProcedureNames(nonHidingDatabaseMetaData, "high_privileges_schema");
assertThat(proceduresWithNoHiding,
hasItems(executeGranted, noGrants));
@@ -482,11 +482,11 @@ public void testGetProcedures() throws SQLException {
not(hasItem(noGrants)));
proceduresWithNoHiding =
- getProcedureNames(nonhidingDatabaseMetaData, "low_privileges_schema");
+ getProcedureNames(nonHidingDatabaseMetaData, "low_privileges_schema");
assertThat(proceduresWithNoHiding,
hasItems(executeGranted, noGrants));
- // Or should the the function names not be returned because the schema is not visible?
+ // Or should the function names not be returned because the schema is not visible?
proceduresWithHiding =
getProcedureNames(hidingDatabaseMetaData, "no_privileges_schema");
assertThat(proceduresWithHiding,
@@ -495,7 +495,7 @@ public void testGetProcedures() throws SQLException {
not(hasItem(noGrants)));
proceduresWithNoHiding =
- getProcedureNames(nonhidingDatabaseMetaData, "no_privileges_schema");
+ getProcedureNames(nonHidingDatabaseMetaData, "no_privileges_schema");
assertThat(proceduresWithNoHiding,
hasItems(executeGranted, noGrants));
@@ -529,7 +529,7 @@ public void testGetUDTs() throws SQLException {
assertThat(typesWithHiding,
not(hasItems("no_grants_composite_type", "no_grants_us_postal_code_domain")));
- // Or should the the types names not be returned because the schema is not visible?
+ // Or should the types names not be returned because the schema is not visible?
typesWithHiding = getTypeNames(hidingDatabaseMetaData, "no_privileges_schema");
assertThat(typesWithHiding,
hasItems("usage_granted_composite_type", "usage_granted_us_postal_code_domain"));
@@ -538,19 +538,19 @@ public void testGetUDTs() throws SQLException {
}
List typesWithNoHiding =
- getTypeNames(nonhidingDatabaseMetaData, "high_privileges_schema");
+ getTypeNames(nonHidingDatabaseMetaData, "high_privileges_schema");
assertThat(typesWithNoHiding,
hasItems("usage_granted_composite_type", "no_grants_composite_type",
"usage_granted_us_postal_code_domain", "no_grants_us_postal_code_domain"));
typesWithNoHiding =
- getTypeNames(nonhidingDatabaseMetaData, "low_privileges_schema");
+ getTypeNames(nonHidingDatabaseMetaData, "low_privileges_schema");
assertThat(typesWithNoHiding,
hasItems("usage_granted_composite_type", "no_grants_composite_type",
"usage_granted_us_postal_code_domain", "no_grants_us_postal_code_domain"));
typesWithNoHiding =
- getTypeNames(nonhidingDatabaseMetaData, "no_privileges_schema");
+ getTypeNames(nonHidingDatabaseMetaData, "no_privileges_schema");
assertThat(typesWithNoHiding,
hasItems("usage_granted_composite_type", "no_grants_composite_type",
"usage_granted_us_postal_code_domain", "no_grants_us_postal_code_domain"));
diff --git a/pgjdbc/src/test/java/org/postgresql/test/socketfactory/CustomSocketFactory.java b/pgjdbc/src/test/java/org/postgresql/test/socketfactory/CustomSocketFactory.java
index bb94c62218..8b6c2b9260 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/socketfactory/CustomSocketFactory.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/socketfactory/CustomSocketFactory.java
@@ -21,7 +21,7 @@ public class CustomSocketFactory extends SocketFactory {
public CustomSocketFactory(String argument) {
if (instance != null) {
- throw new IllegalStateException("Test failed, multiple custom socket factory instanciation");
+ throw new IllegalStateException("Test failed, multiple custom socket factory instantiation");
}
instance = this;
this.argument = argument;
diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/SingleCertValidatingFactoryTest.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/SingleCertValidatingFactoryTest.java
index 2e510023b7..1ea3b8dbaa 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/ssl/SingleCertValidatingFactoryTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/ssl/SingleCertValidatingFactoryTest.java
@@ -28,7 +28,7 @@ public static void setUp() {
TestUtil.assumeSslTestsEnabled();
}
- // The valid and invalid server SSL certfiicates:
+ // The valid and invalid server SSL certificates:
private static final String goodServerCertPath = "../certdir/goodroot.crt";
private static final String badServerCertPath = "../certdir/badroot.crt";
diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java
index 91150447be..645cf3f4f0 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTest.java
@@ -386,7 +386,7 @@ private boolean assertClientCertificate(SQLException e) {
// message) discovers the alert message (e.g. "Received fatal alert: decrypt_error")
// and converts that to exception.
// That is why "CONNECTION_UNABLE_TO_CONNECT" is listed here for BAD client cert.
- // Ideally, hanshake failure should be detected during the handshake, not after sending the startup
+ // Ideally, handshake failure should be detected during the handshake, not after sending the startup
// message
if (!PSQLState.CONNECTION_FAILURE.getState().equals(e.getSQLState())
&& !(clientCertificate == ClientCertificate.BAD
diff --git a/pgjdbc/src/test/java/org/postgresql/test/xa/XADataSourceTest.java b/pgjdbc/src/test/java/org/postgresql/test/xa/XADataSourceTest.java
index 02bb7caf3a..ca30fbd5b0 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/xa/XADataSourceTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/xa/XADataSourceTest.java
@@ -481,7 +481,7 @@ public void testPreparingPreparedXid() throws Exception {
* with error code {@link XAException#XAER_NOTA}.
*/
@Test
- public void testCommitingCommittedXid() throws Exception {
+ public void testCommittingCommittedXid() throws Exception {
Xid xid = new CustomXid(1);
xaRes.start(xid, XAResource.TMNOFLAGS);
xaRes.end(xid, XAResource.TMSUCCESS);
@@ -587,7 +587,7 @@ public void testOnePhaseCommitOfPrepared() throws Exception {
* {@link XAException} being thrown with error code {@link XAException#XAER_NOTA}.
*/
@Test
- public void testOnePhaseCommitingCommittedXid() throws Exception {
+ public void testOnePhaseCommittingCommittedXid() throws Exception {
Xid xid = new CustomXid(1);
xaRes.start(xid, XAResource.TMNOFLAGS);
xaRes.end(xid, XAResource.TMSUCCESS);
@@ -793,7 +793,7 @@ public void testNetworkIssueOnRollback() throws Exception {
}
/**
- * When using deferred constraints a contraint violation can occur on prepare. This has to be
+ * When using deferred constraints a constraint violation can occur on prepare. This has to be
* mapped to the correct XA Error Code
*/
@Test
diff --git a/pgjdbc/src/test/java/org/postgresql/util/PGPropertyPasswordParserTest.java b/pgjdbc/src/test/java/org/postgresql/util/PGPropertyPasswordParserTest.java
index 805888b1c4..f8176207e4 100644
--- a/pgjdbc/src/test/java/org/postgresql/util/PGPropertyPasswordParserTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/util/PGPropertyPasswordParserTest.java
@@ -35,8 +35,8 @@ class PGPropertyPasswordParserTest {
@Test
void getPassword11() throws Exception {
Resources.with(
- new EnvironmentVariables(PGEnvironment.PGPASSFILE.getName(), "", "APPDATA", "/tmp/dir-non-existent"),
- new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGPASSFILE.getName(), "", "user.home", "/tmp/dir-non-existent")
+ new EnvironmentVariables(PGEnvironment.PGPASSFILE.getName(), "", "APPDATA", "/tmp/dir-nonexistent"),
+ new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGPASSFILE.getName(), "", "user.home", "/tmp/dir-nonexistent")
).execute(() -> {
String result = PGPropertyPasswordParser.getPassword("localhost", "5432", "postgres", "postgres");
assertNull(result);
diff --git a/pgjdbc/src/test/java/org/postgresql/util/PGPropertyServiceParserTest.java b/pgjdbc/src/test/java/org/postgresql/util/PGPropertyServiceParserTest.java
index bc4cb93e84..05898c4848 100644
--- a/pgjdbc/src/test/java/org/postgresql/util/PGPropertyServiceParserTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/util/PGPropertyServiceParserTest.java
@@ -39,9 +39,9 @@ class PGPropertyServiceParserTest {
void pgService11() throws Exception {
Resources.with(
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), "", PGEnvironment.PGSYSCONFDIR.getName(), ""),
- new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-non-existent")
+ new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-nonexistent")
).execute(() -> {
- Properties result = PGPropertyServiceParser.getServiceProperties("service-non-existent");
+ Properties result = PGPropertyServiceParser.getServiceProperties("service-nonexistent");
assertNull(result);
});
}
@@ -57,9 +57,9 @@ void pgService21() throws Exception {
assertNotNull(urlPath);
Resources.with(
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), "", PGEnvironment.PGSYSCONFDIR.getName(), urlPath.getPath()),
- new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-non-existent")
+ new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-nonexistent")
).execute(() -> {
- Properties result = PGPropertyServiceParser.getServiceProperties("service-non-existent");
+ Properties result = PGPropertyServiceParser.getServiceProperties("service-nonexistent");
assertNull(result);
result = PGPropertyServiceParser.getServiceProperties("empty-service1");
assertNotNull(result);
@@ -78,7 +78,7 @@ void pgService22() throws Exception {
assertNotNull(urlPath);
Resources.with(
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), "", PGEnvironment.PGSYSCONFDIR.getName(), urlPath.getPath()),
- new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-non-existent")
+ new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-nonexistent")
).execute(() -> {
Properties result = PGPropertyServiceParser.getServiceProperties("test-service1");
assertNotNull(result);
@@ -100,7 +100,7 @@ void pgService23() throws Exception {
String nonExistingDir = "non-existing-dir";
Resources.with(
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), "", PGEnvironment.PGSYSCONFDIR.getName(), nonExistingDir),
- new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-non-existent")
+ new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", "/tmp/dir-nonexistent")
).execute(() -> {
Properties result = PGPropertyServiceParser.getServiceProperties("test-service1");
assertNull(result);
@@ -121,7 +121,7 @@ void pgService31() throws Exception {
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), "", PGEnvironment.PGSYSCONFDIR.getName(), urlPath.getPath()),
new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", urlPath.getPath())
).execute(() -> {
- Properties result = PGPropertyServiceParser.getServiceProperties("service-non-existent");
+ Properties result = PGPropertyServiceParser.getServiceProperties("service-nonexistent");
assertNull(result);
result = PGPropertyServiceParser.getServiceProperties("empty-service1");
assertNotNull(result);
@@ -168,7 +168,7 @@ void pgService41() throws Exception {
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), urlFileEnv.getFile(), PGEnvironment.PGSYSCONFDIR.getName(), urlPath.getPath()),
new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), "", "user.home", urlPath.getPath())
).execute(() -> {
- Properties result = PGPropertyServiceParser.getServiceProperties("service-non-existent");
+ Properties result = PGPropertyServiceParser.getServiceProperties("service-nonexistent");
assertNull(result);
result = PGPropertyServiceParser.getServiceProperties("empty-service1");
assertNotNull(result);
@@ -239,7 +239,7 @@ void pgService51() throws Exception {
new EnvironmentVariables(PGEnvironment.PGSERVICEFILE.getName(), urlFileEnv.getFile(), PGEnvironment.PGSYSCONFDIR.getName(), urlPath.getPath()),
new SystemProperties(PGEnvironment.ORG_POSTGRESQL_PGSERVICEFILE.getName(), urlFileProps.getFile(), "user.home", urlPath.getPath())
).execute(() -> {
- Properties result = PGPropertyServiceParser.getServiceProperties("service-non-existent");
+ Properties result = PGPropertyServiceParser.getServiceProperties("service-nonexistent");
assertNull(result);
result = PGPropertyServiceParser.getServiceProperties("empty-service1");
assertNotNull(result);