yhttp-dbmanager 8.1.0__tar.gz → 8.2.0__tar.gz

{yhttp_dbmanager-8.1.0/yhttp_dbmanager.egg-info → yhttp_dbmanager-8.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yhttp-dbmanager
-Version: 8.1.0
+Version: 8.2.0
 Summary: Database manager command line interface and API for yhttp.
 Home-page: http://github.com/yhttp/yhttp-dbmanager
 Author: Vahid Mardani

{yhttp_dbmanager-8.1.0 → yhttp_dbmanager-8.2.0}/tests/test_cli_migration.py

@@ -74,10 +74,35 @@ def test_cli_migration(cicd):
         assert status == 0
         assert stdout.endswith('/0002-bar.py.\n')
 
-        when('db migration set 1')
+        when('db migration set foo')
+        assert stderr == 'invalid version: foo\n'
+        assert status == 1
+        assert stdout == ''
+
+        when('db migration set 0')
+        assert stderr == ''
+        assert status == 0
+        assert stdout == 'database successfully set to version 0000.\n'
+
+        when('db migration get')
+        assert stderr == ''
+        assert status == 0
+        assert stdout == '0\n'
+
+        when('db migration get last')
+        assert stderr == ''
+        assert status == 0
+        assert stdout == '1\n'
+
+        when('db migration set last')
         assert stderr == ''
         assert status == 0
         assert stdout == 'database successfully set to version 0001.\n'
 
+        when('db migration get')
+        assert stderr == ''
+        assert status == 0
+        assert stdout == '1\n'
+
         when('db drop')
         assert status == 0

{yhttp_dbmanager-8.1.0 → yhttp_dbmanager-8.2.0}/yhttp/ext/dbmanager/__init__.py

@@ -6,4 +6,4 @@ from .uri import DatabaseURI
 from .migration import Migrator
 
 
-__version__ = '8.1.0'
+__version__ = '8.2.0'

{yhttp_dbmanager-8.1.0 → yhttp_dbmanager-8.2.0}/yhttp/ext/dbmanager/cli.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import functools
 import getpass
 
@@ -150,20 +151,48 @@ class SetVersionCommand(MigrationSubCommand):
     __arguments__ = [
         Argument(
             'version',
-            metavar='VERSION',
-            type=int,
+            metavar='VERSION|last',
             help='database version.'
         )
     ]
 
     def __call__(self, args):
-        ver = args.version
         with self.migrator(args) as m:
+            if args.version == 'last':
+                ver = m.lastversion
+            else:
+                try:
+                    ver = int(args.version)
+                except ValueError:
+                    print(f'invalid version: {args.version}', file=sys.stderr)
+                    return 1
+
             m.dbversion_set(ver)
 
         print(f'database successfully set to version {ver:04d}.')
 
 
+class GetLastVersionCommand(MigrationSubCommand):
+    __command__ = 'last'
+    __aliases__ = ['l']
+
+    def __call__(self, args):
+        with self.migrator(args) as m:
+            print(m.lastversion)
+
+
+class GetVersionCommand(MigrationSubCommand):
+    __command__ = 'get'
+    __aliases__ = ['g', 'show']
+    __arguments__ = [
+        GetLastVersionCommand,
+    ]
+
+    def __call__(self, args):
+        with self.migrator(args) as m:
+            print(m.dbversion())
+
+
 class MigrationCommand(SubCommand):
     __command__ = 'migration'
     __aliases__ = ['mi']
@@ -171,7 +200,8 @@ class MigrationCommand(SubCommand):
         UpgradeCommand,
         DowngradeCommand,
         NewVersionCommand,
-        SetVersionCommand
+        SetVersionCommand,
+        GetVersionCommand
     ]
 
     def __call__(self, args):

{yhttp_dbmanager-8.1.0 → yhttp_dbmanager-8.2.0}/yhttp/ext/dbmanager/migration.py

@@ -106,6 +106,7 @@ class Migrator:
             return c.fetchone()[0]
 
     def dbversion_set(self, ver):
+        self.ensure_versiontable()
         self.db.execute(f'UPDATE {self.vtable} SET version={ver}')
         self.db.commit()
 

{yhttp_dbmanager-8.1.0 → yhttp_dbmanager-8.2.0/yhttp_dbmanager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yhttp-dbmanager
-Version: 8.1.0
+Version: 8.2.0
 Summary: Database manager command line interface and API for yhttp.
 Home-page: http://github.com/yhttp/yhttp-dbmanager
 Author: Vahid Mardani