Commit graph

41 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
e244c6ca45 Commented out DBApp.cpp as it's being developed. test.cpp all tests compile and run into test file. 2015-09-27 16:48:08 -05:00
Alexander Huddleston
50bff50cef Starting DBApp development. 2015-09-27 15:27:14 -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
78914574da Update test.cpp 2015-09-25 00:29:00 -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
Rebecca Schofield
3983003035 added gettuple 2015-09-24 20:49:49 -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
e7037e5909 rename fixed and insert attributes add 2015-09-23 16:34:15 -05:00
Rebecca Schofield
b0e9ada7f9 updating brandondev 2015-09-22 23:23:48 -05:00
Rebecca Schofield
1492321b9b fixed rename 2015-09-22 09:03:42 -05:00
Brandon Jackson
45eb8cf148 Updated test to prove projection works 2015-09-22 00:05:17 -05:00
Rebecca Schofield
b6af7f18c8 insertions done 2015-09-21 16:27:23 -05:00
Rebecca Schofield
61cb0d3b1f synced with becca 2015-09-17 18:34:03 -05:00
Rebecca Schofield
684cf1f811 Updated DBEngine functions 2015-09-17 18:30:45 -05:00
Rebecca Schofield
c8ecb606fd cleared out the bad code 2015-09-17 17:14:28 -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
1902e6f3d5 fixing more things 2015-09-15 23:21:38 -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
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
Brandon Jackson
b2e36b3056 Update test.cpp 2015-09-15 21:38:49 -05:00
Rebecca Schofield
5509e64f00 use this frameworkgit rm DBEngine.cpp 2015-09-15 21:36:52 -05:00
Rebecca Schofield
dc3bbcba37 new framework 2015-09-15 21:31:19 -05:00
Rebecca Schofield
94912e6b14 attribute works as expects 2015-09-15 20:55:21 -05:00
Rebecca Schofield
903b6c98d5 merged with brandon 2015-09-15 20:23:27 -05:00
Brandon Jackson
560e345828 Update test.cpp 2015-09-15 20:22:35 -05:00
Brandon Jackson
b842955e3e Update test.cpp 2015-09-15 20:16:58 -05:00
Rebecca Schofield
a449b76e21 updating structure 2015-09-15 16:30:25 -05:00
Becca
c23f25b20a updates 2015-09-15 10:21:16 -05:00
Becca
f0d54ab69d got our stuff together 2015-09-14 18:31:05 -05:00
Becca
2b4590ebf4 fixed the merge conflict 2015-09-14 17:03:23 -05:00
Becca
0678531d81 testing real quick 2015-09-14 16:59:59 -05:00
Becca
0b3fa73bda done saveCmd 2015-09-14 16:46:49 -05:00
Becca
3a53ef1533 message 2015-09-14 15:04:54 -05:00