Projects information

Chunk

Conflicting content
view = table.where().equalTo(0, "John").findAll(); // Find the average salary of all employees with the last name Anderson. <<<<<<< HEAD double avgSalary = table.where().equalTo(1, "Anderson").averageInt(2); // Find the total salary of people named Jane and Erik. double salary = table.where().group().equalTo(0, "Jane").or().equalTo(0, "Erik").endGroup().sumInt(2); ======= double avgSalary = table.where().equal(1, "Anderson").averageInt(2); // Find the total salary of people named Jane and Erik. double salary = table.where().group().equal(0, "Jane").or().equal(0, "Erik").endGroup().sumInt(2); >>>>>>> abc5eeac305da353ad887c981f4c920d40d3c5c2 // Find all employees with a last name of Lee and a salary less than 25000. view = table.where().equalTo(1, "Lee").lessThan(2, 25000).findAll();

Conflicting content

view = table.where().equalTo(0, "John").findAll();

// Find the average salary of all employees with the last name Anderson.
<<<<<<< HEAD
double avgSalary = table.where().equalTo(1, "Anderson").averageInt(2);

// Find the total salary of people named Jane and Erik.
double salary = table.where().group().equalTo(0, "Jane").or().equalTo(0, "Erik").endGroup().sumInt(2);
=======
double avgSalary = table.where().equal(1, "Anderson").averageInt(2);

// Find the total salary of people named Jane and Erik.
double salary = table.where().group().equal(0, "Jane").or().equal(0, "Erik").endGroup().sumInt(2);
>>>>>>> abc5eeac305da353ad887c981f4c920d40d3c5c2

// Find all employees with a last name of Lee and a salary less than 25000.
view = table.where().equalTo(1, "Lee").lessThan(2, 25000).findAll();

Solution content
view = table.where().equalTo(0, "John").findAll(); // Find the average salary of all employees with the last name Anderson. double avgSalary = table.where().equalTo(1, "Anderson").averageInt(2); // Find the total salary of people named Jane and Erik. double salary = table.where().group().equalTo(0, "Jane").or().equalTo(0, "Erik").endGroup().sumInt(2); // Find all employees with a last name of Lee and a salary less than 25000. view = table.where().equalTo(1, "Lee").lessThan(2, 25000).findAll();

Solution content

view = table.where().equalTo(0, "John").findAll();

// Find the average salary of all employees with the last name Anderson.
double avgSalary = table.where().equalTo(1, "Anderson").averageInt(2);

// Find the total salary of people named Jane and Erik.
double salary = table.where().group().equalTo(0, "Jane").or().equalTo(0, "Erik").endGroup().sumInt(2);


// Find all employees with a last name of Lee and a salary less than 25000.
view = table.where().equalTo(1, "Lee").lessThan(2, 25000).findAll();

File
DynQueryIntro.java

Developer's decision
Version 1

Kind of conflict
Comment
Method invocation
Variable

Projects >> realm-java >>565065c615e5142d3354ec3f81724967500cfbae