--no commit message

--no commit message

h2/src/main/org/h2/command/ddl/CreateView.java

@@ -21,6 +21,7 @@
         private String selectSQL;
         private String[] columnNames;
         private String comment;
+        private boolean recursive;
     
         public CreateView(Session session, Schema schema) {
             super(session, schema);
@@ -29,6 +30,10 @@
         public void setViewName(String name) {
             viewName = name;
         }
+        
+        public void setRecursive(boolean recursive) {
+            this.recursive = recursive;
+        }
     
         public void setSelect(Query select) {
             this.select = select;
@@ -52,7 +57,7 @@
             } else {
                 querySQL = select.getSQL();
             }
-            TableView view = new TableView(getSchema(), id, viewName, querySQL, null, columnNames, session);
+            TableView view = new TableView(getSchema(), id, viewName, querySQL, null, columnNames, session, recursive);
             view.setComment(comment);
             db.addSchemaObject(session, view);
             return 0;

h2/src/main/org/h2/command/ddl/DropDatabase.java

@@ -71,6 +71,7 @@ public class DropDatabase extends DefineCommand {
         // maybe constraints and triggers on system tables will be allowed in the future
         list.addAll(db.getAllSchemaObjects(DbObject.CONSTRAINT));
         list.addAll(db.getAllSchemaObjects(DbObject.TRIGGER));
+        list.addAll(db.getAllSchemaObjects(DbObject.CONSTANT));
         for(int i=0; i<list.size(); i++) {
             SchemaObject obj = (SchemaObject) list.get(i);
             db.removeSchemaObject(session, obj);
@@ -87,7 +88,11 @@ public class DropDatabase extends DefineCommand {
         list.addAll(db.getAllFunctionAliases());
         for(int i=0; i<list.size(); i++) {
             DbObject obj = (DbObject) list.get(i);
-            db.removeDatabaseObject(session, obj);
+            String sql = obj.getCreateSQL();
+            // the role PUBLIC must not be dropped
+            if(sql != null) {
+                db.removeDatabaseObject(session, obj);
+            }
         }
     }