[master][noticket][s]: CLI command to check version of db.

ckan/lib/cli.py

@@ -62,6 +62,7 @@ class ManageDb(CkanCommand):
     db init # create and put in default data
     db clean
     db upgrade [{version no.}] # Data migrate
+    db version # returns current version of data schema
     db dump {file-path} # dump to a pg_dump file
     db dump-rdf {dataset-name} {file-path}
     db simple-dump-csv {file-path}
@@ -100,6 +101,8 @@ def command(self):
                 model.repo.upgrade_db(self.args[1])
             else:
                 model.repo.upgrade_db()
+        elif cmd == 'version':
+            self.version()
         elif cmd == 'dump':
             self.dump()
         elif cmd == 'load':
@@ -248,6 +251,10 @@ def send_rdf(self):
         talis = ckan.lib.talis.Talis()
         return talis.send_rdf(talis_store, username, password)
 
+    def version(self):
+        from ckan.model import Session
+        print Session.execute('select version from migrate_version;').fetchall()
+
 
 class SearchIndexCommand(CkanCommand):
     '''Creates a search index for all datasets

ckan/model/authz.py

@@ -208,7 +208,7 @@ def add_authorization_group_to_role(cls, authorization_group, role, domain_obj):
         commit, will add the role to the database twice. Since some other
         functions count the number of occurrences, that leaves a fairly obvious
         bug. But adding a commit here seems to break various tests.
-        So don't call this twice without committing, I guess...
+        So don\'t call this twice without committing, I guess...
         '''
         if cls.authorization_group_has_role(authorization_group, role, domain_obj):
             return
@@ -355,7 +355,7 @@ def give_all_packages_default_user_roles():
         print 'Creating default user for for %s with admins %s' % (pkg.name, admins)
         setup_default_user_roles(pkg, admins)
 
-# default user roles - used when the config doesn't specify them
+# default user roles - used when the config doesn\'t specify them
 default_default_user_roles = {
     'Package': {"visitor": ["editor"], "logged_in": ["editor"]},
     'Group': {"visitor": ["reader"], "logged_in": ["reader"]},