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

get tuple function added

Browse source
This commit is contained in:
Rebecca Schofield 2015-09-24 20:46:30 -05:00
parent 1e5e31b965
commit de204d8b92
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DBEngine.cpp
View file

@ -84,7 +84,7 @@ void DBEngine::rename(Relation& r, vector<string> oldnames, vector<string> newna
}
}
Relation DBEngine::setUnion(Relation r1, Relation r2){
/*Relation DBEngine::setUnion(Relation r1, Relation r2){
if (r1.getAttributeNames() != r2.getAttributeNames()){
cout << "Failure to union: the relations are not union-compatible";
return;
@ -114,4 +114,4 @@ Relation DBEngine::setUnion(Relation r1, Relation r2){
Relation new_r("TEMP", new_atts);
return new_r;
}
}
}*/

2
DBEngine.h
View file

@ -21,7 +21,7 @@ public:
Relation selection(string attName, string s, Relation r);
Relation projection(vector<string> input, Relation r);
void rename(Relation& r, vector<string> oldnames, vector<string> newnames);
Relation setUnion(Relation r1, Relation r2);
//Relation setUnion(Relation r1, Relation r2);
//void setDiff();
//void crossProduct();
};

BIN
a.out
View file

Binary file not shown.