edit

oneteme · Sep 25, 2024 · be19e6b · be19e6b
1 parent 50b251d
commit be19e6b
Showing 1 changed file with 28 additions and 15 deletions.
diff --git a/src/main/java/org/usf/jquery/web/ViewMetadata.java b/src/main/java/org/usf/jquery/web/ViewMetadata.java
@@ -78,24 +78,37 @@ final ViewMetadata fetch(DatabaseMetaData metadata, String schema) throws SQLExc
 	}
 
 	void fetchView(DatabaseMetaData metadata, TableView view, String schema) throws SQLException {
-		try(var rs = metadata.getColumns(null, view.getSchemaOrElse(schema), view.getName(), null)){
-			if(rs.next()) {
-				var db = reverseMapKeys(); //reverse key
-				do {
-					var cm = db.remove(rs.getString("COLUMN_NAME"));
-					if(nonNull(cm)) {
-						cm.update(
-								rs.getInt("DATA_TYPE"), 
-								rs.getInt("COLUMN_SIZE"), 
-								rs.getInt("DECIMAL_DIGITS"));
-					} // else undeclared column
-				} while(rs.next());
-				if(!db.isEmpty()) { //no such columns
-					throw columnsNotFoundException(db.keySet());
+		schema = view.getSchemaOrElse(schema);
+		try(var tm = metadata.getTables(null, schema, view.getName(), null)) {
+			if(tm.next()) {
+				if("TABLE".equals(tm.getString("TABLE_TYPE"))) {
+					try(var rs = metadata.getColumns(null, schema, view.getName(), null)){
+						if(rs.next()) {
+							var db = reverseMapKeys(); //reverse key
+							do {
+								var cm = db.remove(rs.getString("COLUMN_NAME"));
+								if(nonNull(cm)) {
+									cm.update(
+											rs.getInt("DATA_TYPE"), 
+											rs.getInt("COLUMN_SIZE"), 
+											rs.getInt("DECIMAL_DIGITS"));
+								} // else undeclared column
+							} while(rs.next());
+							if(!db.isEmpty()) { //no such columns
+								throw columnsNotFoundException(db.keySet());
+							}
+						}
+						else {
+							throw new IllegalArgumentException("no columns");
+						}
+					}
+				}
+				else {
+					fetch(metadata, view, schema);
 				}
 			}
 			else {
-				throw new NoSuchElementException(quote(view.toString()) + " table not found");
+				throw new NoSuchElementException(quote(view.toString()) + " table or view not found");
 			}
 		}
 	}