Merge lp:~chipaca/u1db/u1db-client_delete-index into lp:u1db

[John Lenton]

delete ALL the indexes!

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 5/21/2012 11:08 AM, John Lenton wrote:
> John Lenton has proposed merging
> lp:~chipaca/u1db/u1db-client_delete-index into lp:u1db with
> lp:~chipaca/u1db/u1db-client_list-indexes as a prerequisite.
>
> Requested reviews: Ubuntu One hackers (ubuntuone-hackers) Related
> bugs: Bug #1000720 in U1DB: "u1db-client should have support for
> managing indexes" https://bugs.launchpad.net/u1db/+bug/1000720
>
> For more details, see:
> https://code.launchpad.net/~chipaca/u1db/u1db-client_delete-index/+merge/106593
>
> delete ALL the indexes!

 merge: approve

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+6LZgACgkQJdeBCYSNAAPUYQCgx+W5gKm+QaZE7l5fb4/bFgVg
qqgAmwR94JaMU4OXQKk/22skp87B+HEr
=9XTj
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'u1db/commandline/client.py'
--- u1db/commandline/client.py	2012-05-21 09:07:20 +0000
+++ u1db/commandline/client.py	2012-05-21 09:07:20 +0000
@@ -276,5 +276,28 @@
 client_commands.register(CmdListIndexes)
 
 
+class CmdDeleteIndex(OneDbCmd):
+    """Delete an index"""
+
+    name = "delete-index"
+
+    @classmethod
+    def _populate_subparser(cls, parser):
+        parser.add_argument('database', help='The local database to update',
+                            metavar='database-path')
+        parser.add_argument('index', help='the name of the index')
+
+    def run(self, database, index):
+        try:
+            db = self._open(database, create=False)
+        except errors.DatabaseDoesNotExist:
+            self.stderr.write("Database does not exist.\n")
+            return 1
+        db.delete_index(index)
+
+
+client_commands.register(CmdDeleteIndex)
+
+
 def main(args):
     return client_commands.run_argv(args, sys.stdin, sys.stdout, sys.stderr)

=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2012-05-21 09:07:20 +0000
+++ u1db/tests/commandline/test_client.py	2012-05-21 09:07:20 +0000
@@ -133,6 +133,12 @@
         self.assertEqual(client.CmdListIndexes, args.subcommand)
         self.assertEqual('db', args.database)
 
+    def test_delete_index(self):
+        args = self.parse_args(['delete-index', 'db', 'index'])
+        self.assertEqual(client.CmdDeleteIndex, args.subcommand)
+        self.assertEqual('db', args.database)
+        self.assertEqual('index', args.index)
+
 
 class TestCaseWithDB(tests.TestCase):
     """These next tests are meant to have one class per Command.
@@ -400,6 +406,32 @@
         self.assertEqual(cmd.stderr.getvalue(), 'Database does not exist.\n')
 
 
+class TestCmdDeleteIndex(TestCaseWithDB):
+
+    def test_delete_index(self):
+        self.db.create_index("foo", ["bar", "baz"])
+        cmd = self.make_command(client.CmdDeleteIndex)
+        retval = cmd.run(self.db_path, "foo")
+        self.assertEqual(retval, None)
+        self.assertEqual(cmd.stdout.getvalue(), '')
+        self.assertEqual(cmd.stderr.getvalue(), '')
+        self.assertEqual([], self.db.list_indexes())
+
+    def test_delete_index_no_db(self):
+        cmd = self.make_command(client.CmdDeleteIndex)
+        retval = cmd.run(self.db_path + "__DOES_NOT_EXIST", "foo")
+        self.assertEqual(retval, 1)
+        self.assertEqual(cmd.stdout.getvalue(), '')
+        self.assertEqual(cmd.stderr.getvalue(), 'Database does not exist.\n')
+
+    def test_delete_index_no_index(self):
+        cmd = self.make_command(client.CmdDeleteIndex)
+        retval = cmd.run(self.db_path, "foo")
+        self.assertEqual(retval, None)
+        self.assertEqual(cmd.stdout.getvalue(), '')
+        self.assertEqual(cmd.stderr.getvalue(), '')
+
+
 class RunMainHelper(object):
 
     def run_main(self, args, stdin=None):