From c23f25b20a36088947c480d8900291c620ea010a Mon Sep 17 00:00:00 2001 From: Becca Date: Tue, 15 Sep 2015 10:21:16 -0500 Subject: [PATCH] updates --- a.out | Bin 36339 -> 36312 bytes dbCmds.txt | 2 ++ db_engine.cpp | 25 +++++++++++++++++++++---- db_engine.h | 2 +- test.cpp | 15 +++++++++++++-- 5 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 dbCmds.txt diff --git a/a.out b/a.out index 16a80ad064e9ab6d2b417cf7053568de4e208a4b..0ade4b55f0bfeb69d4ca4750456a87693da31d04 100755 GIT binary patch delta 12580 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 attributes, vector pkeys){ + //creates the proper command and adds it to the cmdList + //make this better, we need a heterogenous container string output = ""; output += "CREATE TABLE " + tableName + " ("; @@ -43,8 +45,7 @@ void db_engine::createCmd(string tableName, vector attributes, vector t){ + string output = "INSERT INTO " + tableName + " VALUES FROM ("; + + vector::iterator it = t.begin(); + while (it != t.end()){ + if (it == t.begin()) + if ((it + 1) != t.end()) + output += *it + ","; + else + output += *it; + else + output+= " " + *it; + + ++it; + } + + cmdList.push_back(output + ");"); } //remove a tuple from a table in the memory diff --git a/db_engine.h b/db_engine.h index e7192d7..e56f754 100755 --- a/db_engine.h +++ b/db_engine.h @@ -14,7 +14,7 @@ public: //void openCmd(); void saveCmd(); void showCmd(string tableName); - void insertQuery(); + void insertQuery(string tableName, vector t); void deleteQuery(); void selectQuery(); void projectQuery(); diff --git a/test.cpp b/test.cpp index a5a6be7..392549b 100755 --- a/test.cpp +++ b/test.cpp @@ -5,11 +5,22 @@ using namespace std; int main() { db_engine engine; - + vector attributes; vector pkeys; + //we need a better way to do this + //going for function right now attributes.push_back("username VARCHAR(20)"); attributes.push_back("password VARCHAR(20)"); pkeys.push_back("password"); + engine.createCmd("users", attributes, pkeys); -} \ No newline at end of file + + vector tuple; + tuple.push_back("csce315"); + tuple.push_back("12345"); + + engine.insertQuery("users", tuple); + + engine.saveCmd(); +}