- Update für bestehende GenericContact <-> GenericPerson Assoziationen
- Fehler in PublicPersonalPropertiesStep behoben git-svn-id: https://svn.libreccm.org/ccm/trunk@1492 8810af33-2d31-482b-a856-94f89814c4dfmaster
jensp
parent
b31676edd9
commit
ea88cfd822
|
|
@ -7,6 +7,7 @@ import com.arsdigita.bebop.SegmentedPanel;
|
|||
import com.arsdigita.cms.ItemSelectionModel;
|
||||
import com.arsdigita.cms.contenttypes.GenericPerson;
|
||||
import com.arsdigita.cms.contenttypes.PublicPersonalProfile;
|
||||
import com.arsdigita.cms.contenttypes.PublicPersonalProfileBundle;
|
||||
import com.arsdigita.domain.DomainObject;
|
||||
import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
|
||||
import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
|
||||
|
|
@ -67,7 +68,7 @@ public class PublicPersonalProfilePropertiesStep extends SimpleEditStep {
|
|||
|
||||
sheet.add(PublicPersonalProfileGlobalizationUtil.globalize(
|
||||
"publicpersonalprofile.ui.owner"),
|
||||
PublicPersonalProfile.OWNER, new OwnerFormatter());
|
||||
PublicPersonalProfileBundle.OWNER, new OwnerFormatter());
|
||||
|
||||
sheet.add(PublicPersonalProfileGlobalizationUtil.globalize(
|
||||
"publicpersonalprofile.ui.profile_url"),
|
||||
|
|
|
|||
|
|
@ -50,4 +50,7 @@
|
|||
<version from="6.6.3" to="6.6.4">
|
||||
<script sql="ccm-cms/upgrade/::database::-6.6.3-6.6.4.sql"/>
|
||||
</version>
|
||||
<version from="6.6.4" to="6.6.5">
|
||||
<script class="com.arsdigita.cms.contenttypes.GenericContactPersonAssocUpgrade"/>
|
||||
</version>
|
||||
</upgrade>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,311 @@
|
|||
package com.arsdigita.cms.contenttypes;
|
||||
|
||||
import com.arsdigita.packaging.Program;
|
||||
import com.arsdigita.runtime.RuntimeConfig;
|
||||
import com.arsdigita.util.jdbc.Connections;
|
||||
import java.math.BigDecimal;
|
||||
import java.sql.Connection;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import org.apache.commons.cli.CommandLine;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
/**
|
||||
* Upgrade for association between GenericContact and GenericPerson (6.6.4 to
|
||||
* 6.6.5)
|
||||
*
|
||||
* @author Jens Pelzetter
|
||||
* @version $Id$
|
||||
*/
|
||||
public class GenericContactPersonAssocUpgrade extends Program {
|
||||
|
||||
private static final Logger logger =
|
||||
Logger.getLogger(
|
||||
GenericContactPersonAssocUpgrade.class);
|
||||
|
||||
public GenericContactPersonAssocUpgrade() {
|
||||
super("GenericContactPersonAssocUpgrade", "1.0.0", "");
|
||||
}
|
||||
|
||||
public static final void main(final String[] args) {
|
||||
new GenericContactPersonAssocUpgrade().run(args);
|
||||
}
|
||||
|
||||
public void doRun(final CommandLine cmdLine) {
|
||||
System.out.println("Starting upgrade...");
|
||||
List<OldAssocEntry> oldData = new ArrayList<OldAssocEntry>();
|
||||
|
||||
System.out.println("Trying to get JDBC connection...");
|
||||
|
||||
final Connection conn = Connections.acquire(RuntimeConfig.getConfig().
|
||||
getJDBCURL());
|
||||
try {
|
||||
conn.setAutoCommit(false);
|
||||
} catch (SQLException ex) {
|
||||
System.err.println("Failed to configure JDBC connection.");
|
||||
printStackTrace(ex);
|
||||
close(conn);
|
||||
return;
|
||||
}
|
||||
|
||||
/*try {
|
||||
final Statement stmt = conn.createStatement();
|
||||
stmt.execute("SELECT * FROM cms_items");
|
||||
} catch(SQLException ex) {
|
||||
System.err.printlnor("Connection is not usable.", ex);
|
||||
return;
|
||||
}*/
|
||||
|
||||
System.out.println("Retrieving old data...");
|
||||
try {
|
||||
final Statement stmt = conn.createStatement();
|
||||
final ResultSet oldAssocResult = stmt.executeQuery(
|
||||
"SELECT person_id, contact_id, link_order, link_key "
|
||||
+ "FROM cms_person_contact_map");
|
||||
|
||||
while (oldAssocResult.next()) {
|
||||
oldData.add(new OldAssocEntry(oldAssocResult.getBigDecimal(1),
|
||||
oldAssocResult.getBigDecimal(2),
|
||||
oldAssocResult.getInt(3),
|
||||
oldAssocResult.getString(4)));
|
||||
}
|
||||
} catch (SQLException ex) {
|
||||
System.err.println("Failed to retrieve old data.");
|
||||
printStackTrace(ex);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
System.out.println("Droping old table...");
|
||||
final Statement stmt = conn.createStatement();
|
||||
stmt.execute("DROP TABLE cms_person_contact_map");
|
||||
} catch (SQLException ex) {
|
||||
System.err.println("Failed to drop old table.");
|
||||
printStackTrace(ex);
|
||||
rollback(conn);
|
||||
close(conn);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
System.out.println("Creating new tables...");
|
||||
final Statement stmt = conn.createStatement();
|
||||
stmt.addBatch("CREATE TABLE cms_person_bundles ( "
|
||||
+ "bundle_id integer NOT NULL)");
|
||||
|
||||
stmt.addBatch("CREATE TABLE cms_contact_bundles ( "
|
||||
+ "bundle_id integer NOT NULL)");
|
||||
|
||||
stmt.addBatch("CREATE TABLE cms_person_contact_map ("
|
||||
+ "person_id integer NOT NULL,"
|
||||
+ "contact_id integer NOT NULL,"
|
||||
+ "link_order integer,"
|
||||
+ "link_key character varying(100)"
|
||||
+ ")");
|
||||
|
||||
stmt.addBatch("ALTER TABLE ONLY cms_person_bundles "
|
||||
+ "ADD CONSTRAINT cms_pers_bundl_bund_id_p_7xuzi "
|
||||
+ "PRIMARY KEY (bundle_id);");
|
||||
|
||||
stmt.addBatch("ALTER TABLE ONLY cms_person_bundles "
|
||||
+ "ADD CONSTRAINT cms_pers_bundl_bund_id_f__rzge "
|
||||
+ "FOREIGN KEY (bundle_id) "
|
||||
+ "REFERENCES cms_bundles(bundle_id);");
|
||||
|
||||
stmt.addBatch("ALTER TABLE ONLY cms_contact_bundles "
|
||||
+ "ADD CONSTRAINT cms_cont_bundl_bund_id_p_2p6vp "
|
||||
+ "PRIMARY KEY (bundle_id);");
|
||||
|
||||
stmt.addBatch("ALTER TABLE ONLY cms_contact_bundles "
|
||||
+ "ADD CONSTRAINT cms_cont_bundl_bund_id_f_m8aga "
|
||||
+ "FOREIGN KEY (bundle_id) "
|
||||
+ "REFERENCES cms_bundles(bundle_id);");
|
||||
|
||||
stmt.addBatch("ALTER TABLE ONLY cms_person_contact_map "
|
||||
+ "ADD CONSTRAINT cms_per_con_map_con_id_p_g1cii "
|
||||
+ "PRIMARY KEY (contact_id, person_id)");
|
||||
|
||||
stmt.addBatch("ALTER TABLE ONLY cms_person_contact_map "
|
||||
+ "ADD CONSTRAINT cms_per_con_map_con_id_f_peoc2 "
|
||||
+ "FOREIGN KEY (contact_id) "
|
||||
+ "REFERENCES cms_contact_bundles(bundle_id);");
|
||||
|
||||
stmt.addBatch("ALTER TABLE ONLY cms_person_contact_map "
|
||||
+ "ADD CONSTRAINT cms_per_con_map_per_id_f_g82jn "
|
||||
+ "FOREIGN KEY (person_id) "
|
||||
+ "REFERENCES cms_person_bundles(bundle_id);");
|
||||
stmt.executeBatch();
|
||||
|
||||
} catch (SQLException ex) {
|
||||
System.err.println("Failed to create new table.");
|
||||
printStackTrace(ex);
|
||||
rollback(conn);
|
||||
close(conn);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
System.out.println("Filling new tables with data...");
|
||||
final Statement queryPersonsStmt = conn.createStatement();
|
||||
final Statement queryContactsStmt = conn.createStatement();
|
||||
final Statement stmt = conn.createStatement();
|
||||
|
||||
final ResultSet personsRs =
|
||||
queryPersonsStmt.executeQuery(
|
||||
"SELECT parent_id "
|
||||
+ "FROM cms_items "
|
||||
+ "JOIN cms_persons "
|
||||
+ "ON cms_items.item_id = cms_persons.person_id");
|
||||
|
||||
while (personsRs.next()) {
|
||||
stmt.addBatch(String.format("INSERT INTO cms_person_bundles (bundle_id) "
|
||||
+ "VALUES (%d)",
|
||||
personsRs.getInt(1)));
|
||||
}
|
||||
|
||||
final ResultSet contactsRs = queryContactsStmt.executeQuery(
|
||||
"SELECT parent_id "
|
||||
+ "FROM cms_items "
|
||||
+ "JOIN cms_contacts "
|
||||
+ "ON cms_items.item_id = cms_contacts.contact_id");
|
||||
|
||||
while (contactsRs.next()) {
|
||||
stmt.addBatch(String.format("INSERT INTO cms_contact_bundles (bundle_id) "
|
||||
+ "VALUES (%s)",
|
||||
contactsRs.getInt(1)));
|
||||
}
|
||||
|
||||
List<String> processedEntries =
|
||||
new ArrayList<String>();
|
||||
for (OldAssocEntry entry : oldData) {
|
||||
BigDecimal personBundleId;
|
||||
BigDecimal contactBundleId;
|
||||
|
||||
personBundleId = getParentIdFor(entry.getPersonId(), conn);
|
||||
contactBundleId = getParentIdFor(entry.getContactId(), conn);
|
||||
|
||||
if (processedEntries.contains(
|
||||
String.format("%s-%s",
|
||||
personBundleId.toString(),
|
||||
contactBundleId.toString()))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
stmt.addBatch(String.format(
|
||||
"INSERT INTO cms_person_contact_map (person_id, "
|
||||
+ "contact_id, "
|
||||
+ "link_order, "
|
||||
+ "link_key) "
|
||||
+ "VALUES (%s, %s, %d, '%s')",
|
||||
personBundleId,
|
||||
contactBundleId,
|
||||
entry.getLinkOrder(),
|
||||
entry.getLinkKey()));
|
||||
|
||||
processedEntries.add(String.format("%s-%s",
|
||||
personBundleId.toString(),
|
||||
contactBundleId.toString()));
|
||||
}
|
||||
|
||||
stmt.executeBatch();
|
||||
|
||||
|
||||
} catch (SQLException ex) {
|
||||
System.err.println("Failed to fill tables.");
|
||||
printStackTrace(ex);
|
||||
rollback(conn);
|
||||
close(conn);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
conn.commit();
|
||||
} catch (SQLException ex) {
|
||||
System.err.println("Failed to commiting changes.");
|
||||
printStackTrace(ex);
|
||||
rollback(conn);
|
||||
return;
|
||||
}
|
||||
|
||||
close(conn);
|
||||
}
|
||||
|
||||
private class OldAssocEntry {
|
||||
|
||||
private BigDecimal personId;
|
||||
private BigDecimal contactId;
|
||||
private Integer linkOrder;
|
||||
private String linkKey;
|
||||
|
||||
public OldAssocEntry(final BigDecimal personId,
|
||||
final BigDecimal contactId,
|
||||
final Integer linkOrder,
|
||||
final String linkKey) {
|
||||
this.personId = personId;
|
||||
this.contactId = contactId;
|
||||
this.linkOrder = linkOrder;
|
||||
this.linkKey = linkKey;
|
||||
}
|
||||
|
||||
public BigDecimal getContactId() {
|
||||
return contactId;
|
||||
}
|
||||
|
||||
public String getLinkKey() {
|
||||
return linkKey;
|
||||
}
|
||||
|
||||
public Integer getLinkOrder() {
|
||||
return linkOrder;
|
||||
}
|
||||
|
||||
public BigDecimal getPersonId() {
|
||||
return personId;
|
||||
}
|
||||
}
|
||||
|
||||
private BigDecimal getParentIdFor(final BigDecimal id,
|
||||
final Connection conn)
|
||||
throws SQLException {
|
||||
final Statement stmt = conn.createStatement();
|
||||
|
||||
final ResultSet rs = stmt.executeQuery(String.format(
|
||||
"SELECT parent_id FROM cms_items where item_id = %s",
|
||||
id.toString()));
|
||||
|
||||
while (rs.next()) {
|
||||
return rs.getBigDecimal(1);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private void rollback(final Connection conn) {
|
||||
try {
|
||||
conn.rollback();
|
||||
} catch (SQLException ex1) {
|
||||
System.out.println("Rollback failed.");
|
||||
}
|
||||
}
|
||||
|
||||
private void close(final Connection conn) {
|
||||
try {
|
||||
conn.close();
|
||||
} catch (SQLException ex) {
|
||||
System.err.println("Failed to close JDBC connectio.");
|
||||
printStackTrace(ex);
|
||||
}
|
||||
}
|
||||
|
||||
private void printStackTrace(final SQLException ex) {
|
||||
ex.printStackTrace(System.err);
|
||||
if (ex.getNextException() != null) {
|
||||
printStackTrace(ex.getNextException());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue