Differential D231

init_db shouldn't easily drop tables
ClosedPublic
Actions

Authored by jskladan on Sep 9 2014, 10:47 AM.

Details

Reviewers
ralph
tflink
Maniphest Tasks
T306: resultsdb init_db shouldn't clear out current contents of db so easily
Summary

Changed the cli.py behaviour, so it requires -d parameter in order to
make destructive changes.

Test Plan

Tested locally

Diff Detail

Repository
rRSDB resultsdb
Branch
feature/T306
Lint
No Linters Available
Unit
No Unit Test Coverage
jskladan retitled this revision from to init_db shouldn't easily drop tables.Sep 9 2014, 10:47 AM
jskladan updated this object.
jskladan edited the test plan for this revision. (Show Details)
jskladan added reviewers: tflink, ralph.
tflink requested changes to this revision.Sep 9 2014, 2:51 PM

Can you add messages along the lines of "proceeding with non-destructive init. to use destructive init, use -d" to the init_db and mock_data commands?

This revision now requires changes to proceed.Sep 9 2014, 2:51 PM
jskladan updated this revision to Diff 659.Sep 10 2014, 7:53 AM
  • Added info about non-destructive init
tflink accepted this revision.Sep 29 2014, 2:31 PM

Looks good to me

This revision is now accepted and ready to land.Sep 29 2014, 2:31 PM

Revision Contents

PathPackages
Mresultsdb/cli.py (92 lines)

Diff 659

View Options

resultsdb/cli.py

Show All 25 Lines
26from optparse import OptionParser 26​from optparse import OptionParser
27import sys 27​import sys
28import datetime 28​import datetime
29 29​
30from resultsdb import db 30​from resultsdb import db
31from resultsdb.models.user import User 31​from resultsdb.models.user import User
32from resultsdb.models.results import Job, Testcase, Result, ResultData 32​from resultsdb.models.results import Job, Testcase, Result, ResultData
33 33​
34def initialize_db(): 34​def initialize_db(destructive):
35 print "Initializing Database" 35​ print "Initializing database"
36 db.drop_all() 36​ if destructive:
37​ print " - Dropping all tables"
38​ db.drop_all()
39​ print " - Creating tables"
37 db.create_all() 40​ db.create_all()
38 41​
39def mock_data(): 42​def mock_data(destructive):
40 data_users = [('admin', 'admin'), ('user', 'user')] 43​ print "Populating tables with mock-data"
41 44​
42 for d in data_users: 45​ if destructive or not db.session.query(User).count():
43 u = User(*d) 46​ print " - User"
44 db.session.add(u) 47​ data_users = [('admin', 'admin'), ('user', 'user')]
45 48​
46 tc1 = Testcase( url = "http://example.com/depcheck", name = "depcheck") 49​ for d in data_users:
47 tc2 = Testcase( url = "http://example.com/rpmlint", name = "rpmlint") 50​ u = User(*d)
51​ db.session.add(u)
48 52​
49 j1 = Job(status = "COMPLETED", ref_url = "http://example.com/job1") 53​ db.session.commit()
50 j1.start_time = datetime.datetime(2013, 6, 1, 12, 0, 0) 54​ else:
51 j1.end_time = datetime.datetime(2013, 6, 1, 12, 30, 0) 55​ print " - skipped User"
52 56​
53 j2 = Job(status = "RUNNING", ref_url = "http://example.com/job2") 57​ if destructive or not db.session.query(Testcase).count():
54 j2.start_time = datetime.datetime(2013, 7, 1, 16, 0, 0) 58​ print " - Testcase, Job, Result, ResultData"
55 j2.end_time = datetime.datetime(2013, 7, 1, 16, 30, 0) 59​ tc1 = Testcase( url = "http://example.com/depcheck", name = "depcheck")
60​ tc2 = Testcase( url = "http://example.com/rpmlint", name = "rpmlint")
56 61​
57 r1 = Result(job = j1, testcase = tc1, outcome = 'PASSED', log_url = "http://example.com/r1") 62​ j1 = Job(status = "COMPLETED", ref_url = "http://example.com/job1")
58 r2 = Result(job = j1, testcase = tc1, outcome = 'FAILED', log_url = "http://example.com/r2") 63​ j1.start_time = datetime.datetime(2013, 6, 1, 12, 0, 0)
59 r3 = Result(job = j2, testcase = tc2, outcome = 'FAILED', log_url = "http://example.com/r2") 64​ j1.end_time = datetime.datetime(2013, 6, 1, 12, 30, 0)
60 65​
61 td1 = ResultData(r1, "envr", "cabal-rpm-0.8.3-1.fc18") 66​ j2 = Job(status = "RUNNING", ref_url = "http://example.com/job2")
62 td2 = ResultData(r1, "arch", "x86_64") 67​ j2.start_time = datetime.datetime(2013, 7, 1, 16, 0, 0)
68​ j2.end_time = datetime.datetime(2013, 7, 1, 16, 30, 0)
63 69​
64 td3 = ResultData(r3, "envr", "cabal-rpm-0.8.3-1.fc18") 70​ r1 = Result(job = j1, testcase = tc1, outcome = 'PASSED', log_url = "http://example.com/r1")
65 td4 = ResultData(r3, "arch", "i386") 71​ r2 = Result(job = j1, testcase = tc1, outcome = 'FAILED', log_url = "http://example.com/r2")
72​ r3 = Result(job = j2, testcase = tc2, outcome = 'FAILED', log_url = "http://example.com/r2")
66 73​
67 db.session.add(tc1) 74​ td1 = ResultData(r1, "envr", "cabal-rpm-0.8.3-1.fc18")
68 db.session.add(j1) 75​ td2 = ResultData(r1, "arch", "x86_64")
69 db.session.add(j2) ​
70 76​
71 db.session.commit() 77​ td3 = ResultData(r3, "envr", "cabal-rpm-0.8.3-1.fc18")
78​ td4 = ResultData(r3, "arch", "i386")
72 79​
80​ db.session.add(tc1)
81​ db.session.add(j1)
82​ db.session.add(j2)
73 83​
84​ db.session.commit()
85​ else:
86​ print " - skipped Testcase, Job, Result, ResultData"
74 87​
75 88​
76def main(): 89​def main():
77 possible_commands = ['init_db', 'mock_data'] 90​ possible_commands = ['init_db', 'mock_data']
78 91​
79 usage = 'usage: [DEV=true] %prog ' + "(%s)" % ' | '.join(possible_commands) 92​ usage = 'usage: [DEV=true] %prog ' + "(%s)" % ' | '.join(possible_commands)
80 parser = OptionParser(usage=usage) 93​ parser = OptionParser(usage=usage)
94​ parser.add_option("-d", "--destructive",
95​ action="store_true", dest="destructive", default=False,
96​ help="Drop tables in `init_db`; Store data in `mock_data` "
97​ "even if the tables are not empty")
81 98​
82 (options, args) = parser.parse_args() 99​ (options, args) = parser.parse_args()
83 100​
84 if len(args) < 1: 101​ if len(args) != 1 or args[0] not in possible_commands:
85 print usage 102​ print usage
86 print 103​ print
87 print 'Please use one of the following commands: %s' % str(possible_commands) 104​ print 'Please use one of the following commands: %s' % str(possible_commands)
88 sys.exit(1) 105​ sys.exit(1)
89 106​
107​ command = {
108​ 'init_db': initialize_db,
109​ 'mock_data': mock_data,
110​ }[args[0]]
90 111​
91 command = args[0] 112​ if not options.destructive:
92 if not command in possible_commands: 113​ print "Proceeding with non-destructive init. To perform destructive "\
93 print 'Invalid command: %s' % command 114​ "steps use -d option."
94 print 'Please use one of the following commands: %s' % str(possible_commands) ​
95 sys.exit(1) ​
96 115​
97 116​ command(options.destructive)
98 if command == 'init_db': ​
99 initialize_db() ​
100 elif command == 'mock_data': ​
101 mock_data() ​
102 117​
103 sys.exit(0) 118​ sys.exit(0)
104 119​
120​
105if __name__ == '__main__': 121​if __name__ == '__main__':
106 main() 122​ main()
107 123​