Move mapExceptColumns() to Wildcard

h2/src/main/org/h2/command/dml/Select.java

@@ -893,14 +893,14 @@ public class Select extends Query {
             String schemaName = expr.getSchemaName();
             String tableAlias = expr.getTableAlias();
             Wildcard w = (Wildcard) expr;
-            ArrayList<ExpressionColumn> exceptColumns = w.getExceptColumns();
+            boolean hasExceptColumns = w.getExceptColumns() != null;
             HashMap<Column, ExpressionColumn> exceptTableColumns = null;
             if (tableAlias == null) {
-                if (exceptColumns != null) {
+                if (hasExceptColumns) {
                     for (TableFilter filter : filters) {
                         w.mapColumns(filter, 1, Expression.MAP_INITIAL);
                     }
-                    exceptTableColumns = mapExceptColumns(exceptColumns);
+                    exceptTableColumns = w.mapExceptColumns();
                 }
                 expressions.remove(i);
                 for (TableFilter filter : filters) {
@@ -912,9 +912,9 @@ public class Select extends Query {
                 for (TableFilter f : filters) {
                     if (db.equalsIdentifiers(tableAlias, f.getTableAlias())) {
                         if (schemaName == null || db.equalsIdentifiers(schemaName, f.getSchemaName())) {
-                            if (exceptColumns != null) {
+                            if (hasExceptColumns) {
                                 w.mapColumns(f, 1, Expression.MAP_INITIAL);
-                                exceptTableColumns = mapExceptColumns(exceptColumns);
+                                exceptTableColumns = w.mapExceptColumns();
                             }
                             filter = f;
                             break;
@@ -931,20 +931,6 @@ public class Select extends Query {
         }
     }
 
-    public HashMap<Column, ExpressionColumn> mapExceptColumns(ArrayList<ExpressionColumn> exceptColumns) {
-        HashMap<Column, ExpressionColumn> exceptTableColumns = new HashMap<>();
-        for (ExpressionColumn ec : exceptColumns) {
-            Column column = ec.getColumn();
-            if (column == null) {
-                throw ec.getColumnException(ErrorCode.COLUMN_NOT_FOUND_1);
-            }
-            if (exceptTableColumns.put(column, ec) != null) {
-                throw ec.getColumnException(ErrorCode.DUPLICATE_COLUMN_NAME_1);
-            }
-        }
-        return exceptTableColumns;
-    }
-
     private int expandColumnList(TableFilter filter, int index, HashMap<Column, ExpressionColumn> except) {
         Table t = filter.getTable();
         String alias = filter.getTableAlias();

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

@@ -6,10 +6,12 @@
 package org.h2.expression;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
 import org.h2.api.ErrorCode;
 import org.h2.engine.Session;
 import org.h2.message.DbException;
+import org.h2.table.Column;
 import org.h2.table.ColumnResolver;
 import org.h2.table.TableFilter;
 import org.h2.util.StringUtils;
@@ -39,6 +41,26 @@ public class Wildcard extends Expression {
         this.exceptColumns = exceptColumns;
     }
 
+    /**
+     * Returns map of excluded table columns to expression columns and validates
+     * that all columns are resolved and not duplicated.
+     *
+     * @return map of excluded table columns to expression columns
+     */
+    public HashMap<Column, ExpressionColumn> mapExceptColumns() {
+        HashMap<Column, ExpressionColumn> exceptTableColumns = new HashMap<>();
+        for (ExpressionColumn ec : exceptColumns) {
+            Column column = ec.getColumn();
+            if (column == null) {
+                throw ec.getColumnException(ErrorCode.COLUMN_NOT_FOUND_1);
+            }
+            if (exceptTableColumns.put(column, ec) != null) {
+                throw ec.getColumnException(ErrorCode.DUPLICATE_COLUMN_NAME_1);
+            }
+        }
+        return exceptTableColumns;
+    }
+
     @Override
     public boolean isWildcard() {
         return true;

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -800,4 +800,4 @@ ranks rno dro rko precede cume reopens preceding unbounded rightly itr lag maxim
 partitioned tri partitions
 
 discard enhancements nolock surefire logarithm
-qualification opportunity jumping exploited unacceptable vrs
+qualification opportunity jumping exploited unacceptable vrs duplicated