--no commit message

--no commit message

h2/src/docsrc/html/changelog.html

@@ -16,7 +16,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>MySQL compatibility: linked tables had lower case column names on some systems. 
+<ul><li>Support a comma before closing a list, as in: create table test(id int,)
+</li><li>MySQL compatibility: linked tables had lower case column names on some systems. 
 </li><li>DB2 compatibility: the DB2 fetch-first-clause is supported.
 </li><li>Oracle compatibility: old style outer join syntax using (+) did work correctly sometimes.
 </li><li>ResultSet.setFetchSize is now supported.

h2/src/docsrc/html/roadmap.html

@@ -377,6 +377,7 @@ Of course, patches are always welcome, but are not always applied as is. Patches
 </li><li>Automatically compact databases from time to time (as a background process).
 </li><li>Support GRANT SELECT, UPDATE ON *.
 </li><li>Test Eclipse DTP.
+</li><li>Support JMX: Create an MBean for each database and server (support JConsole).
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/installer/buildRelease.bat

@@ -69,5 +69,7 @@ rem == Upload to h2database.com, http://code.google.com/p/h2database/downloads/l
 rem == Newsletter: send (always to BCC!!)
 rem == Add to freshmeat
 rem == http://en.wikipedia.org/wiki/H2_%28DBMS%29 (change version)
+rem == http://ja.wikipedia.org/wiki/H2_Database (change version)
+rem == http://de.wikipedia.org/wiki/ ?
 rem == http://www.heise.de/software/
 rem == http://code.google.com/p/h2database/issues/list

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

@@ -297,8 +297,6 @@ Concurrent update in table test: another transaction has updated or
 deleted the same row when exactly does it occur in other databases 
 (PostgreSQL, Oracle)?
 
-create an mbean for each database? server? (jconsole)
-
 in help.csv, use complete examples for functions; add a test case
 
 option to write complete page right after checkpoint

h2/src/test/org/h2/test/jaqu/Product.java

@@ -64,73 +64,6 @@ public class Product implements Table {
                 create(8, "Northwoods Cranberry Sauce", "Condiments", 40.0, 6),
                 create(9, "Mishi Kobe Niku", "Meat/Poultry", 97.0, 29), 
                 create(10, "Ikura", "Seafood", 31.0, 31),
-                create(11, "Queso Cabrales", "Dairy Products", 21.0, 22),
-                create(12, "Queso Manchego La Pastora", "Dairy Products", 38.0, 86),
-                create(13, "Konbu", "Seafood", 6.0, 24), 
-                create(14, "Tofu", "Produce", 23.2500, 35),
-                create(15, "Genen Shouyu", "Condiments", 15.50, 39), 
-                create(16, "Pavlova", "Confections", 17.4500, 29),
-                create(17, "Alice Mutton", "Meat/Poultry", 39.0, 0),
-                create(18, "Carnarvon Tigers", "Seafood", 62.50, 42),
-                create(19, "Teatime Chocolate Biscuits", "Confections", 9.20, 25),
-                create(20, "Sir Rodney's Marmalade", "Confections", 81.0, 40),
-                create(21, "Sir Rodney's Scones", "Confections", 10.0, 3),
-                create(22, "Gustaf's Knaeckebroed", "Grains/Cereals", 21.0, 104),
-                create(23, "Tunnbroed", "Grains/Cereals", 9.0, 61),
-                create(24, "Guarana Fantastica", "Beverages", 4.50, 20),
-                create(25, "NuNuCa Nuss-Nougat-Creme", "Confections", 14.0, 76),
-                create(26, "Gumbaer Gummibaerchen", "Confections", 31.2300, 15),
-                create(27, "Schoggi Schokolade", "Confections", 43.90, 49),
-                create(28, "Roessle Sauerkraut", "Produce", 45.60, 26),
-                create(29, "Thueringer Rostbratwurst", "Meat/Poultry", 123.7900, 0),
-                create(30, "Nord-Ost Matjeshering", "Seafood", 25.8900, 10),
-                create(31, "Gorgonzola Telino", "Dairy Products", 12.50, 0),
-                create(32, "Mascarpone Fabioli", "Dairy Products", 32.0, 9),
-                create(33, "Geitost", "Dairy Products", 2.50, 112),
-                create(34, "Sasquatch Ale", "Beverages", 14.0, 111),
-                create(35, "Steeleye Stout", "Beverages", 18.0, 20), 
-                create(36, "Inlagd Sill", "Seafood", 19.0, 112),
-                create(37, "Gravad lax", "Seafood", 26.0, 11), 
-                create(38, "Cote de Blaye", "Beverages", 263.50, 17),
-                create(39, "Chartreuse verte", "Beverages", 18.0, 69),
-                create(40, "Boston Crab Meat", "Seafood", 18.40, 123),
-                create(41, "Jack's New England Clam Chowder", "Seafood", 9.6500, 85),
-                create(42, "Singaporean Hokkien Fried Mee", "Grains/Cereals", 14.0, 26),
-                create(43, "Ipoh Coffee", "Beverages", 46.0, 17),
-                create(44, "Gula Malacca", "Condiments", 19.4500, 27), 
-                create(45, "Rogede sild", "Seafood", 9.50, 5),
-                create(46, "Spegesild", "Seafood", 12.0, 95), 
-                create(47, "Zaanse koeken", "Confections", 9.50, 36),
-                create(48, "Chocolade", "Confections", 12.7500, 15), 
-                create(49, "Maxilaku", "Confections", 20.0, 10),
-                create(50, "Valkoinen suklaa", "Confections", 16.2500, 65),
-                create(51, "Manjimup Dried Apples", "Produce", 53.0, 20),
-                create(52, "Filo Mix", "Grains/Cereals", 7.0, 38),
-                create(53, "Perth Pasties", "Meat/Poultry", 32.80, 0),
-                create(54, "Tourtiere", "Meat/Poultry", 7.4500, 21),
-                create(55, "Pate chinois", "Meat/Poultry", 24.0, 115),
-                create(56, "Gnocchi di nonna Alice", "Grains/Cereals", 38.0, 21),
-                create(57, "Ravioli Angelo", "Grains/Cereals", 19.50, 36),
-                create(58, "Escargots de Bourgogne", "Seafood", 13.2500, 62),
-                create(59, "Raclette Courdavault", "Dairy Products", 55.0, 79),
-                create(60, "Camembert Pierrot", "Dairy Products", 34.0, 19),
-                create(61, "Sirop d'erable", "Condiments", 28.50, 113),
-                create(62, "Tarte au sucre", "Confections", 49.30, 17),
-                create(63, "Vegie-spread", "Condiments", 43.90, 24),
-                create(64, "Wimmers gute Semmelknoedel", "Grains/Cereals", 33.2500, 22),
-                create(65, "Louisiana Fiery Hot Pepper Sauce", "Condiments", 21.0500, 76),
-                create(66, "Louisiana Hot Spiced Okra", "Condiments", 17.0, 4),
-                create(67, "Laughing Lumberjack Lager", "Beverages", 14.0, 52),
-                create(68, "Scottish Longbreads", "Confections", 12.50, 6),
-                create(69, "Gudbrandsdalsost", "Dairy Products", 36.0, 26),
-                create(70, "Outback Lager", "Beverages", 15.0, 15),
-                create(71, "Flotemysost", "Dairy Products", 21.50, 26),
-                create(72, "Mozzarella di Giovanni", "Dairy Products", 34.80, 14),
-                create(73, "Roed Kaviar", "Seafood", 15.0, 101), 
-                create(74, "Longlife Tofu", "Produce", 10.0, 4),
-                create(75, "Rhoenbraeu Klosterbier", "Beverages", 7.7500, 125),
-                create(76, "Lakkalikoeoeri", "Beverages", 18.0, 57),
-                create(77, "Original Frankfurter gruene Sosse", "Condiments", 13.0, 32),
         };
 
         return Arrays.asList(list);

h2/src/test/org/h2/test/jaqu/SamplesTest.java

@@ -87,8 +87,7 @@ public class SamplesTest extends TestBase {
         for (Product x : soldOutProducts) {
             result += x.productName + ";";
         }
-        assertEquals(result, "Chef Anton's Gumbo Mix;Alice Mutton;"
-            + "Thueringer Rostbratwurst;Gorgonzola Telino;Perth Pasties;");
+        assertEquals("Chef Anton's Gumbo Mix;", result);
     }
 
     private void testWhereSimple3() throws Exception {
@@ -111,32 +110,11 @@ public class SamplesTest extends TestBase {
             result += x.productName + ";";
         }
         assertEquals(
-                result,
                 "Chai;Chang;Aniseed Syrup;Chef Anton's Cajun Seasoning;"
                         + "Grandma's Boysenberry Spread;"
                         + "Uncle Bob's Organic Dried Pears;"
-                        + "Northwoods Cranberry Sauce;Mishi Kobe Niku;Ikura;"
-                        + "Queso Cabrales;Queso Manchego La Pastora;"
-                        + "Konbu;Tofu;Genen Shouyu;Pavlova;"
-                        + "Carnarvon Tigers;Teatime Chocolate Biscuits;"
-                        + "Sir Rodney's Marmalade;Sir Rodney's Scones;"
-                        + "Gustaf's Knaeckebroed;Tunnbroed;Guarana Fantastica;"
-                        + "NuNuCa Nuss-Nougat-Creme;Gumbaer Gummibaerchen;"
-                        + "Schoggi Schokolade;Roessle Sauerkraut;"
-                        + "Nord-Ost Matjeshering;Mascarpone Fabioli;Sasquatch Ale;"
-                        + "Steeleye Stout;Inlagd Sill;Gravad lax;Cote de Blaye;"
-                        + "Chartreuse verte;Boston Crab Meat;Jack's New England Clam Chowder;"
-                        + "Singaporean Hokkien Fried Mee;Ipoh Coffee;Gula Malacca;Rogede sild;"
-                        + "Spegesild;Zaanse koeken;Chocolade;Maxilaku;Valkoinen suklaa;"
-                        + "Manjimup Dried Apples;Filo Mix;Tourtiere;Pate chinois;"
-                        + "Gnocchi di nonna Alice;Ravioli Angelo;Escargots de Bourgogne;"
-                        + "Raclette Courdavault;Camembert Pierrot;Sirop d'erable;"
-                        + "Tarte au sucre;Vegie-spread;Wimmers gute Semmelknoedel;"
-                        + "Louisiana Fiery Hot Pepper Sauce;Louisiana Hot Spiced Okra;"
-                        + "Laughing Lumberjack Lager;Scottish Longbreads;Gudbrandsdalsost;"
-                        + "Outback Lager;Flotemysost;Mozzarella di Giovanni;Roed Kaviar;"
-                        + "Longlife Tofu;Rhoenbraeu Klosterbier;Lakkalikoeoeri;"
-                        + "Original Frankfurter gruene Sosse;");
+                        + "Northwoods Cranberry Sauce;Mishi Kobe Niku;Ikura;",
+                result);
     }
 
 
@@ -273,12 +251,12 @@ public class SamplesTest extends TestBase {
             orderBy(1).
             selectDistinct(length(p.productName));
         String s = lengths.toString();
-        assertEquals("[4, 5, 7, 8, 9]", s);
+        assertEquals("[4, 5]", s);
     }
     
     private void testCount() throws Exception {
         long count = db.from(new Product()).selectCount();
-        assertEquals(77, count);
+        assertEquals(10, count);
     }
 //## Java 1.5 end ##
 
@@ -319,9 +297,8 @@ public class SamplesTest extends TestBase {
             buff.append(';');
         }
         String s = buff.toString();
-        assertEquals("Beverages=12;Condiments=12;Confections=13;" +
-                "Dairy Products=10;Grains/Cereals=7;Meat/Poultry=6;" +
-                "Produce=5;Seafood=12;", s);
+        assertEquals("Beverages=2;Condiments=5;Meat/Poultry=1;" +
+                "Produce=1;Seafood=1;", s);
     }
 
 //## Java 1.5 end ##