From a966090eeacde14b65aeba447a13551df317eecf Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 15 Sep 2015 02:57:09 -0500
Subject: [PATCH 01/22] Update db_engine.cpp

---
 db_engine.cpp | 110 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 99 insertions(+), 11 deletions(-)

diff --git a/db_engine.cpp b/db_engine.cpp
index 30fa0b7..b88d9d4 100755
--- a/db_engine.cpp
+++ b/db_engine.cpp
@@ -1,12 +1,50 @@
 #include "db_engine.h"
 
+using namespace std;
+
 db_engine::db_engine(){
 	//
 }
 
 //create a new table in memory
-db_engine::createCmd(){
-	////
+//creates a vector 
+//DONE
+void db_engine::createCmd(string tableName, vector<string> attributes, vector<string> pkeys){
+	string output = "";
+	output += "CREATE TABLE " + tableName + " (";
+	
+	vector<string>::iterator it = attributes.begin();
+	while (it != attributes.end()){
+		if (it == attributes.begin())
+			if ((it + 1) != attributes.end())
+				output += *it + ",";
+			else
+				output += *it;
+		else
+			output+= " " + *it;
+		
+		++it;
+	}
+	
+	output += ") PRIMARY KEY (";
+	
+	vector<string>::iterator it2 = pkeys.begin();
+	while (it2 != pkeys.end()){
+		if (it2 == pkeys.begin())
+			if ((it2 + 1) != pkeys.end())
+				output += *it2 + ",";
+			else
+				output += *it2;
+		else
+			output+= " " + *it2;
+		
+		++it2;
+	}
+	
+	output += ");";
+	
+	cout << output;
+	//cmdList.push_back(output);
 }
 	
 //open a txt file, parse SQL script, load data in table
@@ -14,42 +52,92 @@ db_engine::createCmd(){
 	//
 //}
 
-//save all the commands to the db text file
+//should write cmdList to a .txt file
+//DONE
 void db_engine::saveCmd(){
-	//
+	ofstream dbCmdFile;
+	dbCmdFile.open("dbCmds.txt", ios_base::app);
+	
+	vector<string>::iterator it = cmdList.begin();
+	while (it != cmdList.end()){
+		dbCmdFile << *it << "\n";
+		++it;
+	}
+	
+	cmdList.clear();
 }
 
-//display the table currently stored in memory
-void db_engine::showCmd(){
-	//
+//display the database
+//DONE
+void db_engine::showCmd(string tableName){
+	cmdList.push_back("SHOW " + tableName + "");
 }
 
 //add a tuple to a table in the memory
+//BECCA
 void db_engine::insertQuery(){
-	//
+	//table.push_back();
 }
 
 //remove a tuple from a table in the memory
+//BECCA
 void db_engine::deleteQuery(){
 	//
 }
 
 //search and return one more tuples from a table in the memory
+//WILLIAM
 void db_engine::selectQuery(){
 	//
 }
 
 //return a subset of attributes (columns)
-void db_engine::projectQuery(){
-	//
+//BRANDON
+vector<string> db_engine::projectQuery(vector< vector<string> > table, vector<string> attributes, string query){
+	/*
+		So basically this is what's going on:
+		- Take the table to iterate through, this is the 2D vector (input 1)
+		- Take the vector of attributes that pertains to the respective table (input 2)
+		- Take a string that will be used for the program to search for in the attributes (input 3)
+		- In the attributes vector, iterate through each attribute until the attribute (string) matches the input query
+		- For every iterator, have a counter that counts how many attributes are skipped over in the vector until the attribute is found
+		- This counter will be used to iterate through each vector (row) in the list, skip over that many attributes, and push that into a result vector
+		- Once all vector's elements at the specified attribute are pushed back, return the result vector
+	*/
+	int counter = 0; //counter for iterating through the attributes, initialized at 0 for reasons
+	vector<string> result;
+
+	//Loop through the vector until we have found a string in it that matches the query
+	for(int i=0; i < attributes.size(); i++){
+		counter++;
+		if(attributes[i] == query)
+			break;
+		else
+			continue;
+	}
+	
+	//So let's say we have a 2-D Vector (the table) that contains all of the rows, we iterate through each row
+	std::vector< std::vector<int> >::const_iterator row; 
+    std::vector<int>::const_iterator col; 
+
+    for (row = table.begin(); row != table.end(); ++row) { 
+		//Instead of col != row->end() we have it counter, in order for the program to access the correct data under the correct attribute
+		for (col = row->begin(); col != counter; col++) {
+			result.push_back(col); //Now we store that row's attribute into the result vector
+		}
+    }
+	
+	return result;
 }
 
 //each row in the first table is paired with all the rows in the second table
-void db_engine::productQuery(){
+//BRANDON
+vector< vector<string> > db_engine::productQuery(vector< vector<string> > table_1, vector< vector<string> > table_2){
 	//
 }
 
 //true if relations have the same # of attributes and each attribute must be from the same domain
+//WILLIAM
 bool db_engine::unionComp(){
 	return false;
 }

From 68263bd0131327022c7ecb655a976cecddbada0a Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 15 Sep 2015 02:57:33 -0500
Subject: [PATCH 02/22] Update db_engine.h

---
 db_engine.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/db_engine.h b/db_engine.h
index f319f02..05e7b60 100755
--- a/db_engine.h
+++ b/db_engine.h
@@ -1,12 +1,19 @@
+#include <fstream>
+#include <iostream>
+#include <vector>
+
+using namespace std;
+
 class db_engine {
-	//member variables
+	vector<string> cmdList;
+	//vector<vector<string>> table;
 
 public:
 	db_engine();
-	void createCmd();
+	void createCmd(string tableName, vector<string> attributes, vector<string> pkeys);
 	//void openCmd();
 	void saveCmd();
-	void showCmd();
+	void showCmd(string tableName);
 	void insertQuery();
 	void deleteQuery();
 	void selectQuery();

From 91ae6e305ad99640e7f7ab430a77ae5ecf38cb64 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 18:56:40 -0500
Subject: [PATCH 03/22] Create Attribute.h

---
 Attribute.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 Attribute.h

diff --git a/Attribute.h b/Attribute.h
new file mode 100644
index 0000000..87b2c25
--- /dev/null
+++ b/Attribute.h
@@ -0,0 +1,58 @@
+#include <iostream>
+#include <vector>
+
+using namespace std;
+
+//Funtional, might need more functionality
+
+//template<typename T>
+class Attribute {
+	//a named column of a relation
+	string name;
+	vector<string> values;
+	bool isKey;
+	int size;
+	
+public:
+
+	void initializeAttribute(string n, vector<string> a){ 
+	 
+		name = n;
+		values = a;
+	}
+	
+	string getName(){ 
+		return name; 
+	}
+	
+	Attribute(){  }
+	
+	void display()
+	{
+		cout<<"Atribute name:\t"<<name<<"\n";
+		cout<<"Elements: ";
+		for (int i = 0; i < values.size(); ++i)
+		{
+			cout<<values[i]<<"      ";
+		}
+	}
+/*	
+	Attribute(vector<string> v){ 
+		this.values = v; 
+	}
+	
+	Attribute(const Attribute<string>& a){ 
+		this.values = a.getAll(); 
+	}
+	
+	Attribute& operator=(const Attribute<string>& a){ 
+		this.values = a.getAll(); 
+	}
+	
+	
+	
+	vector<string> getAll(){
+		return this.values;
+	}
+*/	
+};

From 163270d71a8ceceaa595f84264e9bb813c88fd37 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 18:59:58 -0500
Subject: [PATCH 04/22] Create test2.cpp

---
 test2.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 test2.cpp

diff --git a/test2.cpp b/test2.cpp
new file mode 100644
index 0000000..5b0a6f8
--- /dev/null
+++ b/test2.cpp
@@ -0,0 +1,26 @@
+#include <iostream>
+//#include "DBEngine.h"
+#include <vector>
+#include "Attribute.h"
+
+using namespace std;
+
+int main() {
+	
+	/*
+	DBEngine engine;
+	Relation r;
+	Attribute<int> a;
+	*/
+	
+	vector<string> shamWow;
+	pendejo.push_back("rag");
+	pendejo.push_back("sponge");
+	pendejo.push_back("wooow");
+	pendejo.push_back("cloth");
+	
+	Attribute atributo;
+	atributo.initializeAttribute("atributo",shamWow);
+	
+	atributo.display();
+}

From 0dba891839ed0880f8d16f875f16306d0fd86cc3 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 19:11:46 -0500
Subject: [PATCH 05/22] Update test2.cpp

---
 test2.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test2.cpp b/test2.cpp
index 5b0a6f8..280656a 100644
--- a/test2.cpp
+++ b/test2.cpp
@@ -14,10 +14,10 @@ int main() {
 	*/
 	
 	vector<string> shamWow;
-	pendejo.push_back("rag");
-	pendejo.push_back("sponge");
-	pendejo.push_back("wooow");
-	pendejo.push_back("cloth");
+	shamWow.push_back("rag");
+	shamWow.push_back("sponge");
+	shamWow.push_back("wooow");
+	shamWow.push_back("cloth");
 	
 	Attribute atributo;
 	atributo.initializeAttribute("atributo",shamWow);

From b842955e3e44b707b4b4ca12d6f386a275ba19f9 Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 15 Sep 2015 20:16:58 -0500
Subject: [PATCH 06/22] Update test.cpp

---
 test.cpp | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/test.cpp b/test.cpp
index 491d9f9..0c956a1 100755
--- a/test.cpp
+++ b/test.cpp
@@ -1,5 +1,67 @@
+/*
 #include <iostream>
+#include "DBEngine.h"
+
+using namespace std;
 
 int main() {
-	std::cout << "Hello World!";
-}
\ No newline at end of file
+	
+	
+	//DBEngine engine;
+	vector<string> my_vector = {"Name", "Grade", "Happiness"};
+	string at1 = "Name", at2 = "Grade", at3 = "Happiness";
+	
+	
+	Attribute<string> attribute_1(at1);//, attribute_2(at2), attribute_3(at3);
+	
+	
+	//Relation r(line1, my_attributes);
+	
+	//r.displayTableName();
+*/
+	
+#include <iostream>
+//#include "DBEngine.h"
+#include <vector>
+#include "Attribute.h"
+
+using namespace std;
+
+int main() {
+	
+	/*
+	DBEngine engine;
+	Relation r;
+	Attribute<int> a;
+	*/
+	
+	vector<string> shamWow;
+	shamWow.push_back("rag");
+	shamWow.push_back("sponge");
+	shamWow.push_back("wooow");
+	shamWow.push_back("cloth");
+	
+	Attribute atributo;
+	atributo.initializeAttribute("atributo",shamWow);
+	atributo.display();
+	
+	vector<string> doom;
+	doom.push_back("zombieman");
+	doom.push_back("revenant");
+	doom.push_back("imp");
+	doom.push_back("archvile");
+	
+	Attribute atributo2;
+	atributo2.initializeAttribute("attribute_2", doom);
+	atributo2.display();
+	
+	
+	
+	
+	string line1 = "Table_1";
+	
+	
+	
+	//Relation r(line1, my_attributes);
+}
+

From 990dfa0056c04acf298b44132f07c87151aa5853 Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 15 Sep 2015 20:17:21 -0500
Subject: [PATCH 07/22] Create Attribute.h

---
 Attribute.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 Attribute.h

diff --git a/Attribute.h b/Attribute.h
new file mode 100644
index 0000000..9d53d4c
--- /dev/null
+++ b/Attribute.h
@@ -0,0 +1,47 @@
+#include <iostream>
+#include <vector>
+
+using namespace std;
+
+//Funtional, might need more functionality
+
+//template<typename T>
+class Attribute {
+	//a named column of a relation
+	string name;
+	
+	bool isKey;
+	int size;
+	
+public:
+
+	vector<string> values;
+
+	void initializeAttribute(string n, vector<string> a){ 
+	 
+		name = n;
+		values = a;
+	}
+	
+	string getName(){ 
+		return name; 
+	}
+	
+	Attribute(){  }
+	
+	void display()
+	{
+		cout<<"Atribute name:\t"<<name<<"\n";
+		cout<<"Elements: ";
+		for (int i = 0; i < values.size(); ++i)
+		{
+			cout<<values[i]<<"      ";
+		}
+	}
+	
+	/*
+	vector<string> getElements(){
+		return values;
+	}
+	*/
+};

From b24f5117f4ddfb071097405cbdb7ea16617d2be8 Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 15 Sep 2015 20:17:52 -0500
Subject: [PATCH 08/22] Create Relation.h

---
 Relation.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 Relation.h

diff --git a/Relation.h b/Relation.h
new file mode 100644
index 0000000..c41db03
--- /dev/null
+++ b/Relation.h
@@ -0,0 +1,47 @@
+#include <iostream>
+#include <vector>
+#include "Attribute.h"
+
+using namespace std;
+
+//NOT DONE
+class Relation {
+	//a table with rows and columns
+	string name; //The title the user gives it
+	vector< Attribute > att; //A vector of the columns
+	
+public:
+	Relation();
+	
+	//constructor 
+	Relation(string n, vector< Attribute > a) {
+		name = n;
+		att = a;
+	} 
+	
+	void addTuple(vector< string > tuple) {
+		
+		//Loop through the attribute columns
+		for(int i = 0; i < att.size(); i++) {
+			
+			//Loop through the elements in the i'th column 
+			for(int j = 0; j < att[i].values.size(); j++){
+				
+				//In this column, at this element's spot, assign an element from the tuple vector to this spot
+				(att[i].values[j]).assign(tuple[i]);
+			}
+		}
+	}
+	
+	void displayTableName() {
+		cout << "The table name is: " << name << endl;
+	}
+	
+	vector< Attribute > getAttributes(){
+		return att;
+	}
+	
+	int getSize() {
+		return att.size();
+	}
+};

From f5db5ac3ecb4f238c86edd533aec3640104255ad Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 15 Sep 2015 20:19:10 -0500
Subject: [PATCH 09/22] Update and rename db_engine.cpp to DBEngine.cpp

---
 DBEngine.cpp  |  73 ++++++++++++++++++++++++++
 db_engine.cpp | 143 --------------------------------------------------
 2 files changed, 73 insertions(+), 143 deletions(-)
 create mode 100755 DBEngine.cpp
 delete mode 100755 db_engine.cpp

diff --git a/DBEngine.cpp b/DBEngine.cpp
new file mode 100755
index 0000000..a854dec
--- /dev/null
+++ b/DBEngine.cpp
@@ -0,0 +1,73 @@
+#include "DBEngine.h"
+
+using namespace std;
+
+DBEngine::DBEngine(){
+	//
+}
+
+//create a new table in memory
+void DBEngine::createCmd(){
+	//
+}
+	
+//open a txt file, parse SQL script, load data in table
+//void DBEngine::openCmd(){
+	//
+//}
+
+//should write cmdList to a .txt file
+void DBEngine::saveCmd(){
+	//
+}
+
+//display the database
+void DBEngine::showCmd(){
+	//
+}
+
+//add a tuple to a table in the memory
+void DBEngine::insertQuery(){
+	//
+}
+
+//remove a tuple from a table in the memory
+void DBEngine::deleteQuery(){
+	//
+}
+
+//search and return one more tuples from a table in the memory
+void DBEngine::selectQuery(){
+	//
+}
+
+//return a subset of attributes (columns)
+/*
+vector<string> DBEngine::projectQuery(Relation table, string query){
+	
+	/*
+		So basically this is what's going on:
+		- Take the table to iterate through, this is the relation (input 1)
+		- Take a string that will be used for the program to search for in the attributes (input 2)
+		- Iterate through each attribute until the attribute (string) matches the input query
+		- For every iterator, have a counter that counts how many attributes are skipped over in the vector until the attribute is found
+		- This counter will be used to iterate through each vector (row) in the list, skip over that many attributes, and push that into a result vector
+		- Once all vector's elements at the specified attribute are pushed back, return the result vector
+	
+	
+	for(int i = 0; i < table.getSize(); i++) {
+		
+		
+	}
+	
+}
+*/
+//each row in the first table is paired with all the rows in the second table
+void DBEngine::productQuery(){
+	//
+}
+
+//true if relations have the same # of attributes and each attribute must be from the same domain
+bool DBEngine::unionComp(){
+	return false;
+}
diff --git a/db_engine.cpp b/db_engine.cpp
deleted file mode 100755
index b88d9d4..0000000
--- a/db_engine.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "db_engine.h"
-
-using namespace std;
-
-db_engine::db_engine(){
-	//
-}
-
-//create a new table in memory
-//creates a vector 
-//DONE
-void db_engine::createCmd(string tableName, vector<string> attributes, vector<string> pkeys){
-	string output = "";
-	output += "CREATE TABLE " + tableName + " (";
-	
-	vector<string>::iterator it = attributes.begin();
-	while (it != attributes.end()){
-		if (it == attributes.begin())
-			if ((it + 1) != attributes.end())
-				output += *it + ",";
-			else
-				output += *it;
-		else
-			output+= " " + *it;
-		
-		++it;
-	}
-	
-	output += ") PRIMARY KEY (";
-	
-	vector<string>::iterator it2 = pkeys.begin();
-	while (it2 != pkeys.end()){
-		if (it2 == pkeys.begin())
-			if ((it2 + 1) != pkeys.end())
-				output += *it2 + ",";
-			else
-				output += *it2;
-		else
-			output+= " " + *it2;
-		
-		++it2;
-	}
-	
-	output += ");";
-	
-	cout << output;
-	//cmdList.push_back(output);
-}
-	
-//open a txt file, parse SQL script, load data in table
-//void db_engine::openCmd(){
-	//
-//}
-
-//should write cmdList to a .txt file
-//DONE
-void db_engine::saveCmd(){
-	ofstream dbCmdFile;
-	dbCmdFile.open("dbCmds.txt", ios_base::app);
-	
-	vector<string>::iterator it = cmdList.begin();
-	while (it != cmdList.end()){
-		dbCmdFile << *it << "\n";
-		++it;
-	}
-	
-	cmdList.clear();
-}
-
-//display the database
-//DONE
-void db_engine::showCmd(string tableName){
-	cmdList.push_back("SHOW " + tableName + "");
-}
-
-//add a tuple to a table in the memory
-//BECCA
-void db_engine::insertQuery(){
-	//table.push_back();
-}
-
-//remove a tuple from a table in the memory
-//BECCA
-void db_engine::deleteQuery(){
-	//
-}
-
-//search and return one more tuples from a table in the memory
-//WILLIAM
-void db_engine::selectQuery(){
-	//
-}
-
-//return a subset of attributes (columns)
-//BRANDON
-vector<string> db_engine::projectQuery(vector< vector<string> > table, vector<string> attributes, string query){
-	/*
-		So basically this is what's going on:
-		- Take the table to iterate through, this is the 2D vector (input 1)
-		- Take the vector of attributes that pertains to the respective table (input 2)
-		- Take a string that will be used for the program to search for in the attributes (input 3)
-		- In the attributes vector, iterate through each attribute until the attribute (string) matches the input query
-		- For every iterator, have a counter that counts how many attributes are skipped over in the vector until the attribute is found
-		- This counter will be used to iterate through each vector (row) in the list, skip over that many attributes, and push that into a result vector
-		- Once all vector's elements at the specified attribute are pushed back, return the result vector
-	*/
-	int counter = 0; //counter for iterating through the attributes, initialized at 0 for reasons
-	vector<string> result;
-
-	//Loop through the vector until we have found a string in it that matches the query
-	for(int i=0; i < attributes.size(); i++){
-		counter++;
-		if(attributes[i] == query)
-			break;
-		else
-			continue;
-	}
-	
-	//So let's say we have a 2-D Vector (the table) that contains all of the rows, we iterate through each row
-	std::vector< std::vector<int> >::const_iterator row; 
-    std::vector<int>::const_iterator col; 
-
-    for (row = table.begin(); row != table.end(); ++row) { 
-		//Instead of col != row->end() we have it counter, in order for the program to access the correct data under the correct attribute
-		for (col = row->begin(); col != counter; col++) {
-			result.push_back(col); //Now we store that row's attribute into the result vector
-		}
-    }
-	
-	return result;
-}
-
-//each row in the first table is paired with all the rows in the second table
-//BRANDON
-vector< vector<string> > db_engine::productQuery(vector< vector<string> > table_1, vector< vector<string> > table_2){
-	//
-}
-
-//true if relations have the same # of attributes and each attribute must be from the same domain
-//WILLIAM
-bool db_engine::unionComp(){
-	return false;
-}

From d28e68beb0f54939cd2557505887b8232e7fe0ce Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 15 Sep 2015 20:19:49 -0500
Subject: [PATCH 10/22] Update and rename db_engine.h to DBEngine.h

---
 db_engine.h => DBEngine.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
 rename db_engine.h => DBEngine.h (52%)

diff --git a/db_engine.h b/DBEngine.h
similarity index 52%
rename from db_engine.h
rename to DBEngine.h
index 05e7b60..bd807fe 100755
--- a/db_engine.h
+++ b/DBEngine.h
@@ -1,19 +1,21 @@
 #include <fstream>
 #include <iostream>
 #include <vector>
+#include "Relation.h"
 
 using namespace std;
 
-class db_engine {
-	vector<string> cmdList;
-	//vector<vector<string>> table;
+class DBEngine {
+	//member variables
+	//NOT DONE
+	//vector<Relation> tables;
 
 public:
-	db_engine();
-	void createCmd(string tableName, vector<string> attributes, vector<string> pkeys);
+	DBEngine();
+	void createCmd();
 	//void openCmd();
 	void saveCmd();
-	void showCmd(string tableName);
+	void showCmd();
 	void insertQuery();
 	void deleteQuery();
 	void selectQuery();

From f748c986fa156e5c33682cb2e87642103e393c00 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 20:21:19 -0500
Subject: [PATCH 11/22] Update Attribute.h

---
 Attribute.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Attribute.h b/Attribute.h
index 87b2c25..5be40a0 100644
--- a/Attribute.h
+++ b/Attribute.h
@@ -29,13 +29,18 @@ public:
 	
 	void display()
 	{
-		cout<<"Atribute name:\t"<<name<<"\n";
+		cout<<"\nAtribute name:\t"<<name<<"\n";
 		cout<<"Elements: ";
 		for (int i = 0; i < values.size(); ++i)
 		{
 			cout<<values[i]<<"      ";
 		}
 	}
+	
+	int getSize()
+	{
+		return values.size();
+	}
 /*	
 	Attribute(vector<string> v){ 
 		this.values = v; 

From 2b1141bfe7763ced81537203e2c9f15bfe71d958 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 20:21:50 -0500
Subject: [PATCH 12/22] Update test2.cpp

---
 test2.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/test2.cpp b/test2.cpp
index 280656a..2a02bcb 100644
--- a/test2.cpp
+++ b/test2.cpp
@@ -1,7 +1,8 @@
 #include <iostream>
 //#include "DBEngine.h"
 #include <vector>
-#include "Attribute.h"
+//#include "Attribute.h"
+#include "Relation.h"
 
 using namespace std;
 
@@ -23,4 +24,25 @@ int main() {
 	atributo.initializeAttribute("atributo",shamWow);
 	
 	atributo.display();
+	
+	vector<string> doom;
+	doom.push_back("zombieman");
+	doom.push_back("revenant");
+	doom.push_back("imp");
+	doom.push_back("archvile");
+	
+	Attribute atributo2;
+	atributo2.initializeAttribute("atributo2",doom);
+	
+	atributo2.display();
+	
+	vector<Attribute> setOfAttributes;
+	vector<string> attNames;
+	attNames.push_back("attName1");
+	attNames.push_back("attName2");
+	
+	Relation myLittleRelation;
+	myLittleRelation.initializeRelation("randomName", attNames, setOfAttributes);
+	
+	myLittleRelation.display();
 }

From c052e7cbf09b7922b7d37dafb098c78e70faa847 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 20:23:47 -0500
Subject: [PATCH 13/22] Create Relation.h

---
 Relation.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Relation.h

diff --git a/Relation.h b/Relation.h
new file mode 100644
index 0000000..69ccfea
--- /dev/null
+++ b/Relation.h
@@ -0,0 +1,45 @@
+#include <iostream>
+#include <vector>
+#include "Attribute.h"
+
+using namespace std;
+
+//NOT DONE
+class Relation {
+	//a table with rows and columns
+	string name;		//the name of the relation (table)
+	vector<Attribute> att;
+	vector<string> attributeNames;
+	
+public:
+	//Relation();
+	
+	void initializeRelation(string n, vector<string> attNames, vector<Attribute> a) 
+	{ 
+		attributeNames = attNames;
+		name = n;
+		att = a;
+	}
+	
+	void addTuple(vector< Attribute> tuple);
+	
+	void display()
+	{
+		cout<<"\n\nDisplay of relation--------------------------------"<<endl;
+		cout<<"Relation name: "<<name<<endl;
+		for (int i = 0; i < attributeNames.size(); ++i)
+		{
+			
+			cout<<"\nAttribute name:	"<<attributeNames[i]<<": ";
+			
+			/*
+			for (int i = 0; i < att[i].getSize(); ++i)
+			{
+				//cout<<" "<<att[i]<<" ";
+			}
+			*/
+	
+		}
+		
+	}
+};

From 9f0003caefdec28309053c1979a40afd8bb3c7d3 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 20:35:43 -0500
Subject: [PATCH 14/22] Update Attribute.h

---
 Attribute.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Attribute.h b/Attribute.h
index 5be40a0..b57879e 100644
--- a/Attribute.h
+++ b/Attribute.h
@@ -29,8 +29,8 @@ public:
 	
 	void display()
 	{
-		cout<<"\nAtribute name:\t"<<name<<"\n";
-		cout<<"Elements: ";
+		//cout<<"\nAtribute name:\t"<<name<<"\n";
+		//cout<<"Elements: ";
 		for (int i = 0; i < values.size(); ++i)
 		{
 			cout<<values[i]<<"      ";

From 8a3104652e8a404304c04ec12f6b9759d0c863e8 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 20:36:07 -0500
Subject: [PATCH 15/22] Update test2.cpp

---
 test2.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test2.cpp b/test2.cpp
index 2a02bcb..0167b02 100644
--- a/test2.cpp
+++ b/test2.cpp
@@ -37,6 +37,9 @@ int main() {
 	atributo2.display();
 	
 	vector<Attribute> setOfAttributes;
+	setOfAttributes.push_back(atributo);
+	setOfAttributes.push_back(atributo2);
+	
 	vector<string> attNames;
 	attNames.push_back("attName1");
 	attNames.push_back("attName2");

From b2fa6c1a556167f37e7051581ba25abb0beb523e Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 20:36:33 -0500
Subject: [PATCH 16/22] Update Relation.h

---
 Relation.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Relation.h b/Relation.h
index 69ccfea..8668481 100644
--- a/Relation.h
+++ b/Relation.h
@@ -32,12 +32,7 @@ public:
 			
 			cout<<"\nAttribute name:	"<<attributeNames[i]<<": ";
 			
-			/*
-			for (int i = 0; i < att[i].getSize(); ++i)
-			{
-				//cout<<" "<<att[i]<<" ";
-			}
-			*/
+			att[i].display();
 	
 		}
 		

From 94912e6b141950b0c90791efafb1953fa70d69a6 Mon Sep 17 00:00:00 2001
From: Rebecca Schofield <scho4077@tamu.edu>
Date: Tue, 15 Sep 2015 20:55:21 -0500
Subject: [PATCH 17/22] attribute works as expects

---
 Attribute.h |  25 ++++++++++++++++++-------
 Relation.h  |  14 ++++++++------
 a.out       | Bin 0 -> 29594 bytes
 test.cpp    |  38 ++++++++++++--------------------------
 4 files changed, 38 insertions(+), 39 deletions(-)
 create mode 100755 a.out

diff --git a/Attribute.h b/Attribute.h
index 9d53d4c..2c51e1b 100755
--- a/Attribute.h
+++ b/Attribute.h
@@ -9,25 +9,36 @@ using namespace std;
 class Attribute {
 	//a named column of a relation
 	string name;
-	
-	bool isKey;
+	string type;
+	bool key;
 	int size;
 	
 public:
 
 	vector<string> values;
-
-	void initializeAttribute(string n, vector<string> a){ 
-	 
+	
+	Attribute(string n, string t, bool k){ 
 		name = n;
-		values = a;
+		type = t;
+		key = k;
+		size = 0;
+	}
+	
+	void addRow(string v) {
+		values.push_back(v);
 	}
 	
 	string getName(){ 
 		return name; 
 	}
 	
-	Attribute(){  }
+	string getType(){ 
+		return type; 
+	}
+	
+	bool isKey(){ 
+		return key; 
+	}
 	
 	void display()
 	{
diff --git a/Relation.h b/Relation.h
index c41db03..568f020 100755
--- a/Relation.h
+++ b/Relation.h
@@ -6,21 +6,19 @@ using namespace std;
 
 //NOT DONE
 class Relation {
-	//a table with rows and columns
 	string name; //The title the user gives it
-	vector< Attribute > att; //A vector of the columns
+	vector<Attribute> att; //A vector of the columns
 	
 public:
 	Relation();
 	
 	//constructor 
-	Relation(string n, vector< Attribute > a) {
+	Relation(string n, vector<Attribute> a) {
 		name = n;
 		att = a;
-	} 
+	}
 	
 	void addTuple(vector< string > tuple) {
-		
 		//Loop through the attribute columns
 		for(int i = 0; i < att.size(); i++) {
 			
@@ -28,11 +26,15 @@ public:
 			for(int j = 0; j < att[i].values.size(); j++){
 				
 				//In this column, at this element's spot, assign an element from the tuple vector to this spot
-				(att[i].values[j]).assign(tuple[i]);
+				att[i].addRow(tuple[i]);
 			}
 		}
 	}
 	
+	string getTableName() {
+		return name;
+	}
+	
 	void displayTableName() {
 		cout << "The table name is: " << name << endl;
 	}
diff --git a/a.out b/a.out
new file mode 100755
index 0000000000000000000000000000000000000000..d8082f0af5f9dda34369707a36b35b40de1e84a9
GIT binary patch
literal 29594
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
E01-!;=l}o!

literal 0
HcmV?d00001

diff --git a/test.cpp b/test.cpp
index b6b03b0..03a58ce 100755
--- a/test.cpp
+++ b/test.cpp
@@ -5,40 +5,26 @@
 
 using namespace std;
 
-int main() {
+int main() {		
+	Attribute atributo("shamWow", "VARCHAR(10)", false);
 	
-	/*
-	DBEngine engine;
-	Relation r;
-	Attribute<int> a;
-	*/
+	atributo.addRow("rag");
+	atributo.addRow("sponge");
+	atributo.addRow("wooow");
+	atributo.addRow("cloth");
 	
-	vector<string> shamWow;
-	shamWow.push_back("rag");
-	shamWow.push_back("sponge");
-	shamWow.push_back("wooow");
-	shamWow.push_back("cloth");
-	
-	Attribute atributo;
-	atributo.initializeAttribute("atributo",shamWow);
 	atributo.display();
 	
-	vector<string> doom;
-	doom.push_back("zombieman");
-	doom.push_back("revenant");
-	doom.push_back("imp");
-	doom.push_back("archvile");
+	Attribute atributo2("doom", "VARCHAR(20)", false);
+	
+	atributo2.addRow("zombieman");
+	atributo2.addRow("revenant");
+	atributo2.addRow("imp");
+	atributo2.addRow("archvile");
 	
-	Attribute atributo2;
-	atributo2.initializeAttribute("attribute_2", doom);
 	atributo2.display();
 	
-	
-	
-	
 	string line1 = "Table_1";
 	
-	
-	
 	//Relation r(line1, my_attributes);
 }

From e90e0c990f9c3f90c3200d60f8f12d7213beadb5 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 21:03:01 -0500
Subject: [PATCH 18/22] Update Relation.h

---
 Relation.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Relation.h b/Relation.h
index 8668481..6f69bfa 100644
--- a/Relation.h
+++ b/Relation.h
@@ -21,7 +21,16 @@ public:
 		att = a;
 	}
 	
-	void addTuple(vector< Attribute> tuple);
+	void addTuple(vector<string> tuple)
+	{	
+		else
+		{
+			for(int i = 0; i < att.size(); ++i) //for all the attributes
+			{
+				att[i].pushBack(tuple[i]);
+			}
+		}	
+	}
 	
 	void display()
 	{

From 6004fe724f5d771999d1c05bb6e65ea8ba2804ab Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 21:03:35 -0500
Subject: [PATCH 19/22] Update test2.cpp

---
 test2.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test2.cpp b/test2.cpp
index 0167b02..1c23c06 100644
--- a/test2.cpp
+++ b/test2.cpp
@@ -47,5 +47,14 @@ int main() {
 	Relation myLittleRelation;
 	myLittleRelation.initializeRelation("randomName", attNames, setOfAttributes);
 	
+	
+	//adding tuple business-----------------------
+	
+	vector<string> tuple;
+	tuple.push_back("hadoken");
+	tuple.push_back("soryuken");
+	
+	myLittleRelation.addTuple(tuple);
+	
 	myLittleRelation.display();
 }

From 70e29704301f9c16d5c608ec3a448801b29b5828 Mon Sep 17 00:00:00 2001
From: William Bracho Blok <williambrachoblok@gmail.com>
Date: Tue, 15 Sep 2015 21:04:08 -0500
Subject: [PATCH 20/22] Update Attribute.h

---
 Attribute.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Attribute.h b/Attribute.h
index b57879e..92c435b 100644
--- a/Attribute.h
+++ b/Attribute.h
@@ -41,6 +41,11 @@ public:
 	{
 		return values.size();
 	}
+	
+	void pushBack(string s)
+	{
+		values.push_back(s);
+	}
 /*	
 	Attribute(vector<string> v){ 
 		this.values = v; 

From 92a5ba2e9388746268e52b43f0c15b03d1f645b1 Mon Sep 17 00:00:00 2001
From: Rebecca Schofield <scho4077@tamu.edu>
Date: Tue, 15 Sep 2015 21:13:15 -0500
Subject: [PATCH 21/22] updated DB engine

---
 DBEngine.h | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/DBEngine.h b/DBEngine.h
index 32e96c2..e889297 100755
--- a/DBEngine.h
+++ b/DBEngine.h
@@ -5,21 +5,17 @@
 
 using namespace std;
 
-class DBEngine {
-	//member variables
-	//NOT DONE
-	//vector<Relation> tables;
+class DBEngine {
+	vector<Relation> tables;
 
 public:
 	DBEngine();
-	void createCmd();
-	//void openCmd();
-	void saveCmd();
-	void showCmd();
-	void insertQuery();
-	void deleteQuery();
-	void selectQuery();
-	void projectQuery();
-	void productQuery();
-	bool unionComp();
+	
+	void addRelation(Relation r) {
+		tables.push_back(r);
+	}
+	
+	vector<Relation> getRelations() {
+		return tables;
+	}
 };

From dce018766019028ef22322c8fa3128bc2c2f991e Mon Sep 17 00:00:00 2001
From: Rebecca Schofield <scho4077@tamu.edu>
Date: Tue, 15 Sep 2015 21:33:15 -0500
Subject: [PATCH 22/22] new framework

---
 DBEngine.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/DBEngine.h b/DBEngine.h
index b621ed4..ed5de9c 100755
--- a/DBEngine.h
+++ b/DBEngine.h
@@ -22,14 +22,14 @@ public:
 		tables.push_back(r);
 	}
 	
-	void showTable() {}
-	void saveToFile() { /*???*/ }
-	void insertTuple() {}
-	void deleteTuple() {}
-	void selectTuples() {}
-	void project() {}
-	void product() {}
-	void unionComp() {}
+	void showTable() { /*Becca*/ }
+	void saveToFile() { /*Becca*/ }
+	void insertTuple() { /*William*/ }
+	void deleteTuple() { /*William*/ }
+	void selectTuples() { /*Becca*/ }
+	void project() { /*Brandon*/ }
+	void product() { /*Brandon*/ }
+	void unionComp() { /*William*/ }
 	
 	
 	vector<Relation> getRelations() {