From 091f084b45f718d20f9fbbbf64aae6b9b63f89b0 Mon Sep 17 00:00:00 2001
From: Rebecca Schofield <scho4077@tamu.edu>
Date: Thu, 24 Sep 2015 21:00:31 -0500
Subject: [PATCH] fixed a thing

---
 DBEngine.cpp |  8 ++++----
 DBEngine.h   |  2 +-
 test.cpp     | 34 +---------------------------------
 3 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/DBEngine.cpp b/DBEngine.cpp
index 96b315d..f622cd5 100755
--- a/DBEngine.cpp
+++ b/DBEngine.cpp
@@ -85,7 +85,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;
@@ -102,17 +102,17 @@ void DBEngine::rename(Relation& r, vector<string> oldnames, vector<string> newna
 			}
 		}
 
-		for (int i = 0; i < new_atts.size(); ++i) {
+		/*for (int i = 0; i < new_atts.size(); ++i) {
 			for (int j = 0; j < new_atts.size(); ++j){
 				if (new_atts[i] == new_atts[j]){
 					new_atts.erase(new_atts.begin() + i);
 					continue;
 				}
 			}
-		}
+		}*/
 
 		//currently all returned relations are called TEMP
 		Relation new_r("TEMP", new_atts);
 		return new_r;
 	}
-}*/
+}
diff --git a/DBEngine.h b/DBEngine.h
index 4b8a309..878a42e 100755
--- a/DBEngine.h
+++ b/DBEngine.h
@@ -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();
 };
diff --git a/test.cpp b/test.cpp
index 24d03c1..f21b31b 100755
--- a/test.cpp
+++ b/test.cpp
@@ -28,31 +28,6 @@ int main() {
 	v.push_back(att3);
 	
 	engine.createTable("Food", v);
-<<<<<<< HEAD
-	
-	vector<string> tuple;
-	tuple.push_back("Omelette");
-	tuple.push_back("Fried Rice");
-	tuple.push_back("Grouper");
-	
-	engine.getTableFromName("Food").insertTuple(tuple);
-	
-	vector<string> old;
-	vector<string> newa;
-	
-	old.push_back("Breakfast");
-	old.push_back("Lunch");
-	old.push_back("Dinner");
-	
-	newa.push_back("Tsafkaerb");
-	newa.push_back("Hcnul");
-	newa.push_back("Rennid");
-	
-	engine.rename(engine.getTableFromName("Food"), old, newa);
-	engine.getTableFromName("Food").display();
-	cout << "finished";
-}
-=======
 
 	Attribute att4("SecondBreakfast", "VARCHAR(20)", true);
 	Attribute att5("SecondLunch", "VARCHAR(20)", false);
@@ -75,12 +50,5 @@ int main() {
 	
 	engine.createTable("MoarFood", v2);
 
-	vector<string> test = engine.getTableFromName("Food").getTuple(1);
-
-	for (int i = 0; i < test.size(); ++i){
-		cout << test[i] << " ";
-	}
-
 	//engine.setUnion(engine.getTableFromName("Food"), engine.getTableFromName("MoarFood")).display();
-}
->>>>>>> beccadev
+}