Merge lp:~tristan-rivoallan/trac-errorcollectionplugin/devel into lp:trac-errorcollectionplugin

Proposed by Tristan Rivoallan
Status: Merged
Approved by: Tristan Rivoallan
Approved revision: 3
Merge reported by: Tristan Rivoallan
Merged at revision: not available
Proposed branch: lp:~tristan-rivoallan/trac-errorcollectionplugin/devel
Merge into: lp:trac-errorcollectionplugin
Diff against target: 36 lines (+6/-3)
1 file modified
errorcollectionplugin/db.py (+6/-3)
To merge this branch: bzr merge lp:~tristan-rivoallan/trac-errorcollectionplugin/devel
Reviewer Review Type Date Requested Status
Tristan Rivoallan Approve
Review via email: mp+21062@code.launchpad.net

Commit message

Enhanced documentation in db.py

To post a comment you must log in.
Revision history for this message
Tristan Rivoallan (tristan-rivoallan) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'errorcollectionplugin/db.py'
--- errorcollectionplugin/db.py 2010-03-10 14:25:29 +0000
+++ errorcollectionplugin/db.py 2010-03-10 16:21:19 +0000
@@ -30,19 +30,21 @@
30# Create tables30# Create tables
3131
32def to_sql(env, table):32def to_sql(env, table):
33 """Converts a trac.db.schema specification to SQL compatible with database manager driver"""
33 from trac.db.api import DatabaseManager34 from trac.db.api import DatabaseManager
34 dataManager = env.components[DatabaseManager]35 dataManager = env.components[DatabaseManager]
35 dc = dataManager._get_connector()[0]36 dc = dataManager._get_connector()[0]
36 return dc.to_sql(table)37 return dc.to_sql(table)
3738
38def create_tables(env, db):39def create_tables(env, db):
40 """Creates schema in database"""
39 cursor = db.cursor()41 cursor = db.cursor()
40 for table in schema:42 for table in schema:
41 for stmt in to_sql(env, table):43 for stmt in to_sql(env, table):
42 cursor.execute(stmt)44 cursor.execute(stmt)
43 #As execute expect a sequence or a tuple45 # As execute expect a sequence or a tuple
44 #http://docs.python.org/library/sqlite3.html46 # http://docs.python.org/library/sqlite3.html
45 #http://stackoverflow.com/questions/228912/sqlite-parameter-substitution-problem47 # http://stackoverflow.com/questions/228912/sqlite-parameter-substitution-problem
46 cursor.execute("INSERT into system values ('errorcollection_version', %s)", (str(db_version),));48 cursor.execute("INSERT into system values ('errorcollection_version', %s)", (str(db_version),));
4749
48# Upgrades50# Upgrades
@@ -74,6 +76,7 @@
74 (str(db_version),))76 (str(db_version),))
7577
76 def _get_version(self, db):78 def _get_version(self, db):
79 """Returns currently installed database schema version"""
77 cursor = db.cursor()80 cursor = db.cursor()
78 try:81 try:
79 sql = "SELECT value FROM system WHERE name='errorcollection_version'"82 sql = "SELECT value FROM system WHERE name='errorcollection_version'"

Subscribers

People subscribed via source and target branches

to all changes: