Merge pull request #34593: Fix sql:jdbc tests and shell entry

Fix sql:jdbc tests and shell entry

Author: Amar3tto

.github/trigger_files/beam_PostCommit_SQL.json

@@ -0,0 +1 @@
+{}

build.gradle.kts

@@ -382,7 +382,6 @@ tasks.register("sqlPreCommit") {
   dependsOn(":sdks:java:extensions:sql:jdbc:build")
   dependsOn(":sdks:java:extensions:sql:jdbc:preCommit")
   dependsOn(":sdks:java:extensions:sql:perf-tests:build")
-  dependsOn(":sdks:java:extensions:sql:shell:build")
   dependsOn(":sdks:java:extensions:sql:udf-test-provider:build")
   dependsOn(":sdks:java:extensions:sql:udf:build")
   dependsOn(":sdks:java:extensions:sql:zetasql:build")

sdks/java/extensions/sql/jdbc/build.gradle

@@ -18,7 +18,10 @@ import groovy.json.JsonOutput
  * limitations under the License.
  */
 
-plugins { id 'org.apache.beam.module' }
+plugins {
+  id 'org.apache.beam.module'
+  id 'application'
+}
 applyJavaNature( automaticModuleName: 'org.apache.beam.sdk.extensions.sql.jdbc',
   exportJavadoc: false,
   testShadowJar: true,
@@ -37,14 +40,26 @@ dependencies {
   implementation "sqlline:sqlline:1.4.0"
   implementation library.java.vendored_calcite_1_28_0
   permitUnusedDeclared library.java.vendored_calcite_1_28_0
-  testImplementation project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntimeMigration")
+  testImplementation project(path: ":sdks:java:core", configuration: "shadow")
+  testImplementation project(path: ":sdks:java:io:google-cloud-platform")
+  testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core")
+  testImplementation library.java.jackson_databind
+  testImplementation library.java.joda_time
   testImplementation library.java.junit
   testImplementation library.java.vendored_guava_32_1_2_jre
   // Depending on outputs so integrationTest can run with only test dependencies.
   // This enables us to test the JDBC jar being loaded on a custom classloader.
   integrationTest sourceSets.test.output
   integrationTest sourceSets.main.output
   integrationTest library.java.junit
+
+  if (project.hasProperty("beam.sql.shell.bundled")) {
+    project.getProperty("beam.sql.shell.bundled").tokenize(",").each {
+      subproject ->
+        implementation project(path: subproject)
+        permitUnusedDeclared project(path: subproject)
+    }
+  }
 }
 
 processResources {
@@ -107,3 +122,29 @@ task postCommit {
   description = "Various integration tests"
   dependsOn endToEndTest
 }
+
+processResources {
+  filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
+          'beam.version': version,
+  ]
+}
+
+/**
+ * Gradle console will interfere with SQL shell, so to run this command
+ * we need to configure it:
+ *  - disable daemon with '--no-daemon';
+ *  - decrease verbosity with '--console plain';
+ *  - quiet it with '-q';
+ *
+ * So, correct gradle invocation to start the SQL shell
+ * looks something like this:
+ *
+ *   ./gradlew :sdks:java:extensions:sql:jdbc:run --console plain -q --no-daemon
+ *
+ * To add extra Beam project, set subproject property like
+ * `-Pbeam.sql.shell.bundled="sdks:java:extensions:sql:hcatalog"`
+ */
+run {
+  mainClassName = "org.apache.beam.sdk.extensions.sql.jdbc.BeamSqlLine"
+  standardInput System.in
+}

sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineIT.java

@@ -48,7 +48,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -103,7 +102,6 @@ public void tearDown() {
   }
 
   @Test
-  @Ignore("https://jira.apache.org/jira/browse/BEAM-7582")
   public void testSelectFromPubsub() throws Exception {
     String[] args =
         buildArgs(
@@ -138,7 +136,6 @@ public void testSelectFromPubsub() throws Exception {
   }
 
   @Test
-  @Ignore("https://jira.apache.org/jira/browse/BEAM-7582")
   public void testFilterForSouthManhattan() throws Exception {
     String[] args =
         buildArgs(

sdks/java/extensions/sql/shell/build.gradle

@@ -198,7 +198,6 @@ include(":sdks:java:extensions:sql")
 include(":sdks:java:extensions:sql:payloads")
 include(":sdks:java:extensions:sql:perf-tests")
 include(":sdks:java:extensions:sql:jdbc")
-include(":sdks:java:extensions:sql:shell")
 include(":sdks:java:extensions:sql:hcatalog")
 include(":sdks:java:extensions:sql:datacatalog")
 include(":sdks:java:extensions:sql:zetasql")