--no commit message

--no commit message

h2/src/docsrc/html/tutorial.html

@@ -559,7 +559,7 @@ org.h2.fulltext.FullText.search(conn, text, limit, offset)
 
 <h3>Using the Lucene Fulltext Search</h3>
 <p>
-To use the Lucene full text search, you first need to rename the file FullTextLucene.java.txt to FullTestLucene.java and compile it. Also, you need the Lucene library in the classpath.
+To use the Lucene full text search, you need the Lucene library in the classpath.
 To initialize, call:
 </p>
 <pre>

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

@@ -1718,7 +1718,13 @@ public class Parser {
                 r = new Aggregate(database, Aggregate.COUNT_ALL, null, currentSelect, false);
             } else {
                 boolean distinct = readIf("DISTINCT");
-                r = new Aggregate(database, Aggregate.COUNT, readExpression(), currentSelect, distinct);
+                Expression on = readExpression();
+                if (on instanceof Wildcard && !distinct) {
+                    // PostgreSQL compatibility: count(t.*)
+                    r = new Aggregate(database, Aggregate.COUNT_ALL, null, currentSelect, false);
+                } else {
+                    r = new Aggregate(database, Aggregate.COUNT, on, currentSelect, distinct);
+                }
             }
         } else if (aggregateType == Aggregate.GROUP_CONCAT) {
             boolean distinct = readIf("DISTINCT");

h2/src/main/org/h2/expression/Wildcard.java

@@ -11,6 +11,7 @@ import org.h2.engine.Session;
 import org.h2.message.Message;
 import org.h2.table.ColumnResolver;
 import org.h2.table.TableFilter;
+import org.h2.util.StringUtils;
 import org.h2.value.Value;
 
 /**
@@ -76,7 +77,11 @@ public class Wildcard extends Expression {
     }
 
     public String getSQL() {
-        throw Message.getInternalError();
+        if (table == null) {
+            return "*";
+        } else {
+            return StringUtils.quoteIdentifier(table) + ".*";
+        }
     }
 
     public void updateAggregate(Session session) {

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

+select count(d.*) from dual d group by d.x;
+> 1;
+
 create table test(id int);
 select count(*) from (select * from ((select * from test) union (select * from test)) a) b where id = 0;
 > 0;