This is an automated email from the ASF dual-hosted git repository.
linxinyuan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new db4f0397d2 feat: automate JOOQ code generation in SBT build process
(#3746)
db4f0397d2 is described below
commit db4f0397d256eb25f7e3db414c07c632c6cb8c09
Author: Seongjin Yoon <[email protected]>
AuthorDate: Fri Sep 19 17:10:19 2025 -0700
feat: automate JOOQ code generation in SBT build process (#3746)
**Description:**
Integrate JOOQ code generation into SBT build system
**Changes:**
Add JOOQ generation task using SBT source generators that run before
compilation
Add JOOQ dependencies required for build time code generation
Co-authored-by: Seongjin Yoon <[email protected]>
Co-authored-by: Xinyuan Lin <[email protected]>
---
core/dao/build.sbt | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
core/project/plugins.sbt | 9 +++++-
2 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/core/dao/build.sbt b/core/dao/build.sbt
index de15544204..1907eb8142 100644
--- a/core/dao/build.sbt
+++ b/core/dao/build.sbt
@@ -36,6 +36,79 @@ ThisBuild / conflictManager := ConflictManager.latestRevision
// Restrict parallel execution of tests to avoid conflicts
Global / concurrentRestrictions += Tags.limit(Tags.Test, 1)
+/////////////////////////////////////////////////////////////////////////////
+// JOOQ Code Generation
+/////////////////////////////////////////////////////////////////////////////
+
+// Define JOOQ generation task
+lazy val jooqGenerate = taskKey[Seq[File]]("Generate JOOQ sources")
+
+jooqGenerate := {
+ val log = streams.value.log
+ log.info("Generating JOOQ classes...")
+
+ try {
+ import com.typesafe.config.{Config, ConfigFactory, ConfigParseOptions}
+ import org.jooq.codegen.GenerationTool
+ import org.jooq.meta.jaxb.{Configuration, Jdbc}
+ import java.nio.file.{Files, Path}
+ import java.io.File
+
+ // Load jOOQ configuration XML (absolute path from DAO project)
+ val jooqXmlPath: Path =
+
baseDirectory.value.toPath.resolve("src").resolve("main").resolve("resources").resolve("jooq-conf.xml")
+ val jooqConfig: Configuration =
GenerationTool.load(Files.newInputStream(jooqXmlPath))
+
+ // Load storage.conf from the config project
+ val storageConfPath: Path = baseDirectory.value.toPath
+ .getParent
+ .resolve("config")
+ .resolve("src")
+ .resolve("main")
+ .resolve("resources")
+ .resolve("storage.conf")
+
+ val conf: Config = ConfigFactory
+ .parseFile(
+ new File(storageConfPath.toString),
+ ConfigParseOptions.defaults().setAllowMissing(false)
+ )
+ .resolve()
+
+ // Extract JDBC configuration
+ val jdbcConfig = conf.getConfig("storage.jdbc")
+
+ val jooqJdbcConfig = new Jdbc
+ jooqJdbcConfig.setDriver("org.postgresql.Driver")
+ // Skip all the query params, otherwise it will omit the "texera_db."
prefix on the field names.
+ jooqJdbcConfig.setUrl(jdbcConfig.getString("url").split('?').head)
+ jooqJdbcConfig.setUsername(jdbcConfig.getString("username"))
+ jooqJdbcConfig.setPassword(jdbcConfig.getString("password"))
+
+ jooqConfig.setJdbc(jooqJdbcConfig)
+
+ // Generate the code
+ GenerationTool.generate(jooqConfig)
+ log.info("JOOQ code generation completed successfully")
+
+ // Return the generated files
+ val generatedDir = baseDirectory.value / "src" / "main" / "scala" / "edu"
/ "uci" / "ics" / "texera" / "dao" / "jooq" / "generated"
+ if (generatedDir.exists()) {
+ (generatedDir ** "*.java").get ++ (generatedDir ** "*.scala").get
+ } else {
+ Seq.empty
+ }
+ } catch {
+ case e: Exception =>
+ log.warn(s"JOOQ code generation failed: ${e.getMessage}")
+ log.warn("Continuing compilation with existing generated files...")
+ Seq.empty
+ }
+}
+
+// Add JOOQ generation to source generators
+Compile / sourceGenerators += jooqGenerate
+
/////////////////////////////////////////////////////////////////////////////
// Compiler Options
diff --git a/core/project/plugins.sbt b/core/project/plugins.sbt
index 0dd020e7f2..10ff078689 100644
--- a/core/project/plugins.sbt
+++ b/core/project/plugins.sbt
@@ -21,4 +21,11 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.1"
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1")
// for scalapb code gen
-addSbtPlugin("org.typelevel" % "sbt-fs2-grpc" % "2.5.0")
\ No newline at end of file
+addSbtPlugin("org.typelevel" % "sbt-fs2-grpc" % "2.5.0")
+
+// JOOQ dependencies for code generation
+libraryDependencies ++= Seq(
+ "org.jooq" % "jooq-codegen" % "3.16.23",
+ "com.typesafe" % "config" % "1.4.3",
+ "org.postgresql" % "postgresql" % "42.7.4"
+)
\ No newline at end of file
