aherlihy · belamenso · Nov 2, 2024 · Nov 2, 2024 · Nov 10, 2024 · Nov 13, 2024
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,11 @@
+.dockerignore
+.git/
+.gitignore
+target/
+project/target/
+test-results/
+*.md
+*.log
+.bloop/
+.metals/
+.bsp/
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,54 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - better-containerization
+  pull_request:
+    branches:
+      - better-containerization
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Create directories and set permissions
+        run: |
+          mkdir -p test-results
+          mkdir -p target
+          sudo chown -R 1000:1000 test-results
+          sudo chown -R 1000:1000 target
+          sudo chmod -R 777 test-results
+          sudo chmod -R 777 target
+
+      - name: Build and run tests
+        run: |
+          docker compose --profile dbs --profile tests up \
+            --build \
+            --exit-code-from main \
+            --abort-on-container-exit
+
+      - name: Upload test results
+        if: always()  # Run even if tests fail
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: test-results/
+          retention-days: 14
+
+      - name: Check test output for failures
+        run: |
+          if grep -q "Passed: Total .*, Failed 0, Errors 0," test-results/test-output_*.log; then
+            echo "All tests passed!"
+            exit 0
+          else
+            echo "Tests failed!"
+            exit 1
+          fi
+
diff --git a/.gitignore b/.gitignore
@@ -75,3 +75,4 @@ cs
 
 # Coursier test product
 compiler/test-coursier/run/*.jar
+/test-results/
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,43 @@
+FROM debian:12
+
+# Install all packages in one layer, including sbt repository setup
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    curl \
+    unzip \
+    netcat-openbsd \
+    sqlite3 \
+    ca-certificates \
+    gnupg && \
+    echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list && \
+    curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add && \
+    curl -L https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.deb -o jdk.deb && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+    ./jdk.deb \
+    sbt && \
+    rm jdk.deb && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install DuckDB
+RUN curl -L https://github.com/duckdb/duckdb/releases/download/v0.8.1/duckdb_cli-linux-amd64.zip -o duckdb.zip \
+    && unzip duckdb.zip \
+    && mv duckdb /usr/local/bin/ \
+    && chmod +x /usr/local/bin/duckdb \
+    && rm duckdb.zip
+
+# Run as a non-root user
+RUN useradd -m -s /bin/bash appuser \
+    && mkdir -p /app /test-results \
+    && chown -R appuser:appuser /app /test-results
+
+USER appuser
+WORKDIR /app
+COPY --chown=appuser:appuser build.sbt ./
+COPY --chown=appuser:appuser project ./project
+RUN sbt update
+COPY --chown=appuser:appuser start.sh /start.sh
+RUN chmod +x /start.sh
+
+CMD ["/start.sh"]
+
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+# tyql
diff --git a/bench/src/main/scala/QueryBenchmark/ASPSQuery.scala b/bench/src/main/scala/QueryBenchmark/ASPSQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.min
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class ASPSQuery extends QueryBenchmark {
   override def name = "asps"

diff --git a/bench/src/main/scala/QueryBenchmark/AncestryQuery.scala b/bench/src/main/scala/QueryBenchmark/AncestryQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.{IntLit, min}
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class AncestryQuery extends QueryBenchmark {
   override def name = "ancestry"

diff --git a/bench/src/main/scala/QueryBenchmark/AndersensQuery.scala b/bench/src/main/scala/QueryBenchmark/AndersensQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.{IntLit, min}
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class AndersensQuery extends QueryBenchmark {
   override def name = "andersens"

diff --git a/bench/src/main/scala/QueryBenchmark/BOMQuery.scala b/bench/src/main/scala/QueryBenchmark/BOMQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.max
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class BOMQuery extends QueryBenchmark {
   override def name = "bom"

diff --git a/bench/src/main/scala/QueryBenchmark/CBAQuery.scala b/bench/src/main/scala/QueryBenchmark/CBAQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{unrestrictedBagFix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, min}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class CBAQuery extends QueryBenchmark {
   override def name = "cba"

diff --git a/bench/src/main/scala/QueryBenchmark/CSPAQuery.scala b/bench/src/main/scala/QueryBenchmark/CSPAQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.unrestrictedFix
 import tyql.Expr.{IntLit, StringLit, min}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class CSPAQuery extends QueryBenchmark {
   override def name = "cspa"

diff --git a/bench/src/main/scala/QueryBenchmark/CompanyControlQuery.scala b/bench/src/main/scala/QueryBenchmark/CompanyControlQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{fix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, min, sum}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class CompanyControlQuery extends QueryBenchmark {
   override def name = "cc"

diff --git a/bench/src/main/scala/QueryBenchmark/DataflowQuery.scala b/bench/src/main/scala/QueryBenchmark/DataflowQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.{IntLit, min}
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class DataflowQuery extends QueryBenchmark {
   override def name = "dataflow"

diff --git a/bench/src/main/scala/QueryBenchmark/EvenOddQuery.scala b/bench/src/main/scala/QueryBenchmark/EvenOddQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.fix
 import tyql.Expr.{IntLit, StringLit, min}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class EvenOddQuery extends QueryBenchmark {
   override def name = "evenodd"

diff --git a/bench/src/main/scala/QueryBenchmark/JavaPointsTo.scala b/bench/src/main/scala/QueryBenchmark/JavaPointsTo.scala
@@ -15,6 +15,8 @@ import tyql.Query.{fix, unrestrictedFix, unrestrictedBagFix}
 import tyql.Expr.{IntLit, StringLit, min, sum}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class JavaPointsTo extends QueryBenchmark {
   override def name = "javapointsto"

diff --git a/bench/src/main/scala/QueryBenchmark/OrbitsQuery.scala b/bench/src/main/scala/QueryBenchmark/OrbitsQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table, Query}
 import tyql.Expr.max
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class OrbitsQuery extends QueryBenchmark {
   override def name = "orbits"

diff --git a/bench/src/main/scala/QueryBenchmark/PartyQuery.scala b/bench/src/main/scala/QueryBenchmark/PartyQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{unrestrictedBagFix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, count}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class PartyQuery extends QueryBenchmark {
   override def name = "party"

diff --git a/bench/src/main/scala/QueryBenchmark/PointsToCountQuery.scala b/bench/src/main/scala/QueryBenchmark/PointsToCountQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{fix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, min, sum}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class PointsToCountQuery extends QueryBenchmark {
   override def name = "pointstocount"

diff --git a/bench/src/main/scala/QueryBenchmark/SSSPQuery.scala b/bench/src/main/scala/QueryBenchmark/SSSPQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.min
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class SSSPQuery extends QueryBenchmark {
   override def name = "sssp"

diff --git a/bench/src/main/scala/QueryBenchmark/TCQuery.scala b/bench/src/main/scala/QueryBenchmark/TCQuery.scala
@@ -13,6 +13,8 @@ import scalasql.{Table as ScalaSQLTable, Expr, query}
 import scalasql.PostgresDialect.*
 import scalasql.core.SqlStr.SqlStringSyntax
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TCQuery extends QueryBenchmark {
   override def name = "tc"

diff --git a/bench/src/main/scala/QueryBenchmark/TrustChainQuery.scala b/bench/src/main/scala/QueryBenchmark/TrustChainQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{unrestrictedBagFix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, count}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TrustChainQuery extends QueryBenchmark {
   override def name = "trustchain"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/ASPSQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/ASPSQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.min
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOASPSQuery extends QueryBenchmark {
   override def name = "asps"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/AncestryQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/AncestryQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.{IntLit, min}
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOAncestryQuery extends QueryBenchmark {
   override def name = "ancestry"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/AndersensQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/AndersensQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.{IntLit, min}
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOAndersensQuery extends QueryBenchmark {
   override def name = "andersens"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/BOMQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/BOMQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.max
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOBOMQuery extends QueryBenchmark {
   override def name = "bom"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/CBAQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/CBAQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{unrestrictedBagFix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, min}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOCBAQuery extends QueryBenchmark {
   override def name = "cba"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/CSPAQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/CSPAQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.unrestrictedFix
 import tyql.Expr.{IntLit, StringLit, min}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOCSPAQuery extends QueryBenchmark {
   override def name = "cspa"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/CompanyControlQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/CompanyControlQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{fix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, min, sum}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOCompanyControlQuery extends QueryBenchmark {
   override def name = "cc"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/DataflowQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/DataflowQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.{IntLit, min}
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TODataflowQuery extends QueryBenchmark {
   override def name = "dataflow"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/EvenOddQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/EvenOddQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.fix
 import tyql.Expr.{IntLit, StringLit, min}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOEvenOddQuery extends QueryBenchmark {
   override def name = "evenodd"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/JavaPointsTo.scala b/bench/src/main/scala/TimeoutQueryBenchmark/JavaPointsTo.scala
@@ -15,6 +15,8 @@ import tyql.Query.{fix, unrestrictedFix, unrestrictedBagFix}
 import tyql.Expr.{IntLit, StringLit, min, sum}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOJavaPointsTo extends QueryBenchmark {
   override def name = "javapointsto"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/OrbitsQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/OrbitsQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table, Query}
 import tyql.Expr.max
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOOrbitsQuery extends QueryBenchmark {
   override def name = "orbits"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/PartyQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/PartyQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{unrestrictedBagFix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, count}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOPartyQuery extends QueryBenchmark {
   override def name = "party"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/PointsToCountQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/PointsToCountQuery.scala
@@ -15,6 +15,8 @@ import tyql.Query.{fix, unrestrictedFix}
 import tyql.Expr.{IntLit, StringLit, min, sum}
 import Helpers.*
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOPointsToCountQuery extends QueryBenchmark {
   override def name = "pointstocount"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/SSSPQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/SSSPQuery.scala
@@ -14,6 +14,8 @@ import scala.NamedTuple.*
 import tyql.{Ord, Table}
 import tyql.Expr.min
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOSSSPQuery extends QueryBenchmark {
   override def name = "sssp"

diff --git a/bench/src/main/scala/TimeoutQueryBenchmark/TCQuery.scala b/bench/src/main/scala/TimeoutQueryBenchmark/TCQuery.scala
@@ -13,6 +13,8 @@ import scalasql.{Table as ScalaSQLTable, Expr, query}
 import scalasql.PostgresDialect.*
 import scalasql.core.SqlStr.SqlStringSyntax
 
+import tyql.Dialect.ansi.given
+
 @experimental
 class TOTCQuery extends QueryBenchmark {
   override def name = "tc"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -75,3 +75,4 @@ cs

		# Coursier test product
		compiler/test-coursier/run/*.jar
		/test-results/