[1524] Fix exception when evolutions has errors.

[1375] Update to Junit 4.10
playframework · May 29, 2012 · 4093655 · 4093655
1 parent bc77610
commit 4093655
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/framework/dependencies.yml b/framework/dependencies.yml
@@ -29,7 +29,7 @@ require:    &allDependencies
     - javax.inject 1.0
     - jaxen 1.1
     - joda-time 2.1 
-    - junit 4.8.1
+    - junit 4.10
     - jregex 1.2_01
     - log4j 1.2.16
     - net.sf.ehcache -> ehcache-core 2.4.3

diff --git a/framework/lib/junit-4.10.jar b/framework/lib/junit-4.10.jar
diff --git a/framework/lib/junit-4.8.1.jar b/framework/lib/junit-4.8.1.jar
diff --git a/framework/src/play/db/Evolutions.java b/framework/src/play/db/Evolutions.java
@@ -279,7 +279,7 @@ public static synchronized boolean applyScript(boolean runScript) {
                     SQLException ex = (SQLException) e;
                     message += " [ERROR:" + ex.getErrorCode() + ", SQLSTATE:" + ex.getSQLState() + "]";
                 }
-                PreparedStatement ps = connection.prepareStatement("update play_evolutions set last_problem = ?1 where id = ?2");
+                PreparedStatement ps = connection.prepareStatement("update play_evolutions set last_problem = ? where id = ?");
                 ps.setString(1, message);
                 ps.setInt(2, applying);
                 ps.execute();