Merge feature/REL1_6_STABLE/driverchoice into REL1_6_STABLE

Addresses PR #467.
tada · Sep 19, 2023 · 74a8622 · 74a8622
2 parents a0debcd + f7d2d5b
commit 74a8622
Show file tree

Hide file tree

Showing 6 changed files with 635 additions and 188 deletions.
diff --git a/.github/workflows/ci-runnerpg.yml b/.github/workflows/ci-runnerpg.yml
@@ -215,6 +215,8 @@ jobs:
         import static org.postgresql.pljava.packaging.Node.stateMachine;
         import static org.postgresql.pljava.packaging.Node.isVoidResultSet;
         import static org.postgresql.pljava.packaging.Node.s_isWindows;
+        import static
+            org.postgresql.pljava.packaging.Node.NOTHING_OR_PGJDBC_ZERO_COUNT;
         /*
          * Imports that will be needed to serve a jar file over http
          * when the time comes for testing that.
@@ -339,7 +341,9 @@ jobs:
               // state 1: consume any diagnostics, or to state 2 with same item
               (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
 
-              // state 2: must be end of input
+              NOTHING_OR_PGJDBC_ZERO_COUNT, // state 2
+
+              // state 3: must be end of input
               (o,p,q) -> null == o
             );
           }
@@ -566,6 +570,9 @@ jobs:
                 .peek(Node::peek),
 
                 (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+                NOTHING_OR_PGJDBC_ZERO_COUNT,
+                NOTHING_OR_PGJDBC_ZERO_COUNT,
+                NOTHING_OR_PGJDBC_ZERO_COUNT,
                 (o,p,q) -> null == o
               );
 
@@ -598,6 +605,8 @@ jobs:
               .peek(Node::peek),
 
               (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
               (o,p,q) -> null == o
             );
           }
@@ -633,6 +642,7 @@ jobs:
               .peek(Node::peek),
 
               (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
               (o,p,q) -> null == o
             );
 
@@ -647,6 +657,7 @@ jobs:
                 .peek(Node::peek),
 
                 (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+                NOTHING_OR_PGJDBC_ZERO_COUNT,
                 (o,p,q) -> null == o
               );
             }
@@ -672,6 +683,7 @@ jobs:
               .peek(Node::peek),
 
               (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
               (o,p,q) -> null == o
             );
 
@@ -687,6 +699,8 @@ jobs:
               .peek(Node::peek),
 
               (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
               (o,p,q) -> null == o
             );
           }

diff --git a/appveyor.yml b/appveyor.yml
@@ -108,6 +108,8 @@ test_script:
       import static org.postgresql.pljava.packaging.Node.q;
       import static org.postgresql.pljava.packaging.Node.stateMachine;
       import static org.postgresql.pljava.packaging.Node.isVoidResultSet;
+      import static
+        org.postgresql.pljava.packaging.Node.NOTHING_OR_PGJDBC_ZERO_COUNT;
       /*
        * Imports that will be needed to serve a jar file over http
        * when the time comes for testing that.
@@ -221,7 +223,9 @@ test_script:
             // state 1: consume any diagnostics, or show same item to state 2
             (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
 
-            // state 2: must be end of input
+            NOTHING_OR_PGJDBC_ZERO_COUNT, // state 2
+
+            // state 3: must be end of input
             (o,p,q) -> null == o
           );
         }
@@ -448,6 +452,9 @@ test_script:
               .peek(Node::peek),
 
               (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
               (o,p,q) -> null == o
             );
 
@@ -480,6 +487,8 @@ test_script:
             .peek(Node::peek),
 
             (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+            NOTHING_OR_PGJDBC_ZERO_COUNT,
+            NOTHING_OR_PGJDBC_ZERO_COUNT,
             (o,p,q) -> null == o
           );
         }
@@ -515,6 +524,7 @@ test_script:
             .peek(Node::peek),
 
             (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+            NOTHING_OR_PGJDBC_ZERO_COUNT,
             (o,p,q) -> null == o
           );
 
@@ -529,6 +539,7 @@ test_script:
               .peek(Node::peek),
 
               (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+              NOTHING_OR_PGJDBC_ZERO_COUNT,
               (o,p,q) -> null == o
             );
           }
@@ -554,6 +565,7 @@ test_script:
             .peek(Node::peek),
 
             (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+            NOTHING_OR_PGJDBC_ZERO_COUNT,
             (o,p,q) -> null == o
           );
 
@@ -569,6 +581,8 @@ test_script:
             .peek(Node::peek),
 
             (o,p,q) -> isDiagnostic(o, Set.of("error")) ? 1 : -2,
+            NOTHING_OR_PGJDBC_ZERO_COUNT,
+            NOTHING_OR_PGJDBC_ZERO_COUNT,
             (o,p,q) -> null == o
           );
         }

diff --git a/pljava-packaging/pom.xml b/pljava-packaging/pom.xml
@@ -64,6 +64,23 @@
 			</properties>
 		</profile>
 
+		<!--
+		  - Activate this profile just as a convenient way to make Maven
+		  - download the pgjdbc driver. It isn't needed in any way for
+		  - building, but then you will have it in your local Maven repository
+		  - if you want to add it to your classpath for some tests.
+		  -->
+		<profile>
+			<id>pgjdbc</id>
+			<dependencies>
+				<dependency>
+					<groupId>org.postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+					<version>[42.6.0,)</version>
+				</dependency>
+			</dependencies>
+		</profile>
+
 		<!--
 		  - Activate this profile just as a convenient way to make Maven
 		  - download the pgjdbc-ng driver. It isn't needed in any way for