better error messages

h2/src/main/org/h2/command/Command.java

@@ -139,7 +139,7 @@ public abstract class Command implements CommandInterface {
                 session.setCurrentCommand(this, startTime);
                 return query(maxrows);
             } catch (Exception e) {
-                SQLException s = Message.convert(e);
+                SQLException s = Message.convert(e, sql);
                 database.exceptionThrown(s, sql);
                 throw s;
             } finally {

h2/src/main/org/h2/message/Message.java

@@ -221,6 +221,22 @@ public class Message {
      * Convert an exception to a SQL exception using the default mapping.
      * 
      * @param e the root cause
+     * @param sql the SQL statement or null if it is not known
+     * @return the SQL exception object
+     */
+    public static SQLException convert(Throwable e, String sql) {
+        SQLException e2 = convert(e);
+        if (e2 instanceof JdbcSQLException) {
+            ((JdbcSQLException) e).setSQL(sql);
+        }
+        return e2;
+    }
+
+    /**
+     * Convert an exception to a SQL exception using the default mapping.
+     * 
+     * @param e the root cause
+     * @param sql the SQL statement or null if it is not known
      * @return the SQL exception object
      */
     public static SQLException convert(Throwable e) {

h2/src/test/org/h2/test/TestAll.java

@@ -270,18 +270,9 @@ java org.h2.test.TestAll timer
 /*
 
 JaQu
-try java.lang.instrumentation.*
-
-fix checkstyle
 
 row level locking
 
-embedded + clustering (feature request)
-
-start server with connection
-
-jazoon
-
 H2 Console should support Java Queries
 
 C:\download\Data Concurrency and Consistency.pdf

h2/src/test/org/h2/test/TestBase.java

@@ -481,10 +481,10 @@ public abstract class TestBase {
             }
             int al = expected.length();
             int bl = actual.length();
-            if (al > 100) {
+            if (al > 400) {
                 expected = expected.substring(0, 400);
             }
-            if (bl > 100) {
+            if (bl > 400) {
                 actual = actual.substring(0, 400);
             }
             fail("Expected: " + expected + " (" + al + ") actual: " + actual + " (" + bl + ")");

h2/src/test/org/h2/test/testSimple.in.txt

+create table test$test(id int);
+drop table test$test;
+create table test$$test(id int);
+drop table test$$test;
 create table test (id varchar(36) as random_uuid() primary key);
 insert into test() values();
 delete from test where id = select id from test;