Commit graph

28 commits

Author SHA1 Message Date
Alexander Huddleston
851821750c Added functionality of EXIT, SHOW, SAVE, INSERT, and CREATE commands through parser. Added some functions to help with that. 2015-09-27 23:24:02 -05:00
Alexander Huddleston
3436a00452 Fixed merge issues. Everything compiles and runs again. 2015-09-27 00:58:19 -05:00
Alexander Huddleston
b0aaaf902f Merge branch 'master' into brandondev
Conflicts:
	DBEngine.cpp
	DBEngine.h
	Parserv3.h
	test.cpp
2015-09-26 23:35:24 -05:00
Alexander Huddleston
b4c4dfd448 Fixing commit issues 2015-09-26 23:24:24 -05:00
Brandon Jackson
391cc2ab50 Added the save function 2015-09-25 00:31:23 -05:00
Brandon Jackson
4b1fbf077d Update DBEngine.cpp 2015-09-24 21:37:27 -05:00
Rebecca Schofield
27f63bd452 union works 2015-09-24 21:35:48 -05:00
Rebecca Schofield
d5ea5433e0 union works 2015-09-24 21:33:25 -05:00
Rebecca Schofield
db4396b952 remove tuple implemented 2015-09-24 21:15:12 -05:00
Rebecca Schofield
091f084b45 fixed a thing 2015-09-24 21:00:31 -05:00
Brandon Jackson
7ac2d4474f Update DBEngine.cpp 2015-09-24 20:55:14 -05:00
Rebecca Schofield
3983003035 added gettuple 2015-09-24 20:49:49 -05:00
Rebecca Schofield
de204d8b92 get tuple function added 2015-09-24 20:46:30 -05:00
Rebecca Schofield
1e5e31b965 updating 2015-09-24 20:42:59 -05:00
Rebecca Schofield
60b95250f1 condition support & selection 2015-09-24 20:02:57 -05:00
Alexander Huddleston
c2cb81d31d Removed isRelation function 2015-09-24 12:42:08 -05:00
Alexander Huddleston
5f953400e2 Fixing merge issues 2015-09-23 17:39:36 -05:00
Alexander Huddleston
cd14f55be7 Adding DBEngine functions into CreateCMD parser function. 2015-09-23 17:34:36 -05:00
Rebecca Schofield
e7037e5909 rename fixed and insert attributes add 2015-09-23 16:34:15 -05:00
Brandon Jackson
71961f6659 Re-Updated projection... again. 2015-09-23 16:08:19 -05:00
Rebecca Schofield
b0e9ada7f9 updating brandondev 2015-09-22 23:23:48 -05:00
Rebecca Schofield
97eaea15f2 updates 2015-09-22 21:17:45 -05:00
Rebecca Schofield
41ee4c99d2 fixed rename 2015-09-22 18:42:50 -05:00
Rebecca Schofield
1492321b9b fixed rename 2015-09-22 09:03:42 -05:00
Brandon Jackson
94e2844ffa Projection is now working correctly, no segfault 2015-09-22 00:03:53 -05:00
Brandon Jackson
8e308110b8 Projection implemented, correct output, but segfaults 2015-09-21 22:00:02 -05:00
Rebecca Schofield
b6af7f18c8 insertions done 2015-09-21 16:27:23 -05:00
Rebecca Schofield
684cf1f811 Updated DBEngine functions 2015-09-17 18:30:45 -05:00