Merge lp:~elachuni/django-pgtools/fix-long-seqs-and-dbcheck into lp:django-pgtools

[Anthony Lenton]

Support 1.3 style db config; long sequences are handled correctly

This branch includes two fixes:
 - utils.check_database_engine now supports 1.3-style DATABASE settings
 - long sequences (with names over 64 chars long) are handled correctly, via pg_get_serial_sequence

[Danny Tamez (zematynnad)]

OK, I gave up on the tests but the 2 fixes look fine.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-02 14:54:18 +0000
+++ debian/changelog	2012-04-13 18:16:24 +0000
@@ -1,8 +1,14 @@
+django-pgtools (0.1-2) lucid; urgency=low
+
+  * Fixed long sequences and DB engine check.
+
+ -- Anthony Lenton <[e-mail]>  Fri, 13 Apr 2012 15:12:15 -0300
+
 django-pgtools (0.1-1) lucid; urgency=low
 
   * Fixed packaging issue (no commands were included in the package)
 
- -- Łukasz Czyżykowski <[e-mail]>  jue, 02 jun 2011 15:54:06 +0100
+ -- Łukasz Czyżykowski <[e-mail]>  Thu, 02 jun 2011 15:54:06 +0100
 
 django-pgtools (0.1) lucid; urgency=low
 
 
=== modified file 'pgtools/management/commands/grantuser.py'
--- pgtools/management/commands/grantuser.py	2011-05-30 14:30:10 +0000
+++ pgtools/management/commands/grantuser.py	2012-04-13 18:16:24 +0000
@@ -53,7 +53,9 @@
 
     def _grant_many_to_many(self, field):
         table = field.m2m_db_table()
-        sequence = "%s_id_seq" % table
+        self.cursor.execute("select pg_get_serial_sequence('%s', 'id')" %
+            table)
+        sequence = self.cursor.fetchone()[0]
         self._grant_one(table)
         self._grant_one(sequence)
 
 
=== modified file 'pgtools/tests.py'
--- pgtools/tests.py	2011-05-30 14:30:10 +0000
+++ pgtools/tests.py	2012-04-13 18:16:24 +0000
@@ -441,13 +441,37 @@
             self.assertEqual(str(err),
                 "User cannot be deleted: %s" % TEST_USER_NAME1)
 
-    def test_utils_check_database_engine(self):
+    def test_utils_check_database_engine_11_style(self):
         # Test default: 'postgresql_psycopg2' (hopefully)
-        check_database_engine()
+        settings_to_patch = {}
+        if hasattr(settings, 'DATABASES'):
+            settings_to_patch['DATABASES'] = None
+        for engine in [
+            'postgresql_psycopg2',
+            'django.db.backends.postgresql_psycopg2']:
+            settings_to_patch['DATABASE_ENGINE'] = engine
+            with patch_settings(**settings_to_patch):
+                check_database_engine()
+
         # Test an unsupported engine
-        with patch_settings(DATABASE_ENGINE='sqlite3'):
+        settings_to_patch['DATABASE_ENGINE'] = 'sqlite3'
+        with patch_settings(**settings_to_patch):
             self.assertRaises(CommandError, check_database_engine)
 
+    @patch('pgtools.utils.settings')
+    def test_utils_check_database_engine_13_style(self, mock_settings):
+        dbconfig = {'default': {'NAME': 'mydatabase'}}
+        mock_settings.DATABASES = dbconfig
+        for engine in ['postgresql_psycopg2',
+            'django.db.backends.postgresql_psycopg2']:
+            dbconfig['default']['ENGINE'] = engine
+            mock_settings.DATABASE_ENGINE = 'sqlite3'
+            check_database_engine()
+        # Test an unsupported engine
+        dbconfig['default']['ENGINE'] = 'sqlite3'
+        mock_settings.DATABASE_ENGINE = 'postgresql_psycopg2'
+        self.assertRaises(CommandError, check_database_engine)
+
     def test_utils_get_rolename_from_settings(self):
         # Test with default (nothing set)
         self.assertRaises(CommandError, get_rolename_from_settings)
@@ -517,3 +541,20 @@
         # sequences
         self.assertEqual(mock_grant_one.call_args_list[1],
             (('django_admin_log_id_seq',), {}))
+
+    @patch('pgtools.management.commands.grantuser.get_models')
+    @patch('pgtools.management.commands.grantuser.connection')
+    def test__grant_many_to_many(self, mock_connection, mock_get_models):
+        mock_connection.cursor.return_value.fetchone.return_value = ['foo']
+        from django.contrib.auth import models as auth_models
+        mock_get_models.return_value = get_models(auth_models)
+
+        call_command('grantuser', 'payments')
+
+        args_list = mock_connection.cursor.return_value.execute.call_args_list
+        calls = [x[0][0] for x in args_list]
+        for expected in [
+                "select pg_get_serial_sequence('auth_user_groups', 'id')",
+                'GRANT ALL ON foo TO payments;'
+            ]:
+            self.assertTrue(expected in calls)
 
=== modified file 'pgtools/utils.py'
--- pgtools/utils.py	2011-05-30 14:30:10 +0000
+++ pgtools/utils.py	2012-04-13 18:16:24 +0000
@@ -7,7 +7,16 @@
 
 
 def check_database_engine():
-    if settings.DATABASE_ENGINE != 'postgresql_psycopg2':
+    all_psql = True
+    if getattr(settings, 'DATABASES', None):
+        # Django 1.2+ style
+        for db in settings.DATABASES.values():
+            if not db['ENGINE'].endswith('postgresql_psycopg2'):
+                all_psql = False
+    else:
+        # Django -1.1 style
+        all_psql = settings.DATABASE_ENGINE.endswith('postgresql_psycopg2')
+    if not all_psql:
         raise CommandError(
             'Only the postgresql_psycopg2 database engine is supported.')