Commit graph

38 commits

Author SHA1 Message Date
Alexander Huddleston
d56a2ee90e rename expression works. 2015-09-29 13:55:47 -05:00
Alexander Huddleston
28facf2997 Queries work (kind of). Conditions need to be implemented to finish it. Cross Product may need work. 2015-09-29 12:00:37 -05:00
Alexander Huddleston
abd415cb9b OPEN and CLOSE commands work properly, filtered SAVE command. 2015-09-28 18:47:43 -05:00
Alexander Huddleston
7c8eb084d9 Doing things. 2015-09-28 17:02:04 -05:00
Alexander Huddleston
b5093be722 Merge branch 'master' into alexdev
Conflicts:
	DBEngine.h
	test
2015-09-28 16:21:18 -05:00
Alexander Huddleston
479a1e3029 Changed SAVE command functionality 2015-09-28 16:18:49 -05:00
Rebecca Schofield
c3d39eedbd updating crossproduct 2015-09-28 15:57:57 -05:00
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
Rebecca Schofield
d1e610a8c6 working on crossprodut 2015-09-26 07:09:44 -05:00
Brandon Jackson
5cadbd35ae Update DBEngine.h 2015-09-25 00:30:32 -05:00
Brandon Jackson
7166b53797 Update DBEngine.h 2015-09-24 21:38:07 -05:00
Rebecca Schofield
091f084b45 fixed a thing 2015-09-24 21:00:31 -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
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
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
Rebecca Schofield
9f5d3e5346 cleared out bad code in DBEngine 2015-09-17 17:18:51 -05:00
Rebecca Schofield
c8ecb606fd cleared out the bad code 2015-09-17 17:14:28 -05:00
Brandon Jackson
7d858e8b10 Update DBEngine.h 2015-09-15 23:48:50 -05:00
Rebecca Schofield
e2776d2459 to turn in 2015-09-15 23:44:58 -05:00
Rebecca Schofield
ed1a6fa879 message 2015-09-15 23:38:44 -05:00
Rebecca Schofield
38a4fdefe3 more testing 2015-09-15 23:13:28 -05:00
Rebecca Schofield
fc0f899568 union comp done 2015-09-15 22:36:44 -05:00
Rebecca Schofield
773544da13 use THIS 2015-09-15 22:20:14 -05:00
Rebecca Schofield
5010901a32 added function to DBEngine.h 2015-09-15 21:58:44 -05:00
Rebecca Schofield
8dc821422b oosp 2015-09-15 21:42:08 -05:00
Rebecca Schofield
dce0187660 new framework 2015-09-15 21:33:15 -05:00
Rebecca Schofield
dc3bbcba37 new framework 2015-09-15 21:31:19 -05:00
Rebecca Schofield
92a5ba2e93 updated DB engine 2015-09-15 21:13:15 -05:00
Rebecca Schofield
903b6c98d5 merged with brandon 2015-09-15 20:23:27 -05:00
Brandon Jackson
d28e68beb0 Update and rename db_engine.h to DBEngine.h 2015-09-15 20:19:49 -05:00
Rebecca Schofield
a449b76e21 updating structure 2015-09-15 16:30:25 -05:00