Commit graph

105 commits

Author SHA1 Message Date
Brandon Jackson
45eb8cf148 Updated test to prove projection works 2015-09-22 00:05:17 -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
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
58e37d41c3 removed LParser 2015-09-17 17:20:01 -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
Alexander Huddleston
f755bbc42a Updated LParser.cpp 9-16-15 2015-09-16 17:28:32 -05:00
Alexander Huddleston
091ac01645 Merge branch 'master' into alexdev 2015-09-16 16:59:22 -05:00
Alexander Huddleston
6b2039896d Lexical Parser cpp file. 2015-09-16 16:43:49 -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
5a43be3b80 final turnin 2015-09-15 23:42:40 -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
6681cc556b fixed a dumb thing 2015-09-15 22:27:32 -05:00
Rebecca Schofield
d69186dc44 use THIS 2015-09-15 22:23:41 -05:00
Rebecca Schofield
773544da13 use THIS 2015-09-15 22:20:14 -05:00
Rebecca Schofield
b6e66e298b use this code 2015-09-15 22:18:19 -05:00
Rebecca Schofield
992157c88d fixed my stuff 2015-09-15 22:08:18 -05:00
Rebecca Schofield
856c73172a something 2015-09-15 22:02:16 -05:00
Rebecca Schofield
c81c80193f Merge branch 'beccadev' 2015-09-15 21:59:16 -05:00
Rebecca Schofield
5010901a32 added function to DBEngine.h 2015-09-15 21:58:44 -05:00
Brandon Jackson
51a7197b07 Update Attribute.h 2015-09-15 21:51:50 -05:00
Brandon Jackson
3a18ac0608 Update Relation.h 2015-09-15 21:49:49 -05:00
Rebecca Schofield
8dc821422b oosp 2015-09-15 21:42:08 -05:00
Brandon Jackson
cf5ad99b9f Update Attribute.h 2015-09-15 21:39:24 -05:00
Brandon Jackson
b2e36b3056 Update test.cpp 2015-09-15 21:38:49 -05:00
Brandon Jackson
66196158fc Update Relation.h 2015-09-15 21:37:11 -05:00
Rebecca Schofield
5509e64f00 use this frameworkgit rm DBEngine.cpp 2015-09-15 21:36:52 -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
William Bracho Blok
70e2970430 Update Attribute.h 2015-09-15 21:04:08 -05:00
William Bracho Blok
6004fe724f Update test2.cpp 2015-09-15 21:03:35 -05:00
William Bracho Blok
e90e0c990f Update Relation.h 2015-09-15 21:03:01 -05:00
Rebecca Schofield
94912e6b14 attribute works as expects 2015-09-15 20:55:21 -05:00
William Bracho Blok
b2fa6c1a55 Update Relation.h 2015-09-15 20:36:33 -05:00
William Bracho Blok
8a3104652e Update test2.cpp 2015-09-15 20:36:07 -05:00
William Bracho Blok
9f0003caef Update Attribute.h 2015-09-15 20:35:43 -05:00
William Bracho Blok
c052e7cbf0 Create Relation.h 2015-09-15 20:23:47 -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
6fa6ad2b44 Update Relation.h 2015-09-15 20:22:17 -05:00
William Bracho Blok
2b1141bfe7 Update test2.cpp 2015-09-15 20:21:50 -05:00
Brandon Jackson
d4e1e5bc04 Update Attribute.h 2015-09-15 20:21:26 -05:00