empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1184909 - in /incubator/empire-db/trunk: empire-db-codegen/config.xml empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
Date Sun, 16 Oct 2011 19:42:28 GMT
Author: doebele
Date: Sun Oct 16 19:42:27 2011
New Revision: 1184909

URL: http://svn.apache.org/viewvc?rev=1184909&view=rev
Log:
EMPIREDB-103 
small fix concering view creation and relations

Modified:
    incubator/empire-db/trunk/empire-db-codegen/config.xml
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java

Modified: incubator/empire-db/trunk/empire-db-codegen/config.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/config.xml?rev=1184909&r1=1184908&r2=1184909&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/config.xml (original)
+++ incubator/empire-db/trunk/empire-db-codegen/config.xml Sun Oct 16 19:42:27 2011
@@ -55,6 +55,7 @@
 		<nestTables>true</nestTables>
 		<nestViews>false</nestViews>
 		<createRecordProperties>true</createRecordProperties>
+		<preserveRelationNames>false</preserveRelationNames>
 	</properties>
 	
 	<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java?rev=1184909&r1=1184908&r2=1184909&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
Sun Oct 16 19:42:27 2011
@@ -303,11 +303,12 @@ public abstract class DBDDLGenerator<T e
         Iterator<DBView> views = db.getViews().iterator();
         while (views.hasNext())
         {
+        	DBView v = views.next();
             try {
-                createView(views.next(), script);
-            } catch(NotImplementedException e) {
+                createView(v, script);
+            } catch(NotSupportedException e) {
                 // View command not implemented
-                log.warn("Error creating the view {0}. This view will be ignored.");
+                log.warn("Error creating the view {0}. This view will be ignored.", v.getName());
                 continue;
             }
         }
@@ -511,7 +512,7 @@ public abstract class DBDDLGenerator<T e
         if (cmd==null)
         {   // Check whether Error information is available
             log.error("No command has been supplied for view " + v.getName());
-            throw new NotImplementedException(this, v.getName() + ".createCommand");
+            throw new NotSupportedException(this, v.getName() + ".createCommand");
         }
         // Make sure there is no OrderBy
         cmd.clearOrderBy();



Mime
View raw message