Merge lp:~seif/zeitgeist/fix-665607-and-643303 into lp:zeitgeist/0.1

[Seif Lotfy]

I tried to fix the bug by simple detecting the current core schema and "i" and then iterating through all update scripts in form of 'core_"i"_"i+1"' its simple and straight forward. No looking for paths and leaving us to actually only worry about upgrade +1 increasing upgrade scripts. If the basic idea is OK I can propose for merging.

Bugs fixed: #665607 and #643303

[Siegfried Gevatter (rainct)]

From the previous merge proposal:

My comment:
 > Looks good to me. Mikkel, Markus, do you agree this is the
 > approach with which we want to handle database upgrades?

Markus' comment:
 > okidoki, my take on this: I would like to have some kind of tests
 > for the upgrade pathes, but please let's not do it like Seif tried
 > in rev 1625.
 > Therefor I suggest the following, let's merge this branch without
 > rev 1625 into lp:zeitgeist, and then put some work into writing a
 > testing framework for db schemes and upgrades.

review: Approve

[lp:~seif/zeitgeist/fix-665607-and-643303]

1626. By Seif Lotfy on 2010-10-25

cleanup zeitgeist-daemon and log prints

=== modified file '_zeitgeist/engine/sql.py'
--- _zeitgeist/engine/sql.py	2010-10-19 13:54:12 +0000
+++ _zeitgeist/engine/sql.py	2010-10-25 20:29:44 +0000
@@ -92,20 +92,20 @@
 def _do_schema_upgrade (cursor, schema_name, old_version, new_version):
 	"""
 	Try and upgrade schema `schema_name` from version `old_version` to
-	`new_version`. This is done by checking for an upgrade module named
-	'_zeitgeist.engine.upgrades.$schema_name_$old_version_$new_version'
-	and executing the run(cursor) method of that module
+	`new_version`. This is done by executing a series of upgrade modules
+	named '_zeitgeist.engine.upgrades.$schema_name_$(i)_$(i+1)' and executing 
+	the run(cursor) method of those modules until new_version is reached
 	"""
-	# Fire of the right upgrade module
-	log.info("Upgrading database '%s' from version %s to %s. This may take a while" %
-	         (schema_name, old_version, new_version))
-	upgrader_name = "%s_%s_%s" % (schema_name, old_version, new_version)
-	module = __import__ ("_zeitgeist.engine.upgrades.%s" % upgrader_name)
-	eval("module.engine.upgrades.%s.run(cursor)" % upgrader_name)
-	
-	# Update the schema version
-	_set_schema_version(cursor, schema_name, new_version)
-	
+	for i in xrange(old_version, new_version):
+		# Fire of the right upgrade module
+		log.info("Upgrading database '%s' from version %s to %s. This may take a while" %
+		         (schema_name, i, i+1))
+		upgrader_name = "%s_%s_%s" % (schema_name, i, i+1)
+		module = __import__ ("_zeitgeist.engine.upgrades.%s" % upgrader_name)
+		eval("module.engine.upgrades.%s.run(cursor)" % upgrader_name)
+		
+		# Update the schema version
+		_set_schema_version(cursor, schema_name, i+1)
 	log.info("Upgrade succesful")
 
 def _check_core_schema_upgrade (cursor):
@@ -113,7 +113,7 @@
 	# See if we have the right schema version, and try an upgrade if needed
 	core_schema_version = _get_schema_version(cursor, constants.CORE_SCHEMA)
 	if core_schema_version is not None:
-		if core_schema_version == constants.CORE_SCHEMA_VERSION:
+		if core_schema_version >= constants.CORE_SCHEMA_VERSION:
 			return True
 		else:
 			try: