Commit graph

180 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
bcb9b0de81 Added namespace 2015-09-27 15:38:01 -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
Alexander Huddleston
77574623f7 Remove a.out 2015-09-26 23:00:45 -05:00
Brandon Jackson
d32864988f Results of the parser linking the save command 2015-09-25 00:34:14 -05:00
Brandon Jackson
c523e779b9 Delete Parserv2.cpp 2015-09-25 00:32:14 -05:00
Brandon Jackson
391cc2ab50 Added the save function 2015-09-25 00:31:23 -05:00
Brandon Jackson
5cadbd35ae Update DBEngine.h 2015-09-25 00:30:32 -05:00
Brandon Jackson
ecc31ea072 Update Parserv3.h 2015-09-25 00:30:09 -05:00
Brandon Jackson
78914574da Update test.cpp 2015-09-25 00:29:00 -05:00
Brandon Jackson
7166b53797 Update DBEngine.h 2015-09-24 21:38:07 -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
scho4077
2ae80b04f3 Update test.cpp 2015-09-24 21:00:21 -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
b281363943 get tuple function added 2015-09-24 20:46:43 -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
Alexander Huddleston
32015a7409 Parser is ready to be linked with DBEngine 2015-09-24 20:40:50 -05:00
Rebecca Schofield
60b95250f1 condition support & selection 2015-09-24 20:02:57 -05:00
Alexander Huddleston
456a0a8e3d Added stoi() using in Parser, added compile message to README 2015-09-24 19:39:07 -05:00
Alexander Huddleston
6ef11188ea Merge branch 'master' into alexdev 2015-09-24 18:38:40 -05:00
Alexander Huddleston
9360e236e0 Removed Parser.zip submission file. 2015-09-24 18:38:11 -05:00
Alexander Huddleston
1448b0147d Added case for insert to do projected, to add more cases later. 2015-09-24 13:55:45 -05:00
Alexander Huddleston
e2718e3c91 Removed a.out 2015-09-24 13:19:59 -05:00
Alexander Huddleston
550a180dc0 Removed a.out 2015-09-24 13:18:45 -05:00
Alexander Huddleston
1f004caf3f Added a key bool to PAttribute, made sure CreateCMD saves which are keys. 2015-09-24 13:13:39 -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
e793c790e4 update 2015-09-23 17:10:09 -05:00
Rebecca Schofield
4cf8190e16 update 2015-09-23 17:09:10 -05:00
Rebecca Schofield
c846e72eb8 Merge branch 'master' of https://github.tamu.edu/scho4077/DMS 2015-09-23 16:35:46 -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
Alexander Huddleston
c6c5caaf02 Added default constructor values to classes for Parser. 2015-09-23 15:24:42 -05:00
Brandon Jackson
bcd025153a Create Parserv4.cpp 2015-09-23 02:47:08 -05:00
Alex Huddleston
049183c4cb Update Parserv3.h 2015-09-23 02:45:53 -05:00
Alex Huddleston
32fbf439f8 Merge pull request #2 from scho4077/brandondev
Brandondev
2015-09-22 23:46:05 -05:00
Alex Huddleston
6f10af0b32 Update Parserv3.h 2015-09-22 23:44:51 -05:00
Alex Huddleston
670668124b Create Parserv3.h 2015-09-22 23:27:34 -05:00
Rebecca Schofield
b0e9ada7f9 updating brandondev 2015-09-22 23:23:48 -05:00