added the framework
This commit is contained in:
parent
effe7d3d27
commit
e3ef70bf15
3 changed files with 10 additions and 8 deletions
11
DBEngine.cpp
11
DBEngine.cpp
|
@ -217,8 +217,7 @@ Relation DBEngine::setDiff(Relation r1, Relation r2){
|
|||
vector<string> temp;
|
||||
|
||||
int size = 0;
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
for(int x = 0; x < r2.getAttributes().size(); ++x)
|
||||
{
|
||||
for (int i = 0; i < r2.getAttributes()[x].getSize(); ++i)
|
||||
|
@ -284,4 +283,12 @@ Relation DBEngine::crossProduct(Relation r1, Relation r2){
|
|||
|
||||
|
||||
return new_r;
|
||||
}
|
||||
|
||||
//UPDATE Senator
|
||||
//SET Party = ‘Independent’
|
||||
//WHERE Name = ‘Joseph Lieberman’
|
||||
|
||||
Relation DBEngine::update(Relation r, string attNameSet, string attSet, string attNameWhere, string attWhere){
|
||||
return r;
|
||||
}
|
||||
|
|
|
@ -31,11 +31,6 @@ public:
|
|||
Relation setUnion(Relation r1, Relation r2);
|
||||
Relation setDiff(Relation r1, Relation r2);
|
||||
Relation crossProduct(Relation r1, Relation r2);
|
||||
Relation update();
|
||||
|
||||
//UPDATE Senator
|
||||
//SET Party = ‘Independent’
|
||||
//WHERE Name = ‘Joseph Lieberman’;
|
||||
|
||||
Relation update(Relation r, string attNameSet, string attSet, string attNameWhere, string attWhere);
|
||||
//Relation deleteCmd();
|
||||
};
|
||||
|
|
BIN
a.out
BIN
a.out
Binary file not shown.
Reference in a new issue