From ada3c7f7cee967145c0c767f5df0bc3b8f1a0372 Mon Sep 17 00:00:00 2001
From: Manuel Rigger <manuel.rigger@inf.ethz.ch>
Date: Sun, 24 Jan 2021 10:08:05 +0100
Subject: [PATCH 1/2] Publish releases also at Docker Hub

---
 .../{maven-central.yml => release.yml}        | 21 ++++++++++++++++++-
 Dockerfile                                    |  9 ++++++++
 pom.xml                                       |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 rename .github/workflows/{maven-central.yml => release.yml} (53%)
 create mode 100644 Dockerfile

diff --git a/.github/workflows/maven-central.yml b/.github/workflows/release.yml
similarity index 53%
rename from .github/workflows/maven-central.yml
rename to .github/workflows/release.yml
index 6eabf6e64..7777bdb6c 100644
--- a/.github/workflows/maven-central.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Publish package to the Maven Central Repository
+name: Publish package to the Maven Central Repository and Docker Hub
 on:
   release:
     types: [created]
@@ -21,3 +21,22 @@ jobs:
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build SQLancer
+        run: mvn -B package -DskipTests=true
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: mrigger/sqlancer
+          tag_with_ref: true
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..54f3aacaf
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:21.04
+
+RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install openjdk-15-jdk maven --yes --no-install-recommends
+
+# assumes that the project has already been built
+COPY target/sqlancer-*.jar sqlancer.jar
+COPY target/lib/*.jar /lib/
+
+ENTRYPOINT ["java", "-jar", "sqlancer.jar"]
diff --git a/pom.xml b/pom.xml
index d77d9c9cf..cad27b03c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sqlancer</groupId>
   <artifactId>sqlancer</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
   <name>SQLancer</name>
   <url>http://www.sqlancer.com/</url>
   <description>SQLancer finds logic bugs in Database Management Systems through automatic testing</description>

From 72f6a3910220bb454f2a9e3961a1e5cb16669639 Mon Sep 17 00:00:00 2001
From: Manuel Rigger <manuel.rigger@inf.ethz.ch>
Date: Sun, 24 Jan 2021 10:22:36 +0100
Subject: [PATCH 2/2] Fix a new expected Postgres error

This fixes a "ERROR: child column "c0" specifies generation expression" error that occurred in the CI checks.
---
 src/sqlancer/postgres/gen/PostgresTableGenerator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sqlancer/postgres/gen/PostgresTableGenerator.java b/src/sqlancer/postgres/gen/PostgresTableGenerator.java
index 823cc916b..05e1e62ba 100644
--- a/src/sqlancer/postgres/gen/PostgresTableGenerator.java
+++ b/src/sqlancer/postgres/gen/PostgresTableGenerator.java
@@ -198,6 +198,7 @@ private void generateInherits() {
             errors.add("cannot inherit from partitioned table");
             errors.add("has a collation conflict");
             errors.add("inherits conflicting default values");
+            errors.add("specifies generation expression");
         }
     }