Merge pull request #62 from PgBulkInsert/github-actions

template based maven build

Author: jonfreedman

.github/workflows/maven.yml

@@ -0,0 +1,39 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: password
+          TZ: UTC
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+      working-directory: ./PgBulkInsert

PgBulkInsert/pgbulkinsert-core/src/test/java/de/bytefish/pgbulkinsert/test/pgsql/handlers/RangeTypesTest.java

@@ -14,10 +14,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -265,8 +262,8 @@ public void test_SaveTsTzRange_Inclusive_Bounds() throws SQLException {
         // Range to insert:
         RangeEntity entity0 = new RangeEntity();
 
-        ZonedDateTime lower = ZonedDateTime.of(2020, 1, 1, 0, 0, 0 ,0,  ZoneId.of("GMT"));
-        ZonedDateTime upper = ZonedDateTime.of(2020, 3, 1, 0, 0, 0 ,0,  ZoneId.of("GMT"));
+        ZonedDateTime lower = ZonedDateTime.of(2020, 1, 1, 0, 0, 0 ,0, ZoneOffset.UTC);
+        ZonedDateTime upper = ZonedDateTime.of(2020, 3, 1, 0, 0, 0 ,0, ZoneOffset.UTC);
 
         entity0.timeTzRange = new Range<>(lower, upper);
 
@@ -283,7 +280,7 @@ public void test_SaveTsTzRange_Inclusive_Bounds() throws SQLException {
         while (rs.next()) {
             PGobject v0 = (PGobject) rs.getObject("col_tstzrange");
 
-            Assert.assertEquals("[\"2020-01-01 01:00:00+01\",\"2020-03-01 01:00:00+01\"]", v0.getValue());
+            Assert.assertEquals("[\"2020-01-01 00:00:00+00\",\"2020-03-01 00:00:00+00\"]", v0.getValue());
         }
     }
 
@@ -296,7 +293,7 @@ public void test_SaveTsTzRange_UpperBound_Null() throws SQLException {
         // Range to insert:
         RangeEntity entity0 = new RangeEntity();
 
-        ZonedDateTime lower = ZonedDateTime.of(2020, 1, 1, 0, 0, 0 ,0,  ZoneId.of("GMT"));
+        ZonedDateTime lower = ZonedDateTime.of(2020, 1, 1, 0, 0, 0 ,0, ZoneOffset.UTC);
         ZonedDateTime upper = null;
 
         entity0.timeTzRange = new Range<>(lower, upper);
@@ -314,7 +311,7 @@ public void test_SaveTsTzRange_UpperBound_Null() throws SQLException {
         while (rs.next()) {
             PGobject v0 = (PGobject) rs.getObject("col_tstzrange");
 
-            Assert.assertEquals("[\"2020-01-01 01:00:00+01\",)", v0.getValue());
+            Assert.assertEquals("[\"2020-01-01 00:00:00+00\",)", v0.getValue());
         }
     }
 
@@ -328,7 +325,7 @@ public void test_SaveTsTzRange_LowerBound_Null() throws SQLException {
         RangeEntity entity0 = new RangeEntity();
 
         ZonedDateTime lower = null;
-        ZonedDateTime upper = ZonedDateTime.of(2020, 1, 1, 0, 0, 0 ,0,  ZoneId.of("GMT"));
+        ZonedDateTime upper = ZonedDateTime.of(2020, 1, 1, 0, 0, 0 ,0, ZoneOffset.UTC);
 
         entity0.timeTzRange = new Range<>(lower, upper);
 
@@ -345,7 +342,7 @@ public void test_SaveTsTzRange_LowerBound_Null() throws SQLException {
         while (rs.next()) {
             PGobject v0 = (PGobject) rs.getObject("col_tstzrange");
 
-            Assert.assertEquals("(,\"2020-01-01 01:00:00+01\"]", v0.getValue());
+            Assert.assertEquals("(,\"2020-01-01 00:00:00+00\"]", v0.getValue());
         }
     }
 

PgBulkInsert/pgbulkinsert-core/src/test/resources/db.properties

@@ -1,4 +1,4 @@
-db.url=jdbc:postgresql://127.0.0.1:5432/sampledb
-db.user=philipp
-db.password=test_pwd
+db.url=jdbc:postgresql://localhost:5432/postgres
+db.user=postgres
+db.password=password
 db.schema=public

PgBulkInsert/pgbulkinsert-jpa/src/test/java/de/bytefish/pgbulkinsert/test/jpa/JpaMappingTests.java

@@ -34,7 +34,7 @@ public enum SampleEntityTypeEnum {
     }
 
     @Entity
-    @Table(name = "unit_test", schema = "sample")
+    @Table(name = "unit_test", schema = "public")
     public class SampleEntity {
 
         @Id
@@ -242,7 +242,7 @@ private List<SampleEntity> getSampleEntityList(int num) {
 
     private boolean createTable() throws SQLException {
 
-        String sqlStatement = "CREATE TABLE sample.unit_test" +
+        String sqlStatement = "CREATE TABLE public.unit_test" +
                 "            (\n" +
                 "                id int8,\n" +
                 "                int_field int4,\n" +
@@ -259,7 +259,7 @@ private boolean createTable() throws SQLException {
     }
 
     private ResultSet getAll() throws SQLException {
-        String sqlStatement = "SELECT * FROM sample.unit_test";
+        String sqlStatement = "SELECT * FROM public.unit_test";
 
         Statement statement = connection.createStatement();
 
@@ -270,7 +270,7 @@ private int getRowCount() throws SQLException {
 
         Statement s = connection.createStatement();
 
-        ResultSet r = s.executeQuery(String.format("SELECT COUNT(*) AS rowcount FROM sample.unit_test"));
+        ResultSet r = s.executeQuery(String.format("SELECT COUNT(*) AS rowcount FROM public.unit_test"));
         r.next();
         int count = r.getInt("rowcount");
         r.close();

PgBulkInsert/pgbulkinsert-jpa/src/test/java/de/bytefish/pgbulkinsert/test/jpa/annotations/PostgresDataTypeTests.java

@@ -19,7 +19,7 @@
 public class PostgresDataTypeTests extends TransactionalTestBase {
 
     @Entity
-    @Table(name = "unit_test", schema = "sample")
+    @Table(name = "unit_test", schema = "public")
     public class SampleEntity {
 
         @Id
@@ -82,7 +82,7 @@ public void writeShortAsIntValueTest() throws SQLException {
 
     private boolean createTable() throws SQLException {
 
-        String sqlStatement = "CREATE TABLE sample.unit_test" +
+        String sqlStatement = "CREATE TABLE public.unit_test" +
                 "            (\n" +
                 "                id int8,\n" +
                 "                int_field int4\n" +
@@ -94,7 +94,7 @@ private boolean createTable() throws SQLException {
     }
 
     private ResultSet getAll() throws SQLException {
-        String sqlStatement = "SELECT * FROM sample.unit_test";
+        String sqlStatement = "SELECT * FROM public.unit_test";
 
         Statement statement = connection.createStatement();
 
@@ -105,7 +105,7 @@ private int getRowCount() throws SQLException {
 
         Statement s = connection.createStatement();
 
-        ResultSet r = s.executeQuery(String.format("SELECT COUNT(*) AS rowcount FROM sample.unit_test"));
+        ResultSet r = s.executeQuery(String.format("SELECT COUNT(*) AS rowcount FROM public.unit_test"));
         r.next();
         int count = r.getInt("rowcount");
         r.close();