Changeset 3320

Timestamp:

07/10/06 22:16:28 (2 years ago)

Author:

jpellerin

Message:

[multi-db] Added preliminary drop-table generation to django.db.backends.ansi.sql.SchemaBuilder?.

Files:

• django/branches/multiple-db-support/django/db/backends/ansi/sql.py (modified) (5 diffs)
• django/branches/multiple-db-support/django/db/models/manager.py (modified) (1 diff)
• django/branches/multiple-db-support/tests/othertests/ansi_sql.py (modified) (4 diffs)

django/branches/multiple-db-support/django/db/backends/ansi/sql.py

@@ -44 +44 @@
-    """
-    def __init__(self):
+        # models that I have created
-        self.models_already_seen = set()
-
+
+
+
+
+
-    def get_create_table(self, model, style=None):
-        """Construct and return the SQL expression(s) needed to create the
@@ -219 +224 @@
-        """Construct and return the SQL statment(s) needed to drop a model's
-        table. If cascade is true, then output additional statments to drop any
-dependant man-many tables and drop any foreign keys that reference
-
+many-to-many tables that this table created and any foreign keys that
+reference 
-        """
-        if style is None:
@@ -228 +233 @@
-        db_table = opts.db_table
-        backend = info.backend
+        qn = backend.quote_name
-        output = []
-        output.append(BoundStatement(
-                '%s %s;' % (style.SQL_KEYWORD('DROP TABLE'),
-backend.quote_name
+qn
-                info.connection))
-
-        if cascade:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        # Reverse it, to deal with table dependencies.        
-        output.reverse()
@@ -274 +308 @@
-        """Get the path from which to load sql initial data files for a model.
-        """
-
+
+
-            
-    def get_rel_data_type(self, f):
@@ -281 +316 @@
-                                          and 'IntegerField' \
-                                          or f.get_internal_type()
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/branches/multiple-db-support/django/db/models/manager.py

@@ -160 +160 @@
-        """
-        info = self.model._meta.connection_info
-
-
-
+
+
-    
-class ManagerDescriptor(object):

django/branches/multiple-db-support/tests/othertests/ansi_sql.py

@@ -1 @@
-# For Python 2.3
-if not hasattr(__builtins__, 'set'):
-    from sets import Set as set
-
-"""
->>> from django.db import models
->>> from django.db.backends.ansi import sql
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    
-# generate create sql
->>> builder = sql.SchemaBuilder()
->>> builder.get_create_table(Car)
-[]
+{}
->>> builder.models_already_seen
-
+
->>> builder.models_already_seen = set()
-
-# test that styles are used
->>> builder.get_create_table(Car, style=mockstyle())
-[]
+{}
-
-# test pending relationships
->>> builder.models_already_seen = set()
->>> real_cnst = Mod._meta.connection_info.backend.supports_constraints
->>> Mod._meta.connection_info.backend.supports_constraints = True
->>> builder.get_create_table(Mod)
-([BoundStatement('CREATE TABLE "ansi_sql_mod" (..."car_id" integer NOT NULL,...);')], {<class 'othertests.ansi_sql.Car'>: [BoundStatement('ALTER TABLE "ansi_sql_mod" ADD CONSTRAINT ... FOREIGN KEY ("car_id") REFERENCES "ansi_sql_car" ("id");')]})
@@ -55 +27 @@
->>> builder.get_create_table(Mod)
-([BoundStatement('CREATE TABLE "ansi_sql_mod" (..."car_id" integer NOT NULL REFERENCES "ansi_sql_car" ("id"),...);')], {})
->>> Mod._meta.connection_info.backend.supports_constraints = real_cnst
-
-# test many-many
@@ -76 +47 @@
->>> builder.get_initialdata(Car)
-[BoundStatement('insert into ansi_sql_car (...)...values (...);')]
+
+# test drop
+>>> builder.get_drop_table(Mod)
+[BoundStatement('DROP TABLE "ansi_sql_mod";')]
+>>> builder.get_drop_table(Mod, cascade=True)
+[BoundStatement('DROP TABLE "ansi_sql_mod";')]
+>>> builder.get_drop_table(Car)
+[BoundStatement('DROP TABLE "ansi_sql_car";')]
+>>> builder.get_drop_table(Car, cascade=True)
+[BoundStatement('DROP TABLE "ansi_sql_car";')]
+
+>>> builder.tables = ['ansi_sql_car', 'ansi_sql_mod', 'ansi_sql_collector']
+>>> Mod._meta.connection_info.backend.supports_constraints = False
+>>> builder.get_drop_table(Car, cascade=True)
+[BoundStatement('DROP TABLE "ansi_sql_car";')]
+>>> Mod._meta.connection_info.backend.supports_constraints = True
+>>> builder.get_drop_table(Car, cascade=True)
+[BoundStatement('ALTER TABLE "ansi_sql_mod" ...'), BoundStatement('DROP TABLE "ansi_sql_car";')]
+>>> builder.get_drop_table(Collector)
+[BoundStatement('DROP TABLE "ansi_sql_collector";')]
+>>> builder.get_drop_table(Collector, cascade=True)
+[BoundStatement('DROP TABLE "ansi_sql_collector_cars";'), BoundStatement('DROP TABLE "ansi_sql_collector";')]
+>>> Mod._meta.connection_info.backend.supports_constraints = real_cnst
+
-"""
-import os
+from django.db import models
+from django.core.management import install
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-class mockstyle:
+    """mock style that wraps text in STYLE(text), for testing"""
-    def __getattr__(self, attr):
-        if attr in ('ERROR', 'ERROR_OUTPUT', 'SQL_FIELD', 'SQL_COLTYPE',
@@ -86 +116 @@
-            return lambda text: "%s(%s)" % (attr, text)
-
+        
-def othertests_sql(mod):
-    """Look in othertests/sql for sql initialdata"""
-    return os.path.normpath(os.path.join(os.path.dirname(__file__), 'sql'))
+
+
+# install my stuff
+Car.objects.install()
+Collector.objects.install()
+Mod.objects.install()