Author: snoopdave
Date: Tue Sep 25 20:45:59 2007
New Revision: 579451
URL: http://svn.apache.org/viewvc?rev=579451&view=rev
Log:
Removed references to no longer existing roller_user_permissions table, plus
added better error reporting for table creation
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/branches/roller_4.1_dev/apps/weblogger/src/sql/createdb.vm
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?rev=579451&r1=579450&r2=579451&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
Tue Sep 25 20:45:59 2007
@@ -168,12 +168,17 @@
setDatabaseVersion(con, version);
} catch (SQLException sqle) {
+ log.error("ERROR running SQL in database creation script", sqle);
+ if (create != null) messages.addAll(create.getMessages());
errorMessage("ERROR running SQL in database creation script");
- throw new StartupException("Error running sql script", sqle);
+ throw new StartupException("Error running sql script", sqle);
+
} catch (Exception ioe) {
+ log.error("ERROR running database creation script", ioe);
if (create != null) messages.addAll(create.getMessages());
errorMessage("ERROR reading/parsing database creation script");
- throw new StartupException("Error running sql script", ioe);
+ throw new StartupException("Error running sql script", ioe);
+
} finally {
try { if (con != null) con.close(); } catch (Exception ignored) {}
}
Modified: roller/branches/roller_4.1_dev/apps/weblogger/src/sql/createdb.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/sql/createdb.vm?rev=579451&r1=579450&r2=579451&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/src/sql/createdb.vm (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/src/sql/createdb.vm Tue Sep
25 20:45:59 2007
@@ -511,12 +511,6 @@
alter table userrole add constraint ur_userid_fk
foreign key ( userid ) references rolleruser( id ) $!db.ADDL_FK_PARAMS ;
-alter table roller_user_permissions add constraint up_userid_fk
- foreign key ( user_id ) references rolleruser( id ) $!db.ADDL_FK_PARAMS ;
-
-alter table roller_user_permissions add constraint up_websiteid_fk
- foreign key ( website_id ) references website( id ) $!db.ADDL_FK_PARAMS ;
-
-- page, entry, category, comment
alter table webpage add constraint wp_websiteid_fk
