Merge lp:~pedronis/u1db/open-database-no-default-for-create into lp:u1db

[Samuele Pedroni]

don't assign a default (because what we want isn't consistent) to the create argument of:

HTTPDatabase.open_database
SQLiteDatabase.open_database

switch the test_client tests to use u1db.open as the tested code itself does.

=== modified file 'u1db/backends/sqlite_backend.py'
--- u1db/backends/sqlite_backend.py	2011-11-30 13:09:21 +0000
+++ u1db/backends/sqlite_backend.py	2011-11-30 21:58:32 +0000
@@ -74,7 +74,7 @@
         return SQLiteDatabase._sqlite_registry[v](sqlite_file)
 
     @classmethod
-    def open_database(cls, sqlite_file, backend_cls=None, create=True):
+    def open_database(cls, sqlite_file, create, backend_cls=None):
         try:
             return cls._open_database(sqlite_file)
         except errors.DatabaseDoesNotExist:

=== modified file 'u1db/remote/http_database.py'
--- u1db/remote/http_database.py	2011-11-29 19:25:38 +0000
+++ u1db/remote/http_database.py	2011-11-30 21:58:32 +0000
@@ -36,7 +36,7 @@
     """Implement the Database API to a remote HTTP server."""
 
     @staticmethod
-    def open_database(url, create=False):
+    def open_database(url, create):
         db = HTTPDatabase(url)
         if create:
             db._ensure()

=== modified file 'u1db/remote/server_state.py'
--- u1db/remote/server_state.py	2011-11-23 12:35:52 +0000
+++ u1db/remote/server_state.py	2011-11-30 21:58:32 +0000
@@ -49,4 +49,5 @@
         """Ensure database at the given location."""
         from u1db.backends import sqlite_backend
         full_path = self._relpath(path)
-        return sqlite_backend.SQLiteDatabase.open_database(full_path)
+        return sqlite_backend.SQLiteDatabase.open_database(full_path,
+                                                           create=True)

=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2011-11-30 21:58:32 +0000
+++ u1db/tests/commandline/test_client.py	2011-11-30 21:58:32 +0000
@@ -20,11 +20,9 @@
 from u1db import (
     __version__ as _u1db_version,
     errors,
+    open as u1db_open,
     tests,
     )
-from u1db.backends import (
-    sqlite_backend,
-    )
 from u1db.commandline import client
 from u1db.tests.commandline import safe_close
 from u1db.tests import test_remote_sync_target
@@ -118,7 +116,7 @@
         super(TestCaseWithDB, self).setUp()
         self.working_dir = self.createTempDir()
         self.db_path = self.working_dir + '/test.db'
-        self.db = sqlite_backend.SQLiteDatabase.open_database(self.db_path)
+        self.db = u1db_open(self.db_path, create=True)
         self.db._set_replica_uid('test')
         self.addCleanup(self.db.close)
 
@@ -207,7 +205,7 @@
         cmd = self.make_command(client.CmdInitDB)
         cmd.run(path, 'test-uid')
         self.assertTrue(os.path.exists(path))
-        db = sqlite_backend.SQLiteDatabase.open_database(path, create=False)
+        db = u1db_open(path, create=False)
         self.assertEqual('test-uid', db._replica_uid)
 
 
@@ -235,7 +233,7 @@
     def setUp(self):
         super(TestCmdSync, self).setUp()
         self.db2_path = self.working_dir + '/test2.db'
-        self.db2 = sqlite_backend.SQLiteDatabase.open_database(self.db2_path)
+        self.db2 = u1db_open(self.db2_path, create=True)
         self.addCleanup(self.db2.close)
         self.db2._set_replica_uid('test2')
         self.doc  = self.db.create_doc(tests.simple_doc, doc_id='test-id')
@@ -341,7 +339,7 @@
     def test_init_db(self):
         path = self.working_dir + '/test2.db'
         ret, stdout, stderr = self.run_main(['init-db', path, 'uid'])
-        db2 = sqlite_backend.SQLiteDatabase.open_database(path, create=False)
+        db2 = u1db_open(path, create=False)
 
     def test_put(self):
         doc = self.db.create_doc(tests.simple_doc, doc_id='test-id')
@@ -358,7 +356,7 @@
     def test_sync(self):
         doc = self.db.create_doc(tests.simple_doc, doc_id='test-id')
         self.db2_path = self.working_dir + '/test2.db'
-        self.db2 = sqlite_backend.SQLiteDatabase.open_database(self.db2_path)
+        self.db2 = u1db_open(self.db2_path, create=True)
         self.addCleanup(self.db2.close)
         ret, stdout, stderr = self.run_main(
             ['sync', self.db_path, self.db2_path])

=== modified file 'u1db/tests/test_sqlite_backend.py'
--- u1db/tests/test_sqlite_backend.py	2011-11-30 14:19:48 +0000
+++ u1db/tests/test_sqlite_backend.py	2011-11-30 21:58:32 +0000
@@ -270,7 +270,7 @@
     def test_open_database_create(self):
         temp_dir = self.createTempDir(prefix='u1db-test-')
         path = temp_dir + '/new.sqlite'
-        db = sqlite_backend.SQLiteDatabase.open_database(path)
+        db = sqlite_backend.SQLiteDatabase.open_database(path, create=True)
         db2 = sqlite_backend.SQLiteDatabase.open_database(path, create=False)
         self.assertIsInstance(db2, sqlite_backend.SQLitePartialExpandDatabase)