Update tests for cascades

Author: pydanny

tests/test_create.py

@@ -303,7 +303,7 @@ def test_self_referential_foreign_key(fresh_db):
     assert (
         "CREATE TABLE [test_table] (\n"
         "   [id] INTEGER PRIMARY KEY,\n"
-        "   [ref] INTEGER REFERENCES [test_table]([id])\n"
+        "   [ref] INTEGER REFERENCES [test_table]([id]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     ) == table.schema
 
@@ -491,7 +491,7 @@ def test_add_column_foreign_key(fresh_db):
     assert fresh_db["dogs"].schema == (
         'CREATE TABLE "dogs" (\n'
         "   [name] TEXT,\n"
-        "   [breed_id] INTEGER REFERENCES [breeds]([rowid])\n"
+        "   [breed_id] INTEGER REFERENCES [breeds]([rowid]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     )
     # And again with an explicit primary key column
@@ -500,8 +500,8 @@ def test_add_column_foreign_key(fresh_db):
     assert fresh_db["dogs"].schema == (
         'CREATE TABLE "dogs" (\n'
         "   [name] TEXT,\n"
-        "   [breed_id] INTEGER REFERENCES [breeds]([rowid]),\n"
-        "   [subbreed_id] TEXT REFERENCES [subbreeds]([primkey])\n"
+        "   [breed_id] INTEGER REFERENCES [breeds]([rowid]) ON UPDATE CASCADE ON DELETE CASCADE,\n"
+        "   [subbreed_id] TEXT REFERENCES [subbreeds]([primkey]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     )
 
@@ -514,7 +514,7 @@ def test_add_foreign_key_guess_table(fresh_db):
     assert fresh_db["dogs"].schema == (
         'CREATE TABLE "dogs" (\n'
         "   [name] TEXT,\n"
-        "   [breed_id] INTEGER REFERENCES [breeds]([id])\n"
+        "   [breed_id] INTEGER REFERENCES [breeds]([id]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     )
 

tests/test_extract.py

@@ -26,7 +26,7 @@ def test_extract_single_column(fresh_db, table, fk_column):
         'CREATE TABLE "tree" (\n'
         "   [id] INTEGER PRIMARY KEY,\n"
         "   [name] TEXT,\n"
-        "   [{}] INTEGER REFERENCES [{}]([id]),\n".format(expected_fk, expected_table)
+        "   [{}] INTEGER REFERENCES [{}]([id]) ON UPDATE CASCADE ON DELETE CASCADE,\n".format(expected_fk, expected_table)
         + "   [end] INTEGER\n"
         + ")"
     )
@@ -73,7 +73,7 @@ def test_extract_multiple_columns_with_rename(fresh_db):
         'CREATE TABLE "tree" (\n'
         "   [id] INTEGER PRIMARY KEY,\n"
         "   [name] TEXT,\n"
-        "   [common_name_latin_name_id] INTEGER REFERENCES [common_name_latin_name]([id])\n"
+        "   [common_name_latin_name_id] INTEGER REFERENCES [common_name_latin_name]([id]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     )
     assert fresh_db["common_name_latin_name"].schema == (
@@ -123,7 +123,7 @@ def test_extract_rowid_table(fresh_db):
     assert fresh_db["tree"].schema == (
         'CREATE TABLE "tree" (\n'
         "   [name] TEXT,\n"
-        "   [common_name_latin_name_id] INTEGER REFERENCES [common_name_latin_name]([id])\n"
+        "   [common_name_latin_name_id] INTEGER REFERENCES [common_name_latin_name]([id]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     )
     assert (
@@ -153,14 +153,14 @@ def test_reuse_lookup_table(fresh_db):
     assert fresh_db["sightings"].schema == (
         'CREATE TABLE "sightings" (\n'
         "   [id] INTEGER PRIMARY KEY,\n"
-        "   [species_id] INTEGER REFERENCES [species]([id])\n"
+        "   [species_id] INTEGER REFERENCES [species]([id]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     )
     assert fresh_db["individuals"].schema == (
         'CREATE TABLE "individuals" (\n'
         "   [id] INTEGER PRIMARY KEY,\n"
         "   [name] TEXT,\n"
-        "   [species_id] INTEGER REFERENCES [species]([id])\n"
+        "   [species_id] INTEGER REFERENCES [species]([id]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     )
     assert list(fresh_db["species"].rows) == [

tests/test_extracts.py

@@ -36,7 +36,7 @@ def test_extracts(fresh_db, kwargs, expected_table, use_table_factory):
         == fresh_db[expected_table].schema
     )
     assert (
-        "CREATE TABLE [Trees] (\n   [id] INTEGER,\n   [species_id] INTEGER REFERENCES [{}]([id])\n)".format(
+        "CREATE TABLE [Trees] (\n   [id] INTEGER,\n   [species_id] INTEGER REFERENCES [{}]([id]) ON UPDATE CASCADE ON DELETE CASCADE\n)".format(
             expected_table
         )
         == fresh_db["Trees"].schema

tests/test_lookup.py

@@ -121,9 +121,9 @@ def test_lookup_with_extra_insert_parameters(fresh_db):
         "   [type] TEXT,\n"
         "   [first_seen] TEXT,\n"
         "   [make_not_null] INTEGER NOT NULL,\n"
-        "   [fk_to_other] INTEGER REFERENCES [other_table]([id]),\n"
+        "   [fk_to_other] INTEGER REFERENCES [other_table]([id]) ON UPDATE CASCADE ON DELETE CASCADE,\n"
         "   [default_is_dog] TEXT DEFAULT 'dog',\n"
-        "   [extract_this] INTEGER REFERENCES [extract_this]([id]),\n"
+        "   [extract_this] INTEGER REFERENCES [extract_this]([id]) ON UPDATE CASCADE ON DELETE CASCADE,\n"
         "   [convert_to_upper] TEXT,\n"
         "   [make_this_integer] INTEGER\n"
         ")"

tests/test_transform.py

@@ -398,7 +398,7 @@ def test_transform_verify_foreign_keys(fresh_db):
     try:
         fresh_db["authors"].transform(rename={"id": "id2"})
         fresh_db.commit()
-    except apsw.ConstraintError:
+    except apsw.SQLError:
         fresh_db.rollback()
 
     # This should have rolled us back
@@ -435,9 +435,9 @@ def test_transform_add_foreign_keys_from_scratch(fresh_db):
         'CREATE TABLE "places" (\n'
         "   [id] INTEGER,\n"
         "   [name] TEXT,\n"
-        "   [country] INTEGER REFERENCES [country]([id]),\n"
-        "   [continent] INTEGER REFERENCES [continent]([id]),\n"
-        "   [city] INTEGER REFERENCES [city]([id])\n"
+        "   [country] INTEGER REFERENCES [country]([id]) ON UPDATE CASCADE ON DELETE CASCADE,\n"
+        "   [continent] INTEGER REFERENCES [continent]([id]) ON UPDATE CASCADE ON DELETE CASCADE,\n"
+        "   [city] INTEGER REFERENCES [city]([id]) ON UPDATE CASCADE ON DELETE CASCADE\n"
         ")"
     )
 
@@ -506,8 +506,8 @@ def test_transform_replace_foreign_keys(fresh_db, foreign_keys):
         'CREATE TABLE "places" (\n'
         "   [id] INTEGER,\n"
         "   [name] TEXT,\n"
-        "   [country] INTEGER REFERENCES [country]([id]),\n"
-        "   [continent] INTEGER REFERENCES [continent]([id]),\n"
+        "   [country] INTEGER REFERENCES [country]([id]) ON UPDATE CASCADE ON DELETE CASCADE,\n"
+        "   [continent] INTEGER REFERENCES [continent]([id]) ON UPDATE CASCADE ON DELETE CASCADE,\n"
         "   [city] INTEGER\n"
         ")"
     )