Ticket #18218: 18218-1.diff

django/db/backends/oracle/introspection.py

@@ -39 +39 @@
 
     def get_table_list(self, cursor):
         "Returns a list of table names in the current database."
-        cursor.execute("SELECT TABLE_NAME FROM USER_TABLES")
+        cursor.execute("SELECT TABLE_NAME FROM USER_TABLES ORDER BY TABLE_NAME")
         return [row[0].lower() for row in cursor.fetchall()]
 
     def get_table_description(self, cursor, table_name):

django/db/backends/postgresql_psycopg2/introspection.py

@@ -30 +30 @@
             LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
             WHERE c.relkind IN ('r', 'v', '')
                 AND n.nspname NOT IN ('pg_catalog', 'pg_toast')
-                AND pg_catalog.pg_table_is_visible(c.oid)""")
+                AND pg_catalog.pg_table_is_visible(c.oid)
+            ORDER BY c.relname""")
         return [row[0] for row in cursor.fetchall()]
 
     def get_table_description(self, cursor, table_name):

tests/regressiontests/introspection/tests.py

@@ -40 +40 @@
 
     def test_table_names(self):
         tl = connection.introspection.table_names()
+        self.assertEqual(tl, sorted(tl))
         self.assertTrue(Reporter._meta.db_table in tl,
                      "'%s' isn't in table_list()." % Reporter._meta.db_table)
         self.assertTrue(Article._meta.db_table in tl,