summaryrefslogtreecommitdiff
path: root/tests/regressiontests
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2006-09-14 20:18:24 +0000
committerJason Pellerin <jpellerin@gmail.com>2006-09-14 20:18:24 +0000
commitb92f683f2dee195cc23c7aa13e973fecd6ab35a7 (patch)
tree9b586e31dfbded7f99951dad4f21d931ee9ac2b6 /tests/regressiontests
parent432070d0fbf20b800e667012fd220ae26e3f579f (diff)
[multi-db] Fixed bugs in handling of pending references. Fixed dropping of test database, and ensured that it drops even if syncdb() fails.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
-rw-r--r--tests/regressiontests/ansi_sql/models.py4
-rw-r--r--tests/regressiontests/ansi_sql/sql/car.sql2
-rw-r--r--tests/regressiontests/manager_schema_manipulation/tests.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/regressiontests/ansi_sql/models.py b/tests/regressiontests/ansi_sql/models.py
index 625106f439..63dab57430 100644
--- a/tests/regressiontests/ansi_sql/models.py
+++ b/tests/regressiontests/ansi_sql/models.py
@@ -20,7 +20,7 @@ Set([<class 'regressiontests.ansi_sql.models.Car'>])
# test pending relationships
>>> builder.models_already_seen = set()
>>> builder.get_create_table(Mod)
-([BoundStatement('CREATE TABLE "ansi_sql_mod" (..."car_id" integer NOT NULL,...);')], {<class 'regressiontests.ansi_sql.models.Car'>: [BoundStatement('ALTER TABLE "ansi_sql_mod" ADD CONSTRAINT ... FOREIGN KEY ("car_id") REFERENCES "ansi_sql_car" ("id");')]})
+([BoundStatement('CREATE TABLE "ansi_sql_mod" (..."car_id" integer NOT NULL,...);')], {<class 'regressiontests.ansi_sql.models.Car'>: [(<class 'regressiontests.ansi_sql.models.Mod'>, <django.db.models.fields.related.ForeignKey...>)]})
>>> builder.models_already_seen = set()
>>> builder.get_create_table(Car)
([BoundStatement('CREATE TABLE "ansi_sql_car" (...);')], {})
@@ -45,7 +45,7 @@ Set([<class 'regressiontests.ansi_sql.models.Car'>])
# patch builder so that it looks for initial data where we want it to
# >>> builder.get_initialdata_path = othertests_sql
>>> builder.get_initialdata(Car)
-[BoundStatement('insert into ansi_sql_car (...)...values (...);')]
+[BoundStatement("insert into ansi_sql_car (...)...values (...);...")]
# test drop
>>> builder.get_drop_table(Mod)
diff --git a/tests/regressiontests/ansi_sql/sql/car.sql b/tests/regressiontests/ansi_sql/sql/car.sql
index 8a377aabfb..eaac52a102 100644
--- a/tests/regressiontests/ansi_sql/sql/car.sql
+++ b/tests/regressiontests/ansi_sql/sql/car.sql
@@ -1,2 +1,2 @@
insert into ansi_sql_car (make, model, year, condition)
- values ("Chevy", "Impala", 1966, "mint"); \ No newline at end of file
+ values ('Chevy', 'Impala', 1966, 'mint');
diff --git a/tests/regressiontests/manager_schema_manipulation/tests.py b/tests/regressiontests/manager_schema_manipulation/tests.py
index 56befae7ce..d1f9f1d560 100644
--- a/tests/regressiontests/manager_schema_manipulation/tests.py
+++ b/tests/regressiontests/manager_schema_manipulation/tests.py
@@ -123,7 +123,7 @@
>>> PA._default_manager.db.backend.supports_constraints = True
>>> result = PA.objects.install()
>>> result
-{<class 'regressiontests.manager_schema_manipulation.tests.PC'>: [BoundStatement('ALTER TABLE "msm_pa" ADD CONSTRAINT "id_refs_c_id..." FOREIGN KEY ("c_id") REFERENCES "msm_pc" ("id");')]}
+{<class 'regressiontests.manager_schema_manipulation.tests.PC'>: [(<class 'regressiontests.manager_schema_manipulation.tests.PA'>, <django.db.models.fields.related.ForeignKey ...>)]}
# NOTE: restore real constraint flag
>>> PA._default_manager.db.backend.supports_constraints = real_cnst