Skip to content

Commit

Permalink
Resolved merge conflicts. Updated TODOs with proper syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
raopg committed Apr 30, 2019
1 parent 06ad20b commit 3bb5ef0
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions db.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,18 @@



<<<<<<< HEAD
# ## *CREATING DOCUMENTS* ##
# #TODO (1): Insert data into database using csv.DictWriter (comment out code after inserted to avoid multiple insertions)

=======
# *CREATING DOCUMENTS* #
#
# TO-DO (1): Insert data into database using csv.DictWriter (comment out code after inserted to avoid multiple insertions)
#
>>>>>>> 183fe8eee0face6f1fb8187419d1ce9472d605c0
# csv_file = open("roles.csv")
# reader = csv.DictReader(csv_file) # will use the fieldnames in the first row to create dict for each row
# for row in reader: # could use insert_many() if you had a multiple dicts in a list
# role_info.insert_one(row)
# csv_file.close()

<<<<<<< HEAD
# ## *READING DOCUMENTS* ##

# #TODO (2): Read all data from database
=======


# *READING DOCUMENTS* #
#
# TO-DO (2): Read all data from database
>>>>>>> 183fe8eee0face6f1fb8187419d1ce9472d605c0
# for i in role_info.find():
# print(i)

Expand All @@ -58,14 +43,8 @@



<<<<<<< HEAD
# ## *UPDATING DOCUMENTS* ##
# #TODO (6): Insert {"foo":"bar"} into first document with committee marketing and print it out to see update
=======
# *UPDATING DOCUMENTS* #
#
# TO-DO (6): Insert {"foo":"bar"} into first document with committee marketing and print it out to see update
>>>>>>> 183fe8eee0face6f1fb8187419d1ce9472d605c0
# role_info.update_one({"committee":"marketing"}, {"$set": {"foo": "bar"}})
# print(role_info.find_one({"committee":"marketing"}))

Expand All @@ -81,14 +60,8 @@



<<<<<<< HEAD
# ## *DELETING DOCUMENTS* ##
# #TODO (9): Delete the first document
=======
# *DELETING DOCUMENTS* #
#
# TO-DO (9): Delete the first document
>>>>>>> 183fe8eee0face6f1fb8187419d1ce9472d605c0
# print(role_info.delete_one())
# #TODO (10): Delete any documents with no deliverable prompt
# role_info.delete_many({"prompt":"[]"})
Expand Down

0 comments on commit 3bb5ef0

Please sign in to comment.