Projects >> cayenne >>2a6ef007b32c250d825725214073f4ab7c854502

Chunk
Conflicting content 
                }
                map.addDbEntity(dbEntity);

<<<<<<< HEAD
                Collection oldObjEnt = map.getMappedEntities(oldEnt);
                if (!oldObjEnt.isEmpty()) {
                    for (ObjEntity objEntity : oldObjEnt) {
                        LOGGER.debug("Delete ObjEntity: " + objEntity.getName());
                        map.removeObjEntity(objEntity.getName(), true);
                        delegate.objEntityRemoved(objEntity);
                    }
                }

                LOGGER.debug("Overwrite DbEntity: " + oldEnt.getName());
                map.removeDbEntity(oldEnt.getName(), true);
                delegate.dbEntityRemoved(oldEnt);

            }

            map.addDbEntity(dbEntity);
=======
                // notify delegate
                if (delegate != null) {
                    delegate.dbEntityAdded(dbEntity);
                }
>>>>>>> 2894d5ffa04df9b01e5bb3acd097be23a2c9d438

                // delegate might have thrown this entity out... so check if it is still
                // around before continuing processing
Solution content 
                    }

                    LOGGER.debug("Overwrite DbEntity: " + oldEnt.getName());
                    map.removeDbEntity(oldEnt.getName(), true);
                    delegate.dbEntityRemoved(oldEnt);
                }

                map.addDbEntity(dbEntity);

                // notify delegate
                if (delegate != null) {
                    delegate.dbEntityAdded(dbEntity);
                }

                // delegate might have thrown this entity out... so check if it is still
                // around before continuing processing
File
DbLoader.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
            loadDbAttributes(config.getFiltersConfig(), tablesMap.getKey(), tablesMap.getValue());

<<<<<<< HEAD
        // get primary keys for each table and store it in dbEntity
        getPrimaryKeysForEachTableAndStoreItInDbEntity(map, tables);
=======
            // get primary keys for each table and store it in dbEntity
            getPrimaryKeyForTable(tablesMap.getValue());
        }
>>>>>>> 2894d5ffa04df9b01e5bb3acd097be23a2c9d438

        return dbEntityList;
    }
Solution content 
            loadDbAttributes(config.getFiltersConfig(), tablesMap.getKey(), tablesMap.getValue());

            // get primary keys for each table and store it in dbEntity
            getPrimaryKeyForTable(tablesMap.getValue());
        }

        return dbEntityList;
    }
File
DbLoader.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
                    DbEntity fkEntity = tables.get(key.getFKTableName());
                    if (fkEntity == null) {
<<<<<<< HEAD
                        LOGGER.info("FK warning: no entity found for name '" + fkEntityName + "'");
                    } else {
                        // init relationship
                        forwardRelationship = new DbRelationship(generateName(entity, key, true));
                        forwardRelationship.setSourceEntity(entity);
                        forwardRelationship.setTargetEntity(fkEntity);
                        entity.addRelationship(forwardRelationship);

                        reverseRelationship = new DbRelationshipDetected(generateName(fkEntity, key, false));
                        reverseRelationship.setFkName(key.getFKName());
                        reverseRelationship.setToMany(false);
                        reverseRelationship.setSourceEntity(fkEntity);
                        reverseRelationship.setTargetEntity(entity);
                        fkEntity.addRelationship(reverseRelationship);
=======
                        skipRelationLog(key, key.getFKTableName());
                        continue;
>>>>>>> 2894d5ffa04df9b01e5bb3acd097be23a2c9d438
                    }
                    DbPath path = new DbPath(fkEntity.getCatalog(), fkEntity.getSchema(), fkEntity.getName());
                    if (!config.getFiltersConfig().filter(path).tableFilter().isInclude(fkEntity)) {
Solution content 
                    DbEntity fkEntity = tables.get(key.getFKTableName());
                    if (fkEntity == null) {
                        skipRelationLog(key, key.getFKTableName());
                        continue;
                    }
                    DbPath path = new DbPath(fkEntity.getCatalog(), fkEntity.getSchema(), fkEntity.getName());
                    if (!config.getFiltersConfig().filter(path).tableFilter().isInclude(fkEntity)) {
File
DbLoader.java
Developer's decision
Version 2
Kind of conflict
Comment
Continue statement
Method invocation
Variable
Chunk
Conflicting content 
        Map> tables = getTables(config, tableTypes);
        List entities = loadDbEntities(dataMap, config, tables);

<<<<<<< HEAD
		if (entities != null) {
			loadDbRelationships(dataMap, config, entities);
			Collection loadedObjEntities = loadObjEntities(dataMap, config, entities);

			flattenManyToManyRelationships(dataMap, loadedObjEntities);
			fireObjEntitiesAddedEvents(loadedObjEntities);
		}
=======
        if (entities != null) {
            loadDbRelationships(config, tables);

            loadObjEntities(dataMap, config, entities);
            flattenManyToManyRelationships(dataMap);
            fireObjEntitiesAddedEvents(dataMap);
        }
    }
>>>>>>> 2894d5ffa04df9b01e5bb3acd097be23a2c9d438

    /**
     * Performs database reverse engineering to match the specified catalog,
Solution content 
        Map> tables = getTables(config, tableTypes);
        List entities = loadDbEntities(dataMap, config, tables);

        if (entities != null) {
            loadDbRelationships(config, tables);
            Collection loadedObjEntities = loadObjEntities(dataMap, config, entities);

            flattenManyToManyRelationships(dataMap, loadedObjEntities);
            fireObjEntitiesAddedEvents(loadedObjEntities);
        }
    }

    /**
     * Performs database reverse engineering to match the specified catalog,
File
DbLoader.java
Developer's decision
Combination
Kind of conflict
If statement
Chunk
Conflicting content 
package org.apache.cayenne.modeler.dialog.db;

<<<<<<< HEAD
=======
import org.apache.cayenne.CayenneException;
>>>>>>> 2894d5ffa04df9b01e5bb3acd097be23a2c9d438
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DbLoader;
import org.apache.cayenne.access.DbLoaderDelegate;
Solution content 
package org.apache.cayenne.modeler.dialog.db;

import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DbLoader;
import org.apache.cayenne.access.DbLoaderDelegate;
File
DbLoaderHelper.java
Developer's decision
Version 1
Kind of conflict
Import