From 58f6853498eb3d05bfd3601042a8c36599d413e2 Mon Sep 17 00:00:00 2001 From: ZVanoZ Date: Fri, 24 Sep 2021 19:26:16 +0300 Subject: [PATCH] MySQL and MSQL fixtures now recreate test structure. Signed-off-by: ZVanoZ --- test/integration/TestFixtures/mysql.sql | 9 +++++++-- test/integration/TestFixtures/sqlsrv-triggers.sql | 2 +- test/integration/TestFixtures/sqlsrv-views.sql | 2 +- test/integration/TestFixtures/sqlsrv.sql | 3 +++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/test/integration/TestFixtures/mysql.sql b/test/integration/TestFixtures/mysql.sql index cfcbbdb30..d1a49b03a 100644 --- a/test/integration/TestFixtures/mysql.sql +++ b/test/integration/TestFixtures/mysql.sql @@ -1,4 +1,5 @@ -CREATE TABLE IF NOT EXISTS test ( +DROP TABLE IF EXISTS test; +CREATE TABLE test ( id INT NOT NULL AUTO_INCREMENT, name VARCHAR(255) NOT NULL, value VARCHAR(255) NOT NULL, @@ -11,7 +12,8 @@ INSERT INTO test (name, value) VALUES ('123a', 'bar'), ('123', 'bar'); -CREATE TABLE IF NOT EXISTS test_charset ( +DROP TABLE IF EXISTS test_charset; +CREATE TABLE test_charset ( id INT NOT NULL AUTO_INCREMENT, field$ VARCHAR(255) NOT NULL, field_ VARCHAR(255) NOT NULL, @@ -22,6 +24,7 @@ INSERT INTO test_charset (field$, field_) VALUES ('foo', 'bar'), ('bar', 'baz'); +DROP TABLE IF EXISTS test_audit_trail; CREATE TABLE test_audit_trail ( id INT NOT NULL AUTO_INCREMENT, test_id INT NOT NULL, @@ -31,6 +34,7 @@ CREATE TABLE test_audit_trail ( PRIMARY KEY (id) ); +DROP VIEW IF EXISTS test_view; CREATE VIEW test_view AS SELECT @@ -39,6 +43,7 @@ SELECT FROM test; +DROP TRIGGER IF EXISTS after_test_update; CREATE TRIGGER after_test_update AFTER UPDATE ON test FOR EACH ROW diff --git a/test/integration/TestFixtures/sqlsrv-triggers.sql b/test/integration/TestFixtures/sqlsrv-triggers.sql index f39bc73a7..bb4bf3a9a 100644 --- a/test/integration/TestFixtures/sqlsrv-triggers.sql +++ b/test/integration/TestFixtures/sqlsrv-triggers.sql @@ -1,4 +1,4 @@ -CREATE TRIGGER after_test_update ON test +CREATE OR ALTER TRIGGER after_test_update ON test AFTER UPDATE AS BEGIN diff --git a/test/integration/TestFixtures/sqlsrv-views.sql b/test/integration/TestFixtures/sqlsrv-views.sql index 143a75de4..0a9992e35 100644 --- a/test/integration/TestFixtures/sqlsrv-views.sql +++ b/test/integration/TestFixtures/sqlsrv-views.sql @@ -1,4 +1,4 @@ -CREATE VIEW test_view +CREATE OR ALTER VIEW test_view AS ( SELECT name AS v_name, diff --git a/test/integration/TestFixtures/sqlsrv.sql b/test/integration/TestFixtures/sqlsrv.sql index 1811428f1..ff10a4425 100644 --- a/test/integration/TestFixtures/sqlsrv.sql +++ b/test/integration/TestFixtures/sqlsrv.sql @@ -1,3 +1,4 @@ +DROP TABLE IF EXISTS test; CREATE TABLE test ( id INT NOT NULL IDENTITY, name VARCHAR(255) NOT NULL, @@ -11,6 +12,7 @@ INSERT INTO test (name, value) VALUES ('123a', 'bar'), ('123', 'bar'); +DROP TABLE IF EXISTS test_charset; CREATE TABLE test_charset ( id INT NOT NULL IDENTITY, field$ VARCHAR(255) NOT NULL, @@ -22,6 +24,7 @@ INSERT INTO test_charset (field$, field_) VALUES ('foo', 'bar'), ('bar', 'baz'); +DROP TABLE IF EXISTS test_audit_trail CREATE TABLE test_audit_trail ( id INT NOT NULL IDENTITY, test_id INT NOT NULL,