Commit graph

57 commits

Author SHA1 Message Date
Rebecca Schofield
a3a354c5f0 cleanup 2015-10-06 23:36:48 -05:00
Rebecca Schofield
dd4453c9aa update works 2015-10-06 23:19:53 -05:00
Rebecca Schofield
bfe5e4e981 added the error matching 2015-10-06 13:25:46 -05:00
Rebecca Schofield
15185bcb8d update being weird 2015-10-06 13:16:56 -05:00
Rebecca Schofield
25ce3c7248 delete working 2015-10-06 13:07:31 -05:00
Rebecca Schofield
4515a7073b delete and update work 2015-10-05 16:58:07 -05:00
Rebecca Schofield
20fec486b6 update works 2015-10-05 16:50:19 -05:00
Rebecca Schofield
909df70f2d working on update & delete 2015-10-05 15:23:49 -05:00
Rebecca Schofield
c7c701a169 working on update & delete 2015-10-05 15:12:33 -05:00
Alexander Huddleston
2d2e056731 Fixed github issues. 2015-09-30 20:08:29 -05:00
Brandon Jackson
73215afa39 Fixing merge issues 2015-09-30 17:27:46 -05:00
Brandon Jackson
48a18872c2 Updated user.h 2015-09-30 17:10:16 -05:00
Rebecca Schofield
e3ef70bf15 added the framework 2015-09-30 16:54:56 -05:00
Rebecca Schofield
effe7d3d27 updatin 2015-09-30 16:50:25 -05:00
Rebecca Schofield
ae67c5b8f6 git hates me 2015-09-30 16:48:54 -05:00
Alexander Huddleston
7f0f5c4a97 Took out unncessary comments in code. 2015-09-30 13:00:51 -05:00
Alexander Huddleston
d56a2ee90e rename expression works. 2015-09-29 13:55:47 -05:00
Alexander Huddleston
fa50473ad4 Projection linked. 2015-09-29 13:28:24 -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
5e58734054 Just to keep most recent changes on server. 2015-09-28 19:52:50 -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
96eb1a28c0 cross product done 2015-09-28 16:03:41 -05:00
Rebecca Schofield
c3d39eedbd updating crossproduct 2015-09-28 15:57:57 -05:00
Rebecca Schofield
4809a518ad crossprod almost done 2015-09-28 15:46:42 -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
6247ac10ca crossproduct attributes correct 2015-09-26 07:11:33 -05:00
Rebecca Schofield
d1e610a8c6 working on crossprodut 2015-09-26 07:09:44 -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