This is an automated email from the ASF dual-hosted git repository. linxinyuan pushed a commit to branch xinyuan-remove-jooq-gen in repository https://gitbox.apache.org/repos/asf/texera.git
commit 81c6430eb7f9cad1ace63759e8c2a3daa80dcb47 Author: Xinyuan Lin <[email protected]> AuthorDate: Sat Sep 20 19:13:18 2025 -0700 init --- core/dao/build.sbt | 12 +--- .../edu/uci/ics/texera/dao/JooqCodeGenerator.scala | 67 ---------------------- 2 files changed, 1 insertion(+), 78 deletions(-) diff --git a/core/dao/build.sbt b/core/dao/build.sbt index 1907eb8142..b40e1fb1f9 100644 --- a/core/dao/build.sbt +++ b/core/dao/build.sbt @@ -169,14 +169,4 @@ libraryDependencies ++= Seq( libraryDependencies ++= Seq( "org.jooq" % "jooq" % "3.16.23", - "org.jooq" % "jooq-codegen" % "3.16.23" -) - -///////////////////////////////////////////////////////////////////////////// -// Additional Dependencies -///////////////////////////////////////////////////////////////////////////// - -libraryDependencies ++= Seq( - "org.postgresql" % "postgresql" % "42.7.4", - "com.typesafe" % "config" % "1.4.3" // config reader -) +) \ No newline at end of file diff --git a/core/dao/src/main/scala/edu/uci/ics/texera/dao/JooqCodeGenerator.scala b/core/dao/src/main/scala/edu/uci/ics/texera/dao/JooqCodeGenerator.scala deleted file mode 100644 index bd7010ce0e..0000000000 --- a/core/dao/src/main/scala/edu/uci/ics/texera/dao/JooqCodeGenerator.scala +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package edu.uci.ics.texera.dao - -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 - -object JooqCodeGenerator { - @throws[Exception] - def main(args: Array[String]): Unit = { - // Load jOOQ configuration XML - val jooqXmlPath: Path = - Path.of("dao").resolve("src").resolve("main").resolve("resources").resolve("jooq-conf.xml") - val jooqConfig: Configuration = GenerationTool.load(Files.newInputStream(jooqXmlPath)) - - // Load storage.conf from the specified path - val storageConfPath: Path = Path - .of("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) - } -}
