Sample files

TexanInParis · Jun 8, 2016 · 39e1bd6 · 39e1bd6
1 parent 097cd35
commit 39e1bd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/Microsoft Access/Chapter 02/Listing 2.029.sql b/Microsoft Access/Chapter 02/Listing 2.029.sql
diff --git a/Microsoft SQL Server/Chapter 02/Listing 2.019.sql b/Microsoft SQL Server/Chapter 02/Listing 2.019.sql
@@ -7,7 +7,7 @@ GO
 
 -- Listing 2.19 SQL for sample trigger to maintain computed value
 CREATE TRIGGER updateOrdersOrderTotalsTrig
-<<<<<<< HEAD
+-- <<<<<<< HEAD
  ON Orders AFTER INSERT, UPDATE, DELETE AS
 BEGIN
   UPDATE Orders
@@ -20,7 +20,7 @@ BEGIN
     SELECT OrderNumber FROM deleted
     UNION
     SELECT OrderNumber FROM inserted
-=======
+-- =======
  ON Order_Details AFTER INSERT, UPDATE, DELETE 
  AS
  BEGIN
@@ -36,15 +36,15 @@ BEGIN
     SELECT OrderNumber FROM deleted
 	UNION
 	SELECT OrderNumber FROM inserted
->>>>>>> origin/master
+-- >>>>>>> origin/master
   );
 END;
 
-<<<<<<< HEAD
+-- <<<<<<< HEAD
 DROP TRIGGER updateOrdersOrderTotalsTrig;
-=======
+-- =======
 
 -- Run the following if you do not wish to keep the trigger in the database.
 --DROP TRIGGER updateOrdersOrderTotalsTrig;
->>>>>>> origin/master
+-- >>>>>>> origin/master