ada/dmspine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing merge issues

Browse source
This commit is contained in:
Brandon Jackson 2015-09-30 17:27:46 -05:00
commit 73215afa39
4 changed files with 75 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
DBEngine.cpp
View file

@ -215,6 +215,7 @@ Relation DBEngine::setDiff(Relation r1, Relation r2){
Relation new_r = r1; Relation new_r = r1;
new_r.setTableName("TEMP"); new_r.setTableName("TEMP");
vector<string> temp; vector<string> temp;
<<<<<<< HEAD
//bool duplicate = false; //bool duplicate = false;
int size = 0; int size = 0;
@ -226,6 +227,15 @@ Relation DBEngine::setDiff(Relation r1, Relation r2){
for (int i = 0; i < r2.getAttributes()[x].getSize(); ++i) for (int i = 0; i < r2.getAttributes()[x].getSize(); ++i)
{ {
=======
int size = 0;
for(int x = 0; x < r2.getAttributes().size(); ++x)
{
for (int i = 0; i < r2.getAttributes()[x].getSize(); ++i)
{
>>>>>>> e3ef70bf1536697f14395063975a6376b7df6f61
temp = r2.getTuple(i); temp = r2.getTuple(i);
for(int y = 0; y < new_r.getAttributes().size(); ++y) for(int y = 0; y < new_r.getAttributes().size(); ++y)
@ -248,7 +258,11 @@ Relation DBEngine::setDiff(Relation r1, Relation r2){
} }
} }
} }
<<<<<<< HEAD
} }
=======
}
>>>>>>> e3ef70bf1536697f14395063975a6376b7df6f61
return new_r; return new_r;
} }
} }
@ -287,4 +301,15 @@ Relation DBEngine::crossProduct(Relation r1, Relation r2){
return new_r; return new_r;
<<<<<<< HEAD
=======
}
//UPDATE Senator
//SET Party = ‘Independent’
//WHERE Name = ‘Joseph Lieberman’
Relation DBEngine::update(Relation r, string attNameSet, string attSet, string attNameWhere, string attWhere){
return r;
>>>>>>> e3ef70bf1536697f14395063975a6376b7df6f61
} }

6
DBEngine.h
View file

@ -30,5 +30,11 @@ public:
Relation rename(vector<string> newnames, Relation &r); Relation rename(vector<string> newnames, Relation &r);
Relation setUnion(Relation r1, Relation r2); Relation setUnion(Relation r1, Relation r2);
Relation setDiff(Relation r1, Relation r2); Relation setDiff(Relation r1, Relation r2);
<<<<<<< HEAD
Relation crossProduct(Relation r1, Relation r2); Relation crossProduct(Relation r1, Relation r2);
=======
Relation crossProduct(Relation r1, Relation r2);
Relation update(Relation r, string attNameSet, string attSet, string attNameWhere, string attWhere);
//Relation deleteCmd();
>>>>>>> e3ef70bf1536697f14395063975a6376b7df6f61
}; };

BIN
a.out
View file

Binary file not shown.

44
test.cpp
View file

@ -1,12 +1,56 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "Parser.h" #include "Parser.h"
<<<<<<< HEAD
//#include "Condition.h" //#include "Condition.h"
#include "DBEngine.h" #include "DBEngine.h"
#include "user.h" #include "user.h"
=======
#include "Condition.h"
#include "DBEngine.h"
>>>>>>> e3ef70bf1536697f14395063975a6376b7df6f61
using namespace std; using namespace std;
int main () { int main () {
<<<<<<< HEAD
=======
DBEngine engine;
Attribute att1("Breakfast", "VARCHAR(20)", true);
Attribute att2("Lunch", "VARCHAR(20)", false);
Attribute att3("Dinner", "VARCHAR(20)", false);
att1.addCell("Pancakes");
att1.addCell("Waffles");
att1.addCell("Biscuits");
att2.addCell("Turkey Sandwich");
att2.addCell("Caesar Salad");
att2.addCell("Pizza");
att3.addCell("Steak");
att3.addCell("Shrimp");
att3.addCell("Ribs");
vector<Attribute> v;
v.push_back(att1);
v.push_back(att2);
v.push_back(att3);
engine.createTable("Food", v);
//engine.update
/*actual testing
string x;
cout << "Enter DBMS Commands: ";
while(getline(cin, x))
{
//cout << x << endl;
parse(x, engine);
cout << "Enter DBMS Commands: ";
}
*/
>>>>>>> e3ef70bf1536697f14395063975a6376b7df6f61
} }