Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into tuple-class
Browse files Browse the repository at this point in the history
* origin/master: (427 commits)
  refactor: make PSQLState enum consts for integrity constraint violations (pgjdbc#1699)
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release REL42.2.10
  pass gpg key through arguments
  add passphrase to release mvn task
  chore: update signing key
  Metadata queries improvment (pgjdbc#1694)
  WIP release notes for 42.2.10 (pgjdbc#1688)
  chore(deps): bump checkstyle from 8.28 to 8.29 in /pgjdbc (pgjdbc#1691)
  Cleanup PGProperty, sort values, and add some missing to docs (pgjdbc#1686)
  fix: Fixes issue pgjdbc#1592 where one thread is reading the copy and another thread closes the connection (pgjdbc#1594)
  Fixing LocalTime rounding (losing precision) (pgjdbc#1570)
  sync error message value with tested value (pgjdbc#1664)
  add DatabaseMetaDataCacheTest to test suite to run it (pgjdbc#1685)
  Fix Network Performance of PgDatabaseMetaData.getTypeInfo() method (pgjdbc#1668)
  fix: Issue pgjdbc#1680 updating a boolean field requires special handling to set it to t or f instead of true or false (pgjdbc#1682)
  fix testSetNetworkTimeoutEnforcement test failure (pgjdbc#1681)
  minor: fix checkstyle violation of unused import (pgjdbc#1683)
  fix: pgjdbc#1677 NumberFormatException when fetching PGInterval with small value (pgjdbc#1678)
  fix: actually use milliseconds instead of microseconds for timeouts (pgjdbc#1653)
  ...
  • Loading branch information
Lőrinc Pap committed Feb 10, 2020
2 parents afe706e + cc31c13 commit 94ff921
Show file tree
Hide file tree
Showing 523 changed files with 42,199 additions and 22,760 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
@@ -0,0 +1,11 @@
root = true

[*]
insert_final_newline = true

[*.java]
indent_style = space
indent_size = 2
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
2 changes: 2 additions & 0 deletions .gitattributes
Expand Up @@ -6,3 +6,5 @@
*.xml text
*.yaml text
*.yml text
/CHANGELOG.md merge=union
/contributors.json merge=union
32 changes: 32 additions & 0 deletions .github/issue_template.md
@@ -0,0 +1,32 @@
**I'm submitting a ...**

<!--- What kind of an issue is this? Put an `x` in all the boxes that apply: -->
- [ ] bug report
- [ ] feature request


**Describe the issue**
A clear and concise description of what the issue is.

**Driver Version?**

**Java Version?**

**OS Version?**

**PostgreSQL Version?**

**To Reproduce**
Steps to reproduce the behaviour:

**Expected behaviour**
A clear and concise description of what you expected to happen.
And what actually happens

**Logs**
If possible PostgreSQL logs surrounding the occurrence of the issue
Additionally logs from the driver can be obtained adding
```java
loggerLevel=TRACE&loggerFile=pgjdbc-trace.log
```
to the connection string
19 changes: 19 additions & 0 deletions .github/pull_request_template.md
@@ -0,0 +1,19 @@
### All Submissions:

* [ ] Have you followed the guidelines in our [Contributing](https://github.com/pgjdbc/pgjdbc/blob/master/CONTRIBUTING.md) document?
* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change?

<!-- You can erase any parts of this template not applicable to your Pull Request. -->

### New Feature Submissions:

1. [ ] Does your submission pass tests?
2. [ ] Does mvn checkstyle:check pass ?
3. [ ] Have you added your new test classes to an existing test suite in alphabetical order?

### Changes to Existing Features:

* [ ] Does this break existing behaviour? If so please explain.
* [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
* [ ] Have you written new tests for your core changes, as applicable?
* [ ] Have you successfully run tests with your changes locally?
2 changes: 2 additions & 0 deletions .gitignore
@@ -1,6 +1,7 @@
.classpath
.settings
.project
.checkstyle
.DS_Store
.externalToolBuilders
build
Expand All @@ -13,6 +14,7 @@ nbproject
*.iws
*.local.properties
*-dist.zip
*.po.~*~
target/
pom.xml.tag
pom.xml.releaseBackup
Expand Down
187 changes: 130 additions & 57 deletions .travis.yml
Expand Up @@ -2,28 +2,53 @@ sudo: false
language: java
dist: trusty

branches:
except:
- /^tmp\/.*/
- /^REL.*/

stages:
- name: test
if: not branch =~ ^release\/.*$
- name: release
# releases pgjdbc for Java 8
# It does set release tag and update pom.xml versions
if: branch =~ ^release\/.*$
- name: release_prev
# releases pgjdbc for Java 6, Java 7
# pgjdbc-jreX requires release pom.xml versions of the main project, so pgjdbc-jreX should be
# released after the release of the main version, thus second stage
if: branch =~ ^release\/.*$

before_script:
- test $(grep "after_n_builds" codecov.yml | tr -d '[:space:]' | cut -d":" -f2) -eq $(grep -e "COVERAGE=Y$" .travis.yml | wc -l) || exit 1
- export PG_DATADIR="/etc/postgresql/${PG_VERSION}/main"
- export PG_SLAVE1_DATADIR="/etc/postgresql/${PG_VERSION}/slave1"
- export PG_SLAVE2_DATADIR="/etc/postgresql/${PG_VERSION}/slave2"
- ./.travis/travis_install_postgres.sh
- test "x$XA" == 'x' || ./.travis/travis_configure_xa.sh
- test "x$REPLICATION" == 'x' || ./.travis/travis_configure_replication.sh
- test "x$SSLTEST" == 'x' || ./.travis/travis_configure_ssl.sh
- ./.travis/travis_start_postgres.sh
- psql -U postgres -c "create user test with password 'test';"
- test "x$PG_VERSION" != 'xHEAD' || psql -U postgres -c "set password_encryption='scram-sha-256'; create user test with password 'test';"
- test "x$PG_VERSION" = 'xHEAD' || psql -U postgres -c "create user test with password 'test';"
- test "x$REPLICATION" == 'x' || psql -U postgres -c "alter user test with replication;"
- psql -c 'create database test owner test;' -U postgres
- echo "MAVEN_OPTS='-Xmx1g -Dgpg.skip=true'" > ~/.mavenrc
- test "x$SSLTEST" == 'x' || ./.travis/travis_ssl_users.sh
- test "x$REPLICATION" == 'x' || ./.travis/travis_create_slaves.sh
- if [[ $TRAVIS_BRANCH == release/* ]]; then echo "MAVEN_OPTS='-Xmx1g'" > ~/.mavenrc; else echo "MAVEN_OPTS='-Xmx1g -Dgpg.skip=true'" > ~/.mavenrc; fi
- test "x$PG_VERSION" == 'x' || test "x$NO_HSTORE" == 'xY' || psql test -c 'CREATE EXTENSION hstore;' -U postgres
- test "x$PG_VERSION" == 'x' || test "x$CREATE_PLPGSQL" == 'x' || createlang -U postgres plpgsql test
- test "x$PG_VERSION" == 'x' || test "x$PLPGSQL_EXTENSION" == 'x' || psql test -c 'CREATE EXTENSION IF NOT EXISTS plpgsql;' -U postgres

env:
global:
- secure: "3HRd+UJQzXoxmBAiJ8SLFuYK8NvMVgIs0erfcPdgvtfFGTPkH3XMONfNr2VE2uz6qwUB5GWkVzvS4c9CPbnnft9QhyYeeUINiqQMN5+6AN5re3C2D7VQMm3NSB+T2R6zS/18UZW5tIoTJILgl5oRCQFI7RSpqhvZ8nqPxJ4gptI="
- secure: "VrNgbyKQi5HjSMZfkt/zwG+AHk1NW1b+f3Jo1ZH7DCqcgLApwvp4MNsw+XamqHxudjj3Z8+4bYBxG2H6zIOobIyYhBvxUwMq7HTjM4jH8m5phqvQIWZOzZzqguYNNS7JJQUpIMwR7wTuHqucVfMxljoSuXQbs+0BUxo4Eh+FScQ="
- secure: "NI+aqwRLLVt2feJdk/2ZEZnsaPyu+vOx8MahVxjz0UUVvRHVqxM5O1M0R53NJfEeIjflOzgZJwRLqgyl6dkdfjytRhaHWGptQdehV4cwNb+4epnn8WlpRzMac65zTQqnbGVtw9jissDQv6/Zl/+D+DMcU65BbFZkix40whILXG0="

before_install:
- ./.travis/travis_install_zulu.sh
- test -z "${ZULU_JDK}" || export JDK${ZULU_JDK}_HOME=/usr/lib/jvm/zulu-${ZULU_JDK}-amd64
- unset _JAVA_OPTIONS # see https://github.com/travis-ci/travis-ci/issues/8408

script:
# make sure previous build artifacts are not used for subsequent builds
Expand All @@ -35,7 +60,8 @@ script:
- test -d "${JDK9_HOME}" || export JDK9_HOME=$(jdk_switcher home oraclejdk8) # JDK9 missing on precise, fallback to JDK8
- envsubst < toolchains.xml > ~/.m2/toolchains.xml
- test ${JDK} -eq 9 || jdk_switcher use oraclejdk8 # Run Maven with Java 8, build with Toolchains.
- ./.travis/travis_build.sh
- test -z "${ZULU_JDK}" || export TRAVIS_JDK_VERSION=zulujdk${ZULU_JDK} # trick codecov to use correct jdk version
- if [[ $TRAVIS_BRANCH == release/* ]]; then .travis/travis_release.sh; else ./.travis/travis_build.sh; fi
- ./.travis/travis_check_postgres_health.sh
# To avoid useless S3 cache updates (https://github.com/travis-ci/travis-ci/issues/1441#issuecomment-67607074)
#- mkdir /tmp/cache-trick
Expand All @@ -60,29 +86,80 @@ cache:
matrix:
fast_finish: true
include:
- jdk: oraclejdk8
- stage: test
jdk: oraclejdk8
env: RUN_CHECKSTYLE=true
script: mvn checkstyle:check
- env:
- FEDORA_CI=Y
services:
- docker
if: type != pull_request
- jdk: openjdk-ea
sudo: required
addons:
postgresql: "10"
env:
- PG_VERSION=10
- JDK=12
- TZ=America/New_York # flips between −05:00 and −04:00
- jdk: openjdk-ea
sudo: required
addons:
postgresql: "11"
env:
- PG_VERSION=11
- XA=true
- COVERAGE=Y
- NO_HSTORE=Y
- PLPGSQL_EXTENSION=Y
- jdk: oraclejdk9
sudo: required
addons:
postgresql: "11"
env:
- PG_VERSION=11
- XA=true
- COVERAGE=Y
- NO_HSTORE=Y
- PLPGSQL_EXTENSION=Y
- JDK=9
- jdk: oraclejdk8
sudo: required
addons:
postgresql: "11"
env:
- PG_VERSION=11
- XA=true
- COVERAGE=Y
- NO_HSTORE=Y
- PLPGSQL_EXTENSION=Y
- JDK=8
- jdk: oraclejdk11
sudo: required
addons:
postgresql: "10"
env:
- PG_VERSION=10
- JDK=11
- TZ=America/New_York # flips between −05:00 and −04:00
- jdk: oraclejdk9
addons:
apt:
packages:
- oracle-java9-installer # Test with latest update
postgresql: "9.6"
env:
- PG_VERSION=9.6
- JDK=9
- TZ=America/New_York # flips between −05:00 and −04:00
- jdk: oraclejdk8
sudo: required
env:
- PG_VERSION=HEAD
- XA=true
- REPLICATION=Y
- COVERAGE=Y
- TEST_CLIENTS=Y
- TZ=Pacific/Chatham # flips between +12:45 and +13:45
- JDK=8
- jdk: oraclejdk8
sudo: required
addons:
Expand All @@ -103,96 +180,92 @@ matrix:
- PG_VERSION=9.5
- XA=true
- REPLICATION=Y
- JDK=8
- jdk: oraclejdk8
sudo: required
addons:
apt:
packages:
- oracle-java8-installer # Test with latest update
postgresql: "9.4"
env:
- PG_VERSION=9.4
- LATEST_JAVA_UPDATE=Y # Use Travis last Java update
- XA=true
- REPLICATION=Y
- QUERY_MODE=extendedCacheEverything
- COVERAGE=Y
- TZ=Europe/Moscow # +03:00, no DST
- JDK=8
- jdk: oraclejdk8
sudo: required
addons:
postgresql: "10"
env:
- PG_VERSION=8.4
- XA=true
- PG_VERSION=10
- SSLTEST=Y
- COVERAGE=Y
- NO_HSTORE=Y
- CREATE_PLPGSQL=Y
- jdk: oraclejdk8
- JDK=8
- jdk: openjdk7
sudo: required
dist: precise
addons:
postgresql: "9.2"
env:
- PG_VERSION=8.3
- XA=true
- PG_VERSION=9.2
- ZULU_JDK=7
- MCENTRAL=Y
- COVERAGE=Y
- NO_HSTORE=Y
- CREATE_PLPGSQL=Y
- TZ=UTC
- jdk: openjdk7
sudo: required
addons:
postgresql: "9.1"
env:
- PG_VERSION=9.1
- ZULU_JDK=6
- MCENTRAL=Y
- jdk: oraclejdk8
sudo: required
dist: precise
env:
- PG_VERSION=8.2
- PG_VERSION=8.4
- XA=true
- COVERAGE=Y
- NO_HSTORE=Y
- CREATE_PLPGSQL=Y
- jdk: oraclejdk8
addons:
postgresql: "9.6"
env:
- PG_VERSION=9.6
- TEST_CLIENTS=Y
- jdk: oraclejdk8
addons:
postgresql: "9.6"
env:
- PG_VERSION=9.6
- QUERY_MODE=simple
- COVERAGE=Y
- ANORM_SBT=Y
- TEST_CLIENTS=Y
- JDK=8
- jdk: oraclejdk8
addons:
postgresql: "9.6"
postgresql: "9.3"
env:
- PG_VERSION=9.6
- PG_VERSION=9.3
- QUERY_MODE=extendedForPrepared
- COVERAGE=Y
- JDK=8
- jdk: oraclejdk8
addons:
postgresql: "9.5"
env:
- PG_VERSION=9.5
- NO_WAFFLE_NO_OSGI=Y
- JDOC=Y
- jdk: openjdk7
sudo: required
addons:
postgresql: "9.4"
env:
- PG_VERSION=9.4
- ZULU_JDK=7
- MCENTRAL=Y
- jdk: openjdk7
sudo: required
addons:
postgresql: "9.3"
- NO_WAFFLE_NO_OSGI=Y
- JDK=8
- stage: release
jdk: oraclejdk8
env:
- PG_VERSION=9.3
- ZULU_JDK=7
- jdk: openjdk6
- PG_VERSION=9.6
- stage: release_prev
jdk: openjdk7
sudo: required
addons:
postgresql: "9.2"
env:
- PG_VERSION=9.2
- ZULU_JDK=6
- MCENTRAL=Y
- jdk: openjdk6
- ZULU_JDK=7
- stage: release_prev
jdk: openjdk7
sudo: required
addons:
postgresql: "9.1"
env:
- PG_VERSION=9.1
- ZULU_JDK=6
Expand Down
Binary file added .travis/secrets.tar.gpg
Binary file not shown.

0 comments on commit 94ff921

Please sign in to comment.