Merge pull request #5 from wildbit/db-init-fix

Fix a failure to create required MySQL tables.
wildbit · Sep 10, 2016 · 46b00fe · 46b00fe
2 parents 9236bf4 + b6c21d9
commit 46b00fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,9 @@ All notable changes to this project are documented in this file. This change log
 ## [Unreleased]
 
 ### Fixed
-- Internal: Fixed possible test failures in non-UTC timezones.
-- Internal: Fixed graceful shutdown test.
+- Fix `queue/initialize!` that fails to create MySQL tables due to index conflict.
+- Internal: Fix possible test failures in non-UTC timezones.
+- Internal: Fix graceful shutdown test.
 
 ### Changed
 - Use JVM time when querying for pending jobs instead of relying on UTC.

diff --git a/src/mysql_queue/core.clj b/src/mysql_queue/core.clj
@@ -304,8 +304,8 @@
 (defn initialize!
   "Create required MySQL tables if they don't exist. Returns true."
   [db-conn]
-  (queries/create-jobs! db-conn)
   (queries/create-scheduled-jobs! db-conn)
+  (queries/create-jobs! db-conn)
   true)
 
 (defn schedule-job

diff --git a/test/mysql_queue/core_test.clj b/test/mysql_queue/core_test.clj
@@ -17,8 +17,7 @@
 
 (defn setup-db
   [f]
-  (queries/create-scheduled-jobs! db-conn)
-  (queries/create-jobs! db-conn)
+  (initialize! db-conn)
   (f))
 
 (defn clean-up