From 5a262561ab906c702e812230e7862b06ca8bfdf2 Mon Sep 17 00:00:00 2001
From: Nan Li
Date: Fri, 20 Sep 2013 12:08:47 -0500
Subject: 417120 - [hotbug][regression]JPT Catalog layer should be optional

---
 .../jpt/jpa/db/internal/driver/FauxCatalogStrategy.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/driver/FauxCatalogStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/driver/FauxCatalogStrategy.java
index 507d5cb573..c8e592695f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/driver/FauxCatalogStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/driver/FauxCatalogStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -42,11 +42,16 @@ class FauxCatalogStrategy
 		return Collections.emptyList();
 	}
 
+	@SuppressWarnings("unchecked") 
 	public List<Schema> getSchemas() {
-		Catalog fauxCatalog = this.getFauxCatalog();
-		@SuppressWarnings("unchecked")
-		List<Schema> schemas = fauxCatalog.getSchemas();
-		return schemas;
+		// 308947 - hack to support old IBM DTP/RDB extension for Oracle
+		List<Catalog> catalogs = database.getCatalogs();
+		// if there are no catalogs, the database must hold the schemata directly
+		if ((catalogs == null) || catalogs.isEmpty()) {
+			return database.getSchemas();
+		}
+
+		return this.getFauxCatalog().getSchemas();
 	}
 
 	private Catalog getFauxCatalog() {
-- 
cgit v1.2.3