diff --git a/DBEngine.cpp b/DBEngine.cpp index 9b9aabe..55a245b 100755 --- a/DBEngine.cpp +++ b/DBEngine.cpp @@ -84,7 +84,7 @@ void DBEngine::rename(Relation& r, vector oldnames, vector 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; } -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/DBEngine.h b/DBEngine.h index 878a42e..4b8a309 100755 --- a/DBEngine.h +++ b/DBEngine.h @@ -21,7 +21,7 @@ public: Relation selection(string attName, string s, Relation r); Relation projection(vector input, Relation r); void rename(Relation& r, vector oldnames, vector newnames); - Relation setUnion(Relation r1, Relation r2); + //Relation setUnion(Relation r1, Relation r2); //void setDiff(); //void crossProduct(); }; diff --git a/a.out b/a.out index 141fa42..3302e97 100755 Binary files a/a.out and b/a.out differ