Projects >> Sourcerer >>31f3470763312dda75cf47e739b7d224b0436e02

Chunk
Conflicting content 
import edu.uci.ics.sourcerer.utils.db.QueryExecutor;
import edu.uci.ics.sourcerer.model.db.ImportDB;
=======
 */
package edu.uci.ics.sourcerer.db.queries;

<<<<<<< HEAD
import static edu.uci.ics.sourcerer.db.schema.ImportsTable.*;

import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collection;

import edu.uci.ics.sourcerer.db.util.QueryExecutor;
import edu.uci.ics.sourcerer.db.util.ResultTranslator;
>>>>>>> 16cab6ee9e9fc90bdb03b995743e0bc175ae3ce9

/**
 * @author Joel Ossher (jossher@uci.edu)
Solution content 
<<<<<<< HEAD
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collection;

 */
package edu.uci.ics.sourcerer.db.queries;

import static edu.uci.ics.sourcerer.db.schema.ImportsTable.*;

import edu.uci.ics.sourcerer.db.util.QueryExecutor;
import edu.uci.ics.sourcerer.db.util.ResultTranslator;
import edu.uci.ics.sourcerer.model.db.ImportDB;
=======
import edu.uci.ics.sourcerer.utils.db.QueryExecutor;
>>>>>>> flossmole

/**
 * @author Joel Ossher (jossher@uci.edu)
File
ImportQueries.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import edu.uci.ics.sourcerer.model.db.FileFqn;
import edu.uci.ics.sourcerer.model.db.ImportFqn;
import edu.uci.ics.sourcerer.model.db.MediumEntityDB;
<<<<<<< HEAD
import edu.uci.ics.sourcerer.model.db.RelationEntityDB;
=======
import edu.uci.ics.sourcerer.utils.db.BasicResultTranslator;
import edu.uci.ics.sourcerer.utils.db.QueryExecutor;
import edu.uci.ics.sourcerer.utils.db.ResultTranslator;
>>>>>>> 16cab6ee9e9fc90bdb03b995743e0bc175ae3ce9

/**
 * @author Joel Ossher (jossher@uci.edu)
Solution content 
import edu.uci.ics.sourcerer.model.db.FileFqn;
import edu.uci.ics.sourcerer.model.db.ImportFqn;
import edu.uci.ics.sourcerer.model.db.MediumEntityDB;
import edu.uci.ics.sourcerer.model.db.RelationEntityDB;
import edu.uci.ics.sourcerer.utils.db.BasicResultTranslator;
import edu.uci.ics.sourcerer.utils.db.QueryExecutor;
import edu.uci.ics.sourcerer.utils.db.ResultTranslator;

/**
 * @author Joel Ossher (jossher@uci.edu)
File
JoinQueries.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import edu.uci.ics.sourcerer.model.Relation;
import edu.uci.ics.sourcerer.model.db.LocationDB;
<<<<<<< HEAD
import edu.uci.ics.sourcerer.model.db.RelationDB;
=======
import edu.uci.ics.sourcerer.utils.db.QueryExecutor;
import edu.uci.ics.sourcerer.utils.db.ResultTranslator;
>>>>>>> 16cab6ee9e9fc90bdb03b995743e0bc175ae3ce9

/**
 * @author Joel Ossher (jossher@uci.edu)
Solution content 
import edu.uci.ics.sourcerer.model.Relation;
import edu.uci.ics.sourcerer.model.db.LocationDB;
<<<<<<< HEAD
import edu.uci.ics.sourcerer.model.db.RelationDB;
=======
import edu.uci.ics.sourcerer.utils.db.QueryExecutor;
import edu.uci.ics.sourcerer.utils.db.ResultTranslator;
>>>>>>> flossmole

/**
 * @author Joel Ossher (jossher@uci.edu)
File
RelationQueries.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.zip.ZipFile;

import edu.uci.ics.sourcerer.db.queries.DatabaseAccessor;
<<<<<<< HEAD
import edu.uci.ics.sourcerer.db.util.DatabaseConnection;
import edu.uci.ics.sourcerer.model.Entity;
=======
>>>>>>> 16cab6ee9e9fc90bdb03b995743e0bc175ae3ce9
import edu.uci.ics.sourcerer.model.File;
import edu.uci.ics.sourcerer.model.Project;
import edu.uci.ics.sourcerer.model.db.EntityDB;
Solution content 
import java.util.zip.ZipFile;

import edu.uci.ics.sourcerer.db.queries.DatabaseAccessor;
<<<<<<< HEAD
import edu.uci.ics.sourcerer.db.util.DatabaseConnection;
import edu.uci.ics.sourcerer.model.Entity;
=======
>>>>>>> flossmole
import edu.uci.ics.sourcerer.model.File;
import edu.uci.ics.sourcerer.model.Project;
import edu.uci.ics.sourcerer.model.db.EntityDB;
File
FileAccessor.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
  
  @Override
  public void insert() {
<<<<<<< HEAD:infrastructure/tools/java/database/src/edu/uci/ics/sourcerer/db/util/InFileInserter.java
    FileUtils.close(writer);
    executor.execute("LOAD DATA CONCURRENT LOCAL INFILE '" + tempFile.getPath().replace('\\', '/') + "' " +
=======
    IOUtils.close(writer);
    executor.execute("LOAD DATA LOCAL INFILE '" + tempFile.getPath().replace('\\', '/') + "' " +
>>>>>>> 16cab6ee9e9fc90bdb03b995743e0bc175ae3ce9:infrastructure/utils/database-utilities/src/edu/uci/ics/sourcerer/utils/db/internal/InFileInserter.java
    		"INTO TABLE " + table + " " +
				"FIELDS TERMINATED BY ',' " +
				"OPTIONALLY ENCLOSED BY '\\\'' " +
Solution content 
  
  @Override
  public void insert() {
    IOUtils.close(writer);
    executor.execute("LOAD DATA CONCURRENT LOCAL INFILE '" + tempFile.getPath().replace('\\', '/') + "' " +
    		"INTO TABLE " + table + " " +
				"FIELDS TERMINATED BY ',' " +
				"OPTIONALLY ENCLOSED BY '\\\'' " +
File
InFileInserter.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
/**
 * @author Joel Ossher (jossher@uci.edu)
 */
<<<<<<< HEAD:infrastructure/utilities/src/edu/uci/ics/sourcerer/util/io/properties/IntegerProperty.java
public class IntegerProperty extends Property {
  public IntegerProperty(String name, String description) {
    super(name, null, description);
  }
  
  public IntegerProperty(String name, Integer defaultValue, String description) {
=======
public class IntegerArgument extends Argument {
  public IntegerArgument(String name, Integer defaultValue, String description) {
>>>>>>> 16cab6ee9e9fc90bdb03b995743e0bc175ae3ce9:infrastructure/utils/utilities/src/edu/uci/ics/sourcerer/util/io/arguments/IntegerArgument.java
    super(name, defaultValue, description);
  }
Solution content 
/**
 * @author Joel Ossher (jossher@uci.edu)
 */
public class IntegerArgument extends Argument {
  public IntegerArgument(String name, Integer defaultValue, String description) {
    super(name, defaultValue, description);
  }
File
IntegerArgument.java
Developer's decision
Version 2
Kind of conflict
Class signature
Method declaration
Method signature