This is an automated email from the ASF dual-hosted git repository.
yiconghuang 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 6f565bb036 chore: move `bin/sql` to `sql` (#3884)
6f565bb036 is described below
commit 6f565bb03621c7aff122ce069db66bd15109dbf5
Author: Yicong Huang <[email protected]>
AuthorDate: Sun Oct 12 21:39:22 2025 -0700
chore: move `bin/sql` to `sql` (#3884)
According to the reorganization plan #3846. This PR moves `bin/sql` out
to root.
resolves #3864
---
.github/workflows/github-action-build.yml | 10 +++++-----
.../org/apache/texera/web/resource/UserConfigResource.scala | 2 +-
.../texera/web/resource/dashboard/UnifiedResourceSchema.scala | 2 +-
.../web/resource/dashboard/user/project/ProjectResource.scala | 2 +-
.../resource/dashboard/user/workflow/WorkflowResource.scala | 2 +-
.../dashboard/user/workflow/WorkflowVersionResource.scala | 2 +-
bin/deployment/single-node/docker-compose.yml | 2 +-
bin/forum/ubuntu-install.sh | 2 +-
.../src/test/scala/org/apache/texera/dao/MockTexeraDB.scala | 2 +-
frontend/src/app/dashboard/type/dashboard-file.interface.ts | 2 +-
{bin/sql => sql}/iceberg_postgres_catalog.sql | 0
{bin/sql => sql}/misc/tweets.sql | 0
{bin/sql => sql}/texera_ddl.sql | 0
{bin/sql => sql}/texera_lakefs.sql | 0
{bin/sql => sql}/updates/01.sql | 0
{bin/sql => sql}/updates/02.sql | 0
{bin/sql => sql}/updates/03.sql | 0
{bin/sql => sql}/updates/04.sql | 0
{bin/sql => sql}/updates/05.sql | 0
{bin/sql => sql}/updates/06.sql | 0
{bin/sql => sql}/updates/07.sql | 0
{bin/sql => sql}/updates/08.sql | 0
{bin/sql => sql}/updates/09.sql | 0
{bin/sql => sql}/updates/10.sql | 0
{bin/sql => sql}/updates/11.sql | 0
{bin/sql => sql}/updates/12.sql | 0
{bin/sql => sql}/updates/13.sql | 0
{bin/sql => sql}/updates/14.sql | 0
{bin/sql => sql}/updates/15.sql | 0
29 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/github-action-build.yml
b/.github/workflows/github-action-build.yml
index 58747e8563..e5f95ff235 100644
--- a/.github/workflows/github-action-build.yml
+++ b/.github/workflows/github-action-build.yml
@@ -110,13 +110,13 @@ jobs:
run: sbt scalafmtCheckAll
- name: Create Databases
run: |
- psql -h localhost -U postgres -f bin/sql/texera_ddl.sql
- psql -h localhost -U postgres -f bin/sql/iceberg_postgres_catalog.sql
- psql -h localhost -U postgres -f bin/sql/texera_lakefs.sql
+ psql -h localhost -U postgres -f sql/texera_ddl.sql
+ psql -h localhost -U postgres -f sql/iceberg_postgres_catalog.sql
+ psql -h localhost -U postgres -f sql/texera_lakefs.sql
env:
PGPASSWORD: postgres
- name: Create texera_db_for_test_cases
- run: psql -h localhost -U postgres -v DB_NAME=texera_db_for_test_cases
-f bin/sql/texera_ddl.sql
+ run: psql -h localhost -U postgres -v DB_NAME=texera_db_for_test_cases
-f sql/texera_ddl.sql
env:
PGPASSWORD: postgres
- name: Compile with sbt
@@ -148,7 +148,7 @@ jobs:
run: sudo systemctl start postgresql
- name: Create Database and User
run: |
- cd bin/sql && sudo -u postgres psql -f iceberg_postgres_catalog.sql
+ cd sql && sudo -u postgres psql -f iceberg_postgres_catalog.sql
- name: Lint with flake8 and black
run: |
cd amber/src/main/python && flake8 && black . --check
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
index 609c6a2cf1..2bf5a7d26a 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.CollectionHasAsScala
* This class handles requests to read and write the user dictionary,
* an abstract collection of (key, value) string pairs that is unique for
each user
* This is accomplished using a mysql table called user_dictionary.
- * The details of user_dictionary can be found in /bin/sql/texera_ddl.sql
+ * The details of user_dictionary can be found in /sql/texera_ddl.sql
*/
@Path("/user/config")
@RolesAllowed(Array("REGULAR", "ADMIN"))
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
index 4162375b26..785640808f 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
@@ -102,7 +102,7 @@ object UnifiedResourceSchema {
}
/**
- * Refer to texera/bin/sql/texera_ddl.sql to understand what each attribute is
+ * Refer to /sql/texera_ddl.sql to understand what each attribute is
*
* Attributes common across all resource types:
* - `resourceType`: The type of the resource (e.g., project, workflow, file)
as a `String`.
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
index 9129bcbec1..08dcff6e40 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
@@ -48,7 +48,7 @@ import scala.jdk.CollectionConverters.IterableHasAsScala
* This file handles various request related to projects.
* It sends mysql queries to the MysqlDB regarding the 'user_project',
* 'workflow_of_project', and 'file_of_project' Tables
- * The details of these tables can be found in /bin/sql/texera_ddl.sql
+ * The details of these tables can be found in /sql/texera_ddl.sql
*/
object ProjectResource {
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
index 64234f4892..01ae898a66 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
@@ -57,7 +57,7 @@ import scala.util.control.NonFatal
/**
* This file handles various request related to saved-workflows.
* It sends mysql queries to the MysqlDB regarding the UserWorkflow Table
- * The details of UserWorkflowTable can be found in /bin/sql/texera_ddl.sql
+ * The details of UserWorkflowTable can be found in /sql/texera_ddl.sql
*/
object WorkflowResource {
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
index cdf9656f1d..6396a68a16 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
@@ -43,7 +43,7 @@ import scala.jdk.CollectionConverters.IterableHasAsScala
/**
* This file handles various request related to workflows versions.
- * The details of the mysql tables can be found in /bin/sql/texera_ddl.sql
+ * The details of the mysql tables can be found in /sql/texera_ddl.sql
*/
object WorkflowVersionResource {
diff --git a/bin/deployment/single-node/docker-compose.yml
b/bin/deployment/single-node/docker-compose.yml
index bf290e509c..858f8b5964 100644
--- a/bin/deployment/single-node/docker-compose.yml
+++ b/bin/deployment/single-node/docker-compose.yml
@@ -46,7 +46,7 @@ services:
volumes:
- postgres_data:/var/lib/postgresql/data
# mount the sql files for initializing the postgres
- - ../../bin/sql:/docker-entrypoint-initdb.d
+ - ../../sql:/docker-entrypoint-initdb.d
# lakeFS is the underlying storage of Texera's dataset service
lakefs:
diff --git a/bin/forum/ubuntu-install.sh b/bin/forum/ubuntu-install.sh
index 4e3183d797..e4d7c11952 100755
--- a/bin/forum/ubuntu-install.sh
+++ b/bin/forum/ubuntu-install.sh
@@ -34,7 +34,7 @@ composer require --working-dir=/opt/flarum fof/byobu:"*"
sudo cp bin/config.php /opt/flarum/config.php
sudo cp bin/.htaccess /opt/flarum/public/.htaccess
sudo chown -R www-data:www-data /opt/flarum
-sudo mysql -u root -p < bin/sql/flarum.sql
+sudo mysql -u root -p < sql/flarum.sql
VHOST_CONF="/etc/apache2/sites-available/flarum.conf"
sudo touch VHOST_CONF
diff --git a/common/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala
b/common/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala
index 4c3464ade7..e13ff696cf 100644
--- a/common/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala
+++ b/common/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala
@@ -84,7 +84,7 @@ trait MockTexeraDB {
dbInstance = Some(embedded)
val ddlPath = {
- Paths.get("bin/sql/texera_ddl.sql").toRealPath()
+ Paths.get("sql/texera_ddl.sql").toRealPath()
}
val source = Source.fromFile(ddlPath.toString)
val content =
diff --git a/frontend/src/app/dashboard/type/dashboard-file.interface.ts
b/frontend/src/app/dashboard/type/dashboard-file.interface.ts
index 233c9a8c1a..3dd5925e34 100644
--- a/frontend/src/app/dashboard/type/dashboard-file.interface.ts
+++ b/frontend/src/app/dashboard/type/dashboard-file.interface.ts
@@ -28,7 +28,7 @@ export interface DashboardFile
* This interface stores the information about the users' files.
* These information is used to locate the file for the operators.
* Corresponds to
`src/main/scala/org/apache/texera/web/resource/dashboard/file/UserFileResource.scala`
(backend);
- * and `bin/sql/texera_ddl.sql`, table `file` (database).
+ * and `sql/texera_ddl.sql`, table `file` (database).
*/
export interface UserFile {
ownerUid: number;
diff --git a/bin/sql/iceberg_postgres_catalog.sql
b/sql/iceberg_postgres_catalog.sql
similarity index 100%
rename from bin/sql/iceberg_postgres_catalog.sql
rename to sql/iceberg_postgres_catalog.sql
diff --git a/bin/sql/misc/tweets.sql b/sql/misc/tweets.sql
similarity index 100%
rename from bin/sql/misc/tweets.sql
rename to sql/misc/tweets.sql
diff --git a/bin/sql/texera_ddl.sql b/sql/texera_ddl.sql
similarity index 100%
rename from bin/sql/texera_ddl.sql
rename to sql/texera_ddl.sql
diff --git a/bin/sql/texera_lakefs.sql b/sql/texera_lakefs.sql
similarity index 100%
rename from bin/sql/texera_lakefs.sql
rename to sql/texera_lakefs.sql
diff --git a/bin/sql/updates/01.sql b/sql/updates/01.sql
similarity index 100%
rename from bin/sql/updates/01.sql
rename to sql/updates/01.sql
diff --git a/bin/sql/updates/02.sql b/sql/updates/02.sql
similarity index 100%
rename from bin/sql/updates/02.sql
rename to sql/updates/02.sql
diff --git a/bin/sql/updates/03.sql b/sql/updates/03.sql
similarity index 100%
rename from bin/sql/updates/03.sql
rename to sql/updates/03.sql
diff --git a/bin/sql/updates/04.sql b/sql/updates/04.sql
similarity index 100%
rename from bin/sql/updates/04.sql
rename to sql/updates/04.sql
diff --git a/bin/sql/updates/05.sql b/sql/updates/05.sql
similarity index 100%
rename from bin/sql/updates/05.sql
rename to sql/updates/05.sql
diff --git a/bin/sql/updates/06.sql b/sql/updates/06.sql
similarity index 100%
rename from bin/sql/updates/06.sql
rename to sql/updates/06.sql
diff --git a/bin/sql/updates/07.sql b/sql/updates/07.sql
similarity index 100%
rename from bin/sql/updates/07.sql
rename to sql/updates/07.sql
diff --git a/bin/sql/updates/08.sql b/sql/updates/08.sql
similarity index 100%
rename from bin/sql/updates/08.sql
rename to sql/updates/08.sql
diff --git a/bin/sql/updates/09.sql b/sql/updates/09.sql
similarity index 100%
rename from bin/sql/updates/09.sql
rename to sql/updates/09.sql
diff --git a/bin/sql/updates/10.sql b/sql/updates/10.sql
similarity index 100%
rename from bin/sql/updates/10.sql
rename to sql/updates/10.sql
diff --git a/bin/sql/updates/11.sql b/sql/updates/11.sql
similarity index 100%
rename from bin/sql/updates/11.sql
rename to sql/updates/11.sql
diff --git a/bin/sql/updates/12.sql b/sql/updates/12.sql
similarity index 100%
rename from bin/sql/updates/12.sql
rename to sql/updates/12.sql
diff --git a/bin/sql/updates/13.sql b/sql/updates/13.sql
similarity index 100%
rename from bin/sql/updates/13.sql
rename to sql/updates/13.sql
diff --git a/bin/sql/updates/14.sql b/sql/updates/14.sql
similarity index 100%
rename from bin/sql/updates/14.sql
rename to sql/updates/14.sql
diff --git a/bin/sql/updates/15.sql b/sql/updates/15.sql
similarity index 100%
rename from bin/sql/updates/15.sql
rename to sql/updates/15.sql
