diff --git a/Condition.h b/Condition.h new file mode 100755 index 0000000..cc06978 --- /dev/null +++ b/Condition.h @@ -0,0 +1,13 @@ +#include +#include "Attribute.h" + +using namespace std; + +class Condition{ + Attribute att; + +public: + //currently only implemented for comparison + Condition(Attribute a); + Condition(Attribute a); +}; \ No newline at end of file diff --git a/DBEngine.cpp b/DBEngine.cpp index 26670b8..db596e6 100755 --- a/DBEngine.cpp +++ b/DBEngine.cpp @@ -29,7 +29,6 @@ vector DBEngine::getRelations(){ } Relation& DBEngine::getTableFromName(string n){ - //will return first occurence for(int i = 0; i < tables.size(); i++){ if (tables[i].getTableName() == n){ return tables[i]; @@ -37,8 +36,8 @@ Relation& DBEngine::getTableFromName(string n){ } } +//currently writes nothing meaningful void DBEngine::saveToFile(vector cmds){ - //writes nothing meaningful ofstream file; file.open("savefile.db"); @@ -60,7 +59,7 @@ Relation DBEngine::projection(vector input, Relation r){ // } } -//ASAP: TEST ALL OF THIS +//TEST ERRORS MATCHING void DBEngine::rename(Relation& r, vector oldnames, vector newnames){ if (oldnames.size() != newnames.size()) { cout << "Failure to rename: number of attributes do not match."; diff --git a/DBEngine.h b/DBEngine.h index 20a921c..8a71981 100755 --- a/DBEngine.h +++ b/DBEngine.h @@ -17,8 +17,6 @@ public: //void showTable(Relation r); Relation& getTableFromName(string n); void saveToFile(vector cmds); - - //operations //Relation selection(); Relation projection(vector input, Relation r); void rename(Relation& r, vector oldnames, vector newnames);