diff --git a/business_objects/__pycache__/__init__.cpython-38.pyc b/business_objects/__pycache__/__init__.cpython-38.pyc index 29012b58..bef43550 100644 Binary files a/business_objects/__pycache__/__init__.cpython-38.pyc and b/business_objects/__pycache__/__init__.cpython-38.pyc differ diff --git a/lib/__pycache__/__init__.cpython-38.pyc b/lib/__pycache__/__init__.cpython-38.pyc index 7ada03ef..04984bb8 100644 Binary files a/lib/__pycache__/__init__.cpython-38.pyc and b/lib/__pycache__/__init__.cpython-38.pyc differ diff --git a/lib/__pycache__/argument_validation.cpython-38.pyc b/lib/__pycache__/argument_validation.cpython-38.pyc index 534c89de..536cded4 100644 Binary files a/lib/__pycache__/argument_validation.cpython-38.pyc and b/lib/__pycache__/argument_validation.cpython-38.pyc differ diff --git a/lib/__pycache__/data_types.cpython-38.pyc b/lib/__pycache__/data_types.cpython-38.pyc index 08437f7e..a43f0ae8 100644 Binary files a/lib/__pycache__/data_types.cpython-38.pyc and b/lib/__pycache__/data_types.cpython-38.pyc differ diff --git a/models/__pycache__/__init__.cpython-38.pyc b/models/__pycache__/__init__.cpython-38.pyc index 0f524495..abff7808 100644 Binary files a/models/__pycache__/__init__.cpython-38.pyc and b/models/__pycache__/__init__.cpython-38.pyc differ diff --git a/models/__pycache__/model_view_base.cpython-38.pyc b/models/__pycache__/model_view_base.cpython-38.pyc index 1cc9640f..3112cb6e 100644 Binary files a/models/__pycache__/model_view_base.cpython-38.pyc and b/models/__pycache__/model_view_base.cpython-38.pyc differ diff --git a/models/__pycache__/model_view_contact.cpython-38.pyc b/models/__pycache__/model_view_contact.cpython-38.pyc index 09301898..1cdaffb2 100644 Binary files a/models/__pycache__/model_view_contact.cpython-38.pyc and b/models/__pycache__/model_view_contact.cpython-38.pyc differ diff --git a/models/__pycache__/model_view_home.cpython-38.pyc b/models/__pycache__/model_view_home.cpython-38.pyc index 22cf0a13..57fc70a4 100644 Binary files a/models/__pycache__/model_view_home.cpython-38.pyc and b/models/__pycache__/model_view_home.cpython-38.pyc differ diff --git a/static/MySQL/0000_combined.sql b/static/MySQL/0000_combined.sql index c3660b50..ec48f6e0 100644 --- a/static/MySQL/0000_combined.sql +++ b/static/MySQL/0000_combined.sql @@ -2,7 +2,7 @@ /* Clear Store DataBase */ - +USE partsltd_prod; # Drop dependencies DROP TABLE IF EXISTS tmp_Shop_Calc_User; @@ -3653,7 +3653,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -3694,7 +3694,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3000_tri_Shop_Product_Change_Set.sql @@ -3710,14 +3710,14 @@ CREATE TRIGGER before_insert_Shop_Product_Change_Set BEFORE INSERT ON Shop_Product_Change_Set FOR EACH ROW BEGIN - IF NEW.updated_last_on <=> NULL THEN + IF NEW.updated_last_on IS NULL THEN SET NEW.updated_last_on = NOW(); END IF; - IF NEW.updated_last_by <=> NULL THEN + IF NEW.updated_last_by IS NULL THEN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; -- File: 3001_tri_Shop_User_Change_Set.sql @@ -3734,14 +3734,14 @@ CREATE TRIGGER before_insert_Shop_User_Change_Set BEFORE INSERT ON Shop_User_Change_Set FOR EACH ROW BEGIN - IF NEW.updated_last_on <=> NULL THEN + IF NEW.updated_last_on IS NULL THEN SET NEW.updated_last_on = NOW(); END IF; - IF NEW.updated_last_by <=> NULL THEN + IF NEW.updated_last_by IS NULL THEN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; -- File: 3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql @@ -3756,14 +3756,14 @@ CREATE TRIGGER before_insert_Shop_Sales_And_Purchasing_Change_Set BEFORE INSERT ON Shop_Sales_And_Purchasing_Change_Set FOR EACH ROW BEGIN - IF NEW.updated_last_on <=> NULL THEN + IF NEW.updated_last_on IS NULL THEN SET NEW.updated_last_on = NOW(); END IF; - IF NEW.updated_last_by <=> NULL THEN + IF NEW.updated_last_by IS NULL THEN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; -- File: 3010_tri_File_Type.sql @@ -3776,6 +3776,7 @@ DROP TRIGGER IF EXISTS before_insert_File_Type; DROP TRIGGER IF EXISTS before_update_File_Type; DELIMITER // + CREATE TRIGGER before_insert_File_Type BEFORE INSERT ON File_Type FOR EACH ROW @@ -3783,7 +3784,8 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; + +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type @@ -3809,7 +3811,7 @@ BEGIN WHERE NOT OLD.extension <=> NEW.extension ; END // -DELIMITER ;; +DELIMITER ; -- File: 3011_tri_File_Type_Audit.sql @@ -3830,7 +3832,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type_Audit @@ -3840,7 +3842,7 @@ BEGIN SET NEW.updated_last_on = NOW(); SET NEW.updated_last_by = CURRENT_USER(); END // -DELIMITER ;; +DELIMITER ; -- File: 3012_tri_Shop_General.sql @@ -3859,7 +3861,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_General @@ -3883,7 +3885,7 @@ BEGIN WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; END // -DELIMITER ;; +DELIMITER ; -- File: 3014_tri_Shop_Image_Type.sql @@ -3903,7 +3905,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -3950,7 +3952,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3100_tri_Shop_Region.sql @@ -3970,7 +3972,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4007,7 +4009,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3103_tri_Shop_Region_Branch.sql @@ -4028,7 +4030,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4063,7 +4065,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3106_tri_Shop_Address.sql @@ -4084,7 +4086,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4133,7 +4135,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3109_tri_Shop_Storage_Location.sql @@ -4153,7 +4155,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4190,7 +4192,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; -- File: 3115_tri_Shop_Currency.sql @@ -4211,7 +4213,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4256,7 +4258,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3118_tri_Shop_Tax_Or_Surcharge.sql @@ -4276,7 +4278,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Tax_Or_Surcharge @@ -4332,7 +4334,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -4353,7 +4355,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Product_Category @@ -4397,7 +4399,7 @@ BEGIN WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required ; END // -DELIMITER ;; +DELIMITER ; -- File: 3203_tri_Shop_Product.sql @@ -4419,7 +4421,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4570,7 +4572,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3206_tri_Shop_Product_Permutation.sql @@ -4591,7 +4593,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4740,7 +4742,7 @@ BEGIN */ ; END // -DELIMITER ;; +DELIMITER ; -- File: 3209_tri_Shop_Variation_Type.sql @@ -4762,7 +4764,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4803,7 +4805,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3212_tri_Shop_Variation.sql @@ -4824,7 +4826,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4869,7 +4871,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3215_tri_Shop_Product_Permutation_Variation_Link.sql @@ -4890,7 +4892,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4929,7 +4931,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3218_tri_Shop_Stock_Item.sql @@ -4949,7 +4951,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5022,7 +5024,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3221_tri_Shop_Product_Price.sql @@ -5053,7 +5055,7 @@ BEGIN ); */ END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5112,7 +5114,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3224_tri_Shop_Product_Image.sql @@ -5133,7 +5135,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5188,7 +5190,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3227_tri_Shop_Delivery_Option.sql @@ -5208,7 +5210,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5263,7 +5265,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql @@ -5283,7 +5285,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5344,7 +5346,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3233_tri_Shop_Discount.sql @@ -5364,7 +5366,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Discount @@ -5428,7 +5430,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -5450,7 +5452,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5485,7 +5487,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3300_tri_Shop_Permission_Group.sql @@ -5505,7 +5507,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5542,7 +5544,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3303_tri_Shop_Permission.sql @@ -5562,7 +5564,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5607,7 +5609,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3306_tri_Shop_Role.sql @@ -5627,7 +5629,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5664,7 +5666,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3309_tri_Shop_Role_Permission_Link.sql @@ -5685,7 +5687,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5724,7 +5726,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3312_tri_Shop_User.sql @@ -5745,7 +5747,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5806,7 +5808,7 @@ BEGIN WHERE NOT (OLD.is_included_VAT_default <=> NEW.is_included_VAT_default) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3315_tri_Shop_User_Role_Link.sql @@ -5826,7 +5828,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5851,7 +5853,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3318_tri_Shop_User_Address.sql @@ -5871,7 +5873,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5928,7 +5930,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3321_tri_Shop_User_Basket.sql @@ -5948,7 +5950,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5985,7 +5987,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3324_tri_Shop_User_Order_Status.sql @@ -6005,7 +6007,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6046,7 +6048,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3400_tri_Shop_Supplier.sql @@ -6066,7 +6068,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6129,7 +6131,7 @@ BEGIN WHERE NOT OLD.id_supplier_temp <=> NEW.id_supplier_temp ; END // -DELIMITER ;; +DELIMITER ; -- File: 3403_tri_Shop_Supplier_Address.sql @@ -6148,7 +6150,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6197,7 +6199,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3403_tri_Shop_Unit_Measurement.sql @@ -6217,7 +6219,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6274,7 +6276,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -6296,7 +6298,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6341,7 +6343,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -6363,7 +6365,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6422,7 +6424,7 @@ BEGIN */ ; END // -DELIMITER ;; +DELIMITER ; @@ -6444,7 +6446,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6519,7 +6521,7 @@ BEGIN WHERE NOT OLD.cost_unit_local_VAT_incl <=> NEW.cost_unit_local_VAT_incl ; END // -DELIMITER ;; +DELIMITER ; -- File: 3415_tri_Shop_Manufacturing_Purchase_Order.sql @@ -6544,7 +6546,7 @@ BEGIN SET MESSAGE_TEXT = 'Valid created by User ID must be provided.'; END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6593,7 +6595,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; -- File: 3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql @@ -6614,7 +6616,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6687,7 +6689,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -6709,7 +6711,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6762,7 +6764,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -6784,7 +6786,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6821,7 +6823,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; -- File: 3427_tri_Shop_Customer_Sales_Order_Product_Link.sql @@ -6842,7 +6844,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6903,7 +6905,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; -- File: 6000_p_debug_timing_reporting.sql @@ -6943,7 +6945,7 @@ BEGIN ; END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_debug_timing_reporting ( @@ -7038,7 +7040,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -7080,7 +7082,7 @@ BEGIN COMMIT; END // -DELIMITER ;; +DELIMITER ; /* @@ -7128,7 +7130,7 @@ BEGIN ; END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -7147,9 +7149,9 @@ BEGIN DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; -CALL p_validate_guid_test(); +-- CALL p_validate_guid_test(); -- File: 6003_p_split_key_value_pair_csv.sql @@ -7244,7 +7246,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -7284,7 +7286,7 @@ BEGIN COMMIT; END // -DELIMITER ;; +DELIMITER ; /* @@ -7546,7 +7548,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; */ /* @@ -8297,7 +8299,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -8378,7 +8380,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -8433,7 +8435,7 @@ BEGIN ORDER BY AL.display_order ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8481,7 +8483,7 @@ BEGIN ORDER BY R.display_order ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8520,7 +8522,7 @@ BEGIN OR P.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8560,7 +8562,7 @@ BEGIN OR SL.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8610,7 +8612,7 @@ BEGIN ORDER BY C.display_order ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8651,7 +8653,7 @@ BEGIN OR UM.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8990,7 +8992,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* select @@ -9085,7 +9087,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_category_test (); @@ -9130,7 +9132,7 @@ BEGIN END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -9498,7 +9500,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; @@ -9587,7 +9589,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_test (); @@ -10262,7 +10264,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -10784,7 +10786,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -11119,7 +11121,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_User; END // -DELIMITER ;; +DELIMITER ; /* @@ -11809,7 +11811,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -12044,7 +12046,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; CALL partsltd_prod.p_shop_save_product_permutation_test (); @@ -12423,7 +12425,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -13037,7 +13039,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; @@ -13200,7 +13202,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_variation_test (); @@ -13958,7 +13960,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -14628,7 +14630,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -14805,7 +14807,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; CALL partsltd_prod.p_shop_save_stock_item_test (); @@ -15773,7 +15775,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -16056,7 +16058,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_User; DROP TABLE IF EXISTS tmp_Shop_Product_Currency_Link; END // -DELIMITER ;; +DELIMITER ; /* @@ -16349,7 +16351,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; @@ -16849,7 +16851,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; @@ -17669,7 +17671,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_User; END // -DELIMITER ;; +DELIMITER ; /* @@ -18315,15 +18317,16 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; -- SELECT * FROM Shop_Supplier; - +/* delete from shop_supplier_audit where id_supplier = 9; delete from shop_supplier where id_supplier = 9; delete from shop_supplier_address_audit where id_address = -4; delete from shop_supplier_address where id_address = -4; +*/ -- File: 7400_p_shop_save_supplier_temp.sql @@ -18480,7 +18483,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_supplier_test (); @@ -18744,7 +18747,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -19597,7 +19600,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -19805,7 +19808,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_supplier_purchase_order_test (); @@ -20304,7 +20307,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -21285,7 +21288,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -21487,7 +21490,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_Manufacturing_purchase_order_test (); @@ -21886,7 +21889,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -22186,7 +22189,7 @@ BEGIN -- DROP TABLE tmp_Shop_Customer; DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; /* @@ -22471,7 +22474,7 @@ BEGIN WHERE GUID = v_guid ; END // -DELIMITER ;; +DELIMITER ; /* @@ -22982,7 +22985,7 @@ BEGIN DROP TABLE tmp_Shop_Customer_Sales_Order_Product_Link; DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; /* @@ -23789,7 +23792,7 @@ BEGIN WHERE GUID = v_guid ; END // -DELIMITER ;; +DELIMITER ; /* @@ -24957,7 +24960,7 @@ VALUES /* -- Clean up END // -DELIMITER ;; +DELIMITER ; -- Call diff --git a/static/MySQL/3000_tri_Shop_Access_Level.sql b/static/MySQL/3000_tri_Shop_Access_Level.sql index 2aac8eb1..4ffd740f 100644 --- a/static/MySQL/3000_tri_Shop_Access_Level.sql +++ b/static/MySQL/3000_tri_Shop_Access_Level.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -56,4 +56,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3000_tri_Shop_Product_Change_Set.sql b/static/MySQL/3000_tri_Shop_Product_Change_Set.sql index 9381df44..bc6ebc0b 100644 --- a/static/MySQL/3000_tri_Shop_Product_Change_Set.sql +++ b/static/MySQL/3000_tri_Shop_Product_Change_Set.sql @@ -17,4 +17,4 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3001_tri_Shop_User_Change_Set.sql b/static/MySQL/3001_tri_Shop_User_Change_Set.sql index afb0e726..8e20859f 100644 --- a/static/MySQL/3001_tri_Shop_User_Change_Set.sql +++ b/static/MySQL/3001_tri_Shop_User_Change_Set.sql @@ -18,4 +18,4 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql b/static/MySQL/3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql index 7c10bf4c..60f1abda 100644 --- a/static/MySQL/3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql +++ b/static/MySQL/3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql @@ -17,4 +17,4 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3010_tri_File_Type.sql b/static/MySQL/3010_tri_File_Type.sql index 18176d0d..529c4def 100644 --- a/static/MySQL/3010_tri_File_Type.sql +++ b/static/MySQL/3010_tri_File_Type.sql @@ -14,7 +14,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type @@ -40,4 +40,4 @@ BEGIN WHERE NOT OLD.extension <=> NEW.extension ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3011_tri_File_Type_Audit.sql b/static/MySQL/3011_tri_File_Type_Audit.sql index e94ad6ea..4a198890 100644 --- a/static/MySQL/3011_tri_File_Type_Audit.sql +++ b/static/MySQL/3011_tri_File_Type_Audit.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type_Audit @@ -25,4 +25,4 @@ BEGIN SET NEW.updated_last_on = NOW(); SET NEW.updated_last_by = CURRENT_USER(); END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3012_tri_Shop_General.sql b/static/MySQL/3012_tri_Shop_General.sql index 8f98175e..aa8f4036 100644 --- a/static/MySQL/3012_tri_Shop_General.sql +++ b/static/MySQL/3012_tri_Shop_General.sql @@ -14,7 +14,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_General @@ -38,4 +38,4 @@ BEGIN WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3014_tri_Shop_Image_Type.sql b/static/MySQL/3014_tri_Shop_Image_Type.sql index 8b6d190e..fac5eeab 100644 --- a/static/MySQL/3014_tri_Shop_Image_Type.sql +++ b/static/MySQL/3014_tri_Shop_Image_Type.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -62,4 +62,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3100_tri_Shop_Region.sql b/static/MySQL/3100_tri_Shop_Region.sql index 40a4598c..cb759121 100644 --- a/static/MySQL/3100_tri_Shop_Region.sql +++ b/static/MySQL/3100_tri_Shop_Region.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3103_tri_Shop_Region_Branch.sql b/static/MySQL/3103_tri_Shop_Region_Branch.sql index 53dfc5d6..56dc6316 100644 --- a/static/MySQL/3103_tri_Shop_Region_Branch.sql +++ b/static/MySQL/3103_tri_Shop_Region_Branch.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -50,4 +50,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3106_tri_Shop_Address.sql b/static/MySQL/3106_tri_Shop_Address.sql index 30d2d987..2203be87 100644 --- a/static/MySQL/3106_tri_Shop_Address.sql +++ b/static/MySQL/3106_tri_Shop_Address.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -64,4 +64,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3109_tri_Shop_Storage_Location.sql b/static/MySQL/3109_tri_Shop_Storage_Location.sql index f004d3a9..17d0a810 100644 --- a/static/MySQL/3109_tri_Shop_Storage_Location.sql +++ b/static/MySQL/3109_tri_Shop_Storage_Location.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3115_tri_Shop_Currency.sql b/static/MySQL/3115_tri_Shop_Currency.sql index f540d7a7..c16d0f3c 100644 --- a/static/MySQL/3115_tri_Shop_Currency.sql +++ b/static/MySQL/3115_tri_Shop_Currency.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -60,4 +60,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql b/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql index 54215b15..cf56d456 100644 --- a/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql +++ b/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Tax_Or_Surcharge @@ -71,5 +71,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3200_tri_Shop_Category.sql b/static/MySQL/3200_tri_Shop_Category.sql index 051a98ec..3ae73e92 100644 --- a/static/MySQL/3200_tri_Shop_Category.sql +++ b/static/MySQL/3200_tri_Shop_Category.sql @@ -14,7 +14,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Product_Category @@ -58,4 +58,4 @@ BEGIN WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3203_tri_Shop_Product.sql b/static/MySQL/3203_tri_Shop_Product.sql index d302762d..596e1c60 100644 --- a/static/MySQL/3203_tri_Shop_Product.sql +++ b/static/MySQL/3203_tri_Shop_Product.sql @@ -16,7 +16,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -167,4 +167,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3206_tri_Shop_Product_Permutation.sql b/static/MySQL/3206_tri_Shop_Product_Permutation.sql index de1a23a4..c2bcbe9d 100644 --- a/static/MySQL/3206_tri_Shop_Product_Permutation.sql +++ b/static/MySQL/3206_tri_Shop_Product_Permutation.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -164,4 +164,4 @@ BEGIN */ ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3209_tri_Shop_Variation_Type.sql b/static/MySQL/3209_tri_Shop_Variation_Type.sql index d9e8774b..8a642c49 100644 --- a/static/MySQL/3209_tri_Shop_Variation_Type.sql +++ b/static/MySQL/3209_tri_Shop_Variation_Type.sql @@ -16,7 +16,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -57,4 +57,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3212_tri_Shop_Variation.sql b/static/MySQL/3212_tri_Shop_Variation.sql index a5e7c150..729a3858 100644 --- a/static/MySQL/3212_tri_Shop_Variation.sql +++ b/static/MySQL/3212_tri_Shop_Variation.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -60,4 +60,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql b/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql index b2bef410..f33a1448 100644 --- a/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql +++ b/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -54,4 +54,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3218_tri_Shop_Stock_Item.sql b/static/MySQL/3218_tri_Shop_Stock_Item.sql index f88085fe..d5be86d9 100644 --- a/static/MySQL/3218_tri_Shop_Stock_Item.sql +++ b/static/MySQL/3218_tri_Shop_Stock_Item.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -88,4 +88,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3221_tri_Shop_Product_Price.sql b/static/MySQL/3221_tri_Shop_Product_Price.sql index f4d7b7e9..8dff41d5 100644 --- a/static/MySQL/3221_tri_Shop_Product_Price.sql +++ b/static/MySQL/3221_tri_Shop_Product_Price.sql @@ -25,7 +25,7 @@ BEGIN ); */ END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -84,4 +84,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3224_tri_Shop_Product_Image.sql b/static/MySQL/3224_tri_Shop_Product_Image.sql index 99520b72..09e437c2 100644 --- a/static/MySQL/3224_tri_Shop_Product_Image.sql +++ b/static/MySQL/3224_tri_Shop_Product_Image.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -70,4 +70,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3227_tri_Shop_Delivery_Option.sql b/static/MySQL/3227_tri_Shop_Delivery_Option.sql index b2a24adb..9876ac42 100644 --- a/static/MySQL/3227_tri_Shop_Delivery_Option.sql +++ b/static/MySQL/3227_tri_Shop_Delivery_Option.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -70,4 +70,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql b/static/MySQL/3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql index 9b7afe1f..ef098ba6 100644 --- a/static/MySQL/3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql +++ b/static/MySQL/3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -76,4 +76,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3233_tri_Shop_Discount.sql b/static/MySQL/3233_tri_Shop_Discount.sql index dd9b504a..b0fdaa6f 100644 --- a/static/MySQL/3233_tri_Shop_Discount.sql +++ b/static/MySQL/3233_tri_Shop_Discount.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Discount @@ -79,5 +79,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql b/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql index 58357d73..b32e6a91 100644 --- a/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql +++ b/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -50,4 +50,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3300_tri_Shop_Permission_Group.sql b/static/MySQL/3300_tri_Shop_Permission_Group.sql index b74a6b75..b62b526b 100644 --- a/static/MySQL/3300_tri_Shop_Permission_Group.sql +++ b/static/MySQL/3300_tri_Shop_Permission_Group.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3303_tri_Shop_Permission.sql b/static/MySQL/3303_tri_Shop_Permission.sql index 33bd3c89..2aee47bc 100644 --- a/static/MySQL/3303_tri_Shop_Permission.sql +++ b/static/MySQL/3303_tri_Shop_Permission.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -60,4 +60,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3306_tri_Shop_Role.sql b/static/MySQL/3306_tri_Shop_Role.sql index 20402a15..15b5b37c 100644 --- a/static/MySQL/3306_tri_Shop_Role.sql +++ b/static/MySQL/3306_tri_Shop_Role.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql b/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql index c6fb897c..88462337 100644 --- a/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql +++ b/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -54,4 +54,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3312_tri_Shop_User.sql b/static/MySQL/3312_tri_Shop_User.sql index cfc67e99..f177d575 100644 --- a/static/MySQL/3312_tri_Shop_User.sql +++ b/static/MySQL/3312_tri_Shop_User.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -76,4 +76,4 @@ BEGIN WHERE NOT (OLD.is_included_VAT_default <=> NEW.is_included_VAT_default) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3315_tri_Shop_User_Role_Link.sql b/static/MySQL/3315_tri_Shop_User_Role_Link.sql index 904ee0d5..8dba1966 100644 --- a/static/MySQL/3315_tri_Shop_User_Role_Link.sql +++ b/static/MySQL/3315_tri_Shop_User_Role_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -40,4 +40,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3318_tri_Shop_User_Address.sql b/static/MySQL/3318_tri_Shop_User_Address.sql index 99420d98..0399c237 100644 --- a/static/MySQL/3318_tri_Shop_User_Address.sql +++ b/static/MySQL/3318_tri_Shop_User_Address.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -72,4 +72,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3321_tri_Shop_User_Basket.sql b/static/MySQL/3321_tri_Shop_User_Basket.sql index 7a20a6c9..b7806eab 100644 --- a/static/MySQL/3321_tri_Shop_User_Basket.sql +++ b/static/MySQL/3321_tri_Shop_User_Basket.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3324_tri_Shop_User_Order_Status.sql b/static/MySQL/3324_tri_Shop_User_Order_Status.sql index 4c40cd6a..f27d1a09 100644 --- a/static/MySQL/3324_tri_Shop_User_Order_Status.sql +++ b/static/MySQL/3324_tri_Shop_User_Order_Status.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -56,4 +56,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3400_tri_Shop_Supplier.sql b/static/MySQL/3400_tri_Shop_Supplier.sql index 229400c9..da319922 100644 --- a/static/MySQL/3400_tri_Shop_Supplier.sql +++ b/static/MySQL/3400_tri_Shop_Supplier.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -78,4 +78,4 @@ BEGIN WHERE NOT OLD.id_supplier_temp <=> NEW.id_supplier_temp ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3403_tri_Shop_Supplier_Address.sql b/static/MySQL/3403_tri_Shop_Supplier_Address.sql index 93315302..7c36b930 100644 --- a/static/MySQL/3403_tri_Shop_Supplier_Address.sql +++ b/static/MySQL/3403_tri_Shop_Supplier_Address.sql @@ -13,7 +13,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -62,4 +62,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3403_tri_Shop_Unit_Measurement.sql b/static/MySQL/3403_tri_Shop_Unit_Measurement.sql index 382523f4..b25da068 100644 --- a/static/MySQL/3403_tri_Shop_Unit_Measurement.sql +++ b/static/MySQL/3403_tri_Shop_Unit_Measurement.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -72,5 +72,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql b/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql index f9109286..7116aab2 100644 --- a/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql +++ b/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -60,5 +60,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql b/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql index bf1d7bfe..697a0d1c 100644 --- a/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql +++ b/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -74,5 +74,5 @@ BEGIN */ ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql b/static/MySQL/3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql index 61749642..65cea58d 100644 --- a/static/MySQL/3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql +++ b/static/MySQL/3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -90,4 +90,4 @@ BEGIN WHERE NOT OLD.cost_unit_local_VAT_incl <=> NEW.cost_unit_local_VAT_incl ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql b/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql index 024e7180..96035278 100644 --- a/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql +++ b/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql @@ -19,7 +19,7 @@ BEGIN SET MESSAGE_TEXT = 'Valid created by User ID must be provided.'; END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -68,4 +68,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql b/static/MySQL/3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql index b51277f9..f3ee5a5f 100644 --- a/static/MySQL/3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql +++ b/static/MySQL/3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -88,5 +88,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3421_tri_Shop_Customer.sql b/static/MySQL/3421_tri_Shop_Customer.sql index 13757770..92d9a2ec 100644 --- a/static/MySQL/3421_tri_Shop_Customer.sql +++ b/static/MySQL/3421_tri_Shop_Customer.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -68,5 +68,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql b/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql index e773a121..9c4f83bd 100644 --- a/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql +++ b/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3427_tri_Shop_Customer_Sales_Order_Product_Link.sql b/static/MySQL/3427_tri_Shop_Customer_Sales_Order_Product_Link.sql index c291aa10..f9de8566 100644 --- a/static/MySQL/3427_tri_Shop_Customer_Sales_Order_Product_Link.sql +++ b/static/MySQL/3427_tri_Shop_Customer_Sales_Order_Product_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -76,4 +76,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/6000_p_debug_timing_reporting.sql b/static/MySQL/6000_p_debug_timing_reporting.sql index 2e1b4dba..e96935ef 100644 --- a/static/MySQL/6000_p_debug_timing_reporting.sql +++ b/static/MySQL/6000_p_debug_timing_reporting.sql @@ -34,7 +34,7 @@ BEGIN ; END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_debug_timing_reporting ( diff --git a/static/MySQL/6000_p_split.sql b/static/MySQL/6000_p_split.sql index 33fbcfe7..6df8e674 100644 --- a/static/MySQL/6000_p_split.sql +++ b/static/MySQL/6000_p_split.sql @@ -84,7 +84,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6001_p_clear_split_temp.sql b/static/MySQL/6001_p_clear_split_temp.sql index ffd0ce5b..0894de9f 100644 --- a/static/MySQL/6001_p_clear_split_temp.sql +++ b/static/MySQL/6001_p_clear_split_temp.sql @@ -19,7 +19,7 @@ BEGIN COMMIT; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6001_p_validate_guid.sql b/static/MySQL/6001_p_validate_guid.sql index 3c14f63f..7a6cb0fc 100644 --- a/static/MySQL/6001_p_validate_guid.sql +++ b/static/MySQL/6001_p_validate_guid.sql @@ -35,7 +35,7 @@ BEGIN ; END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -54,6 +54,6 @@ BEGIN DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; -CALL p_validate_guid_test(); \ No newline at end of file +-- CALL p_validate_guid_test(); \ No newline at end of file diff --git a/static/MySQL/6003_p_split_key_value_pair_csv.sql b/static/MySQL/6003_p_split_key_value_pair_csv.sql index bacbb427..4699e311 100644 --- a/static/MySQL/6003_p_split_key_value_pair_csv.sql +++ b/static/MySQL/6003_p_split_key_value_pair_csv.sql @@ -90,7 +90,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql b/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql index 3ab910cf..0ad0fbb2 100644 --- a/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql +++ b/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql @@ -19,7 +19,7 @@ BEGIN COMMIT; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql b/static/MySQL/6210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql index a31b0b8d..bbf6cd10 100644 --- a/static/MySQL/6210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql +++ b/static/MySQL/6210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql @@ -203,7 +203,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; */ /* diff --git a/static/MySQL/6500_p_shop_calc_user.sql b/static/MySQL/6500_p_shop_calc_user.sql index 91f4421f..261df4f3 100644 --- a/static/MySQL/6500_p_shop_calc_user.sql +++ b/static/MySQL/6500_p_shop_calc_user.sql @@ -574,7 +574,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6501_p_shop_clear_calc_user.sql b/static/MySQL/6501_p_shop_clear_calc_user.sql index f0bf33d0..3326cd8a 100644 --- a/static/MySQL/6501_p_shop_clear_calc_user.sql +++ b/static/MySQL/6501_p_shop_clear_calc_user.sql @@ -28,7 +28,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7003_p_shop_get_many_access_level.sql b/static/MySQL/7003_p_shop_get_many_access_level.sql index b29a0438..7a4534dd 100644 --- a/static/MySQL/7003_p_shop_get_many_access_level.sql +++ b/static/MySQL/7003_p_shop_get_many_access_level.sql @@ -35,7 +35,7 @@ BEGIN ORDER BY AL.display_order ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7101_p_shop_get_many_region.sql b/static/MySQL/7101_p_shop_get_many_region.sql index 60fe2d79..fc9f6f2c 100644 --- a/static/MySQL/7101_p_shop_get_many_region.sql +++ b/static/MySQL/7101_p_shop_get_many_region.sql @@ -35,7 +35,7 @@ BEGIN ORDER BY R.display_order ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7106_p_shop_get_many_plant.sql b/static/MySQL/7106_p_shop_get_many_plant.sql index 7f6775c9..55a7a012 100644 --- a/static/MySQL/7106_p_shop_get_many_plant.sql +++ b/static/MySQL/7106_p_shop_get_many_plant.sql @@ -26,7 +26,7 @@ BEGIN OR P.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7109_p_shop_get_many_storage_location.sql b/static/MySQL/7109_p_shop_get_many_storage_location.sql index 35967c0e..8c0b38b1 100644 --- a/static/MySQL/7109_p_shop_get_many_storage_location.sql +++ b/static/MySQL/7109_p_shop_get_many_storage_location.sql @@ -27,7 +27,7 @@ BEGIN OR SL.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7116_p_shop_get_many_currency.sql b/static/MySQL/7116_p_shop_get_many_currency.sql index 29c99957..677d7d71 100644 --- a/static/MySQL/7116_p_shop_get_many_currency.sql +++ b/static/MySQL/7116_p_shop_get_many_currency.sql @@ -37,7 +37,7 @@ BEGIN ORDER BY C.display_order ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7122_p_shop_get_many_unit_measurement.sql b/static/MySQL/7122_p_shop_get_many_unit_measurement.sql index 4beb7a25..07506a45 100644 --- a/static/MySQL/7122_p_shop_get_many_unit_measurement.sql +++ b/static/MySQL/7122_p_shop_get_many_unit_measurement.sql @@ -28,7 +28,7 @@ BEGIN OR UM.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7200_p_shop_save_product_category.sql b/static/MySQL/7200_p_shop_save_product_category.sql index a14f69fa..3dbe034b 100644 --- a/static/MySQL/7200_p_shop_save_product_category.sql +++ b/static/MySQL/7200_p_shop_save_product_category.sql @@ -323,7 +323,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* select diff --git a/static/MySQL/7200_p_shop_save_product_category_test.sql b/static/MySQL/7200_p_shop_save_product_category_test.sql index 1ffa0c53..dc02a329 100644 --- a/static/MySQL/7200_p_shop_save_product_category_test.sql +++ b/static/MySQL/7200_p_shop_save_product_category_test.sql @@ -64,7 +64,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_category_test (); diff --git a/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql b/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql index f5e22447..8c04906e 100644 --- a/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql +++ b/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql @@ -31,7 +31,7 @@ BEGIN END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7203_p_shop_save_product.sql b/static/MySQL/7203_p_shop_save_product.sql index 01ff95c7..b1489e03 100644 --- a/static/MySQL/7203_p_shop_save_product.sql +++ b/static/MySQL/7203_p_shop_save_product.sql @@ -344,5 +344,5 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/7203_p_shop_save_product_test.sql b/static/MySQL/7203_p_shop_save_product_test.sql index 23302e15..e176ef9e 100644 --- a/static/MySQL/7203_p_shop_save_product_test.sql +++ b/static/MySQL/7203_p_shop_save_product_test.sql @@ -82,7 +82,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_test (); diff --git a/static/MySQL/7204_p_shop_calc_product_permutation.sql b/static/MySQL/7204_p_shop_calc_product_permutation.sql index e54a7447..9c00413c 100644 --- a/static/MySQL/7204_p_shop_calc_product_permutation.sql +++ b/static/MySQL/7204_p_shop_calc_product_permutation.sql @@ -662,7 +662,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7204_p_shop_get_many_product.sql b/static/MySQL/7204_p_shop_get_many_product.sql index 684e1da1..a4ec9d05 100644 --- a/static/MySQL/7204_p_shop_get_many_product.sql +++ b/static/MySQL/7204_p_shop_get_many_product.sql @@ -467,7 +467,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7205_p_shop_get_many_stripe_product_new.sql b/static/MySQL/7205_p_shop_get_many_stripe_product_new.sql index 2efdf058..ce89033d 100644 --- a/static/MySQL/7205_p_shop_get_many_stripe_product_new.sql +++ b/static/MySQL/7205_p_shop_get_many_stripe_product_new.sql @@ -277,7 +277,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_User; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7206_p_shop_save_product_permutation.sql b/static/MySQL/7206_p_shop_save_product_permutation.sql index 51a3e326..720006ae 100644 --- a/static/MySQL/7206_p_shop_save_product_permutation.sql +++ b/static/MySQL/7206_p_shop_save_product_permutation.sql @@ -657,7 +657,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7206_p_shop_save_product_permutation_test.sql b/static/MySQL/7206_p_shop_save_product_permutation_test.sql index cfa06e27..4d61f29e 100644 --- a/static/MySQL/7206_p_shop_save_product_permutation_test.sql +++ b/static/MySQL/7206_p_shop_save_product_permutation_test.sql @@ -145,7 +145,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; CALL partsltd_prod.p_shop_save_product_permutation_test (); diff --git a/static/MySQL/7210_p_shop_get_many_product_variation.sql b/static/MySQL/7210_p_shop_get_many_product_variation.sql index 73f75288..572e434c 100644 --- a/static/MySQL/7210_p_shop_get_many_product_variation.sql +++ b/static/MySQL/7210_p_shop_get_many_product_variation.sql @@ -351,7 +351,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7212_p_shop_save_product_variation.sql b/static/MySQL/7212_p_shop_save_product_variation.sql index 71be42eb..0d7523c9 100644 --- a/static/MySQL/7212_p_shop_save_product_variation.sql +++ b/static/MySQL/7212_p_shop_save_product_variation.sql @@ -546,6 +546,6 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/7212_p_shop_save_product_variation_test.sql b/static/MySQL/7212_p_shop_save_product_variation_test.sql index 45093ac4..baca42e2 100644 --- a/static/MySQL/7212_p_shop_save_product_variation_test.sql +++ b/static/MySQL/7212_p_shop_save_product_variation_test.sql @@ -155,7 +155,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_variation_test (); diff --git a/static/MySQL/7219_p_shop_get_many_stock_item.sql b/static/MySQL/7219_p_shop_get_many_stock_item.sql index 06bd6d32..6006fbd0 100644 --- a/static/MySQL/7219_p_shop_get_many_stock_item.sql +++ b/static/MySQL/7219_p_shop_get_many_stock_item.sql @@ -725,7 +725,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7220_p_shop_save_stock_item.sql b/static/MySQL/7220_p_shop_save_stock_item.sql index 38140a41..c62bdbb0 100644 --- a/static/MySQL/7220_p_shop_save_stock_item.sql +++ b/static/MySQL/7220_p_shop_save_stock_item.sql @@ -617,7 +617,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7220_p_shop_save_stock_item_test.sql b/static/MySQL/7220_p_shop_save_stock_item_test.sql index 99d0834d..0f03f955 100644 --- a/static/MySQL/7220_p_shop_save_stock_item_test.sql +++ b/static/MySQL/7220_p_shop_save_stock_item_test.sql @@ -89,7 +89,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; CALL partsltd_prod.p_shop_save_stock_item_test (); diff --git a/static/MySQL/7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql b/static/MySQL/7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql index 0def7981..cf12c6b5 100644 --- a/static/MySQL/7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql +++ b/static/MySQL/7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql @@ -954,7 +954,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7223_p_shop_get_many_stripe_price_new.sql b/static/MySQL/7223_p_shop_get_many_stripe_price_new.sql index c8f1b35f..d5b6b9c6 100644 --- a/static/MySQL/7223_p_shop_get_many_stripe_price_new.sql +++ b/static/MySQL/7223_p_shop_get_many_stripe_price_new.sql @@ -228,7 +228,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_User; DROP TABLE IF EXISTS tmp_Shop_Product_Currency_Link; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7312_p_shop_save_user.sql b/static/MySQL/7312_p_shop_save_user.sql index ae4e3a9c..cff747c6 100644 --- a/static/MySQL/7312_p_shop_save_user.sql +++ b/static/MySQL/7312_p_shop_save_user.sql @@ -275,5 +275,5 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/7313_p_get_many_user.sql b/static/MySQL/7313_p_get_many_user.sql index 61d10ba1..62708fa5 100644 --- a/static/MySQL/7313_p_get_many_user.sql +++ b/static/MySQL/7313_p_get_many_user.sql @@ -493,7 +493,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/7321_p_shop_save_user_basket.sql b/static/MySQL/7321_p_shop_save_user_basket.sql index 30ebf728..0b1d91f5 100644 --- a/static/MySQL/7321_p_shop_save_user_basket.sql +++ b/static/MySQL/7321_p_shop_save_user_basket.sql @@ -772,7 +772,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_User; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7400_p_shop_save_supplier.sql b/static/MySQL/7400_p_shop_save_supplier.sql index 54ef9432..6b1c0038 100644 --- a/static/MySQL/7400_p_shop_save_supplier.sql +++ b/static/MySQL/7400_p_shop_save_supplier.sql @@ -585,12 +585,13 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; -- SELECT * FROM Shop_Supplier; - +/* delete from shop_supplier_audit where id_supplier = 9; delete from shop_supplier where id_supplier = 9; delete from shop_supplier_address_audit where id_address = -4; -delete from shop_supplier_address where id_address = -4; \ No newline at end of file +delete from shop_supplier_address where id_address = -4; +*/ \ No newline at end of file diff --git a/static/MySQL/7400_p_shop_save_supplier_temp.sql b/static/MySQL/7400_p_shop_save_supplier_temp.sql index fd3d2301..cb6a6331 100644 --- a/static/MySQL/7400_p_shop_save_supplier_temp.sql +++ b/static/MySQL/7400_p_shop_save_supplier_temp.sql @@ -152,7 +152,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_supplier_test (); diff --git a/static/MySQL/7401_p_shop_get_many_supplier.sql b/static/MySQL/7401_p_shop_get_many_supplier.sql index d8c1d90f..490de0df 100644 --- a/static/MySQL/7401_p_shop_get_many_supplier.sql +++ b/static/MySQL/7401_p_shop_get_many_supplier.sql @@ -247,7 +247,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql b/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql index 70626d08..888f75a6 100644 --- a/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql +++ b/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql @@ -835,7 +835,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7403_p_shop_save_supplier_purchase_order_test.sql b/static/MySQL/7403_p_shop_save_supplier_purchase_order_test.sql index 2f49dec4..f7d73755 100644 --- a/static/MySQL/7403_p_shop_save_supplier_purchase_order_test.sql +++ b/static/MySQL/7403_p_shop_save_supplier_purchase_order_test.sql @@ -140,7 +140,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_supplier_purchase_order_test (); diff --git a/static/MySQL/7404_p_shop_get_many_supplier_purchase_order.sql b/static/MySQL/7404_p_shop_get_many_supplier_purchase_order.sql index 813896fc..a1091306 100644 --- a/static/MySQL/7404_p_shop_get_many_supplier_purchase_order.sql +++ b/static/MySQL/7404_p_shop_get_many_supplier_purchase_order.sql @@ -482,7 +482,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7415_p_shop_save_Manufacturing_purchase_order_test.sql b/static/MySQL/7415_p_shop_save_Manufacturing_purchase_order_test.sql index 447ea810..9753d993 100644 --- a/static/MySQL/7415_p_shop_save_Manufacturing_purchase_order_test.sql +++ b/static/MySQL/7415_p_shop_save_Manufacturing_purchase_order_test.sql @@ -135,7 +135,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_Manufacturing_purchase_order_test (); diff --git a/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql b/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql index 8fc74219..a196775e 100644 --- a/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql +++ b/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql @@ -956,7 +956,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7416_p_shop_get_many_manufacturing_purchase_order.sql b/static/MySQL/7416_p_shop_get_many_manufacturing_purchase_order.sql index edee8283..25051169 100644 --- a/static/MySQL/7416_p_shop_get_many_manufacturing_purchase_order.sql +++ b/static/MySQL/7416_p_shop_get_many_manufacturing_purchase_order.sql @@ -382,7 +382,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7421_p_shop_save_customer.sql b/static/MySQL/7421_p_shop_save_customer.sql index 86b46279..cc93f1f7 100644 --- a/static/MySQL/7421_p_shop_save_customer.sql +++ b/static/MySQL/7421_p_shop_save_customer.sql @@ -271,7 +271,7 @@ BEGIN -- DROP TABLE tmp_Shop_Customer; DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7422_p_shop_get_many_customer.sql b/static/MySQL/7422_p_shop_get_many_customer.sql index db41c932..17611391 100644 --- a/static/MySQL/7422_p_shop_get_many_customer.sql +++ b/static/MySQL/7422_p_shop_get_many_customer.sql @@ -253,7 +253,7 @@ BEGIN WHERE GUID = v_guid ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7424_p_shop_save_customer_sales_order.sql b/static/MySQL/7424_p_shop_save_customer_sales_order.sql index a7f8e1e7..dce5883c 100644 --- a/static/MySQL/7424_p_shop_save_customer_sales_order.sql +++ b/static/MySQL/7424_p_shop_save_customer_sales_order.sql @@ -490,7 +490,7 @@ BEGIN DROP TABLE tmp_Shop_Customer_Sales_Order_Product_Link; DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7425_p_shop_get_many_customer_sales_order.sql b/static/MySQL/7425_p_shop_get_many_customer_sales_order.sql index 18d48cb7..4c55eb7e 100644 --- a/static/MySQL/7425_p_shop_get_many_customer_sales_order.sql +++ b/static/MySQL/7425_p_shop_get_many_customer_sales_order.sql @@ -737,7 +737,7 @@ BEGIN WHERE GUID = v_guid ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/9000_populate.sql b/static/MySQL/9000_populate.sql index e5f29ab0..60e05e1b 100644 --- a/static/MySQL/9000_populate.sql +++ b/static/MySQL/9000_populate.sql @@ -1126,7 +1126,7 @@ VALUES /* -- Clean up END // -DELIMITER ;; +DELIMITER ; -- Call diff --git a/static/MySQL/deprecated/000_init_tables_authentication.sql b/static/MySQL/deprecated/000_init_tables_authentication.sql index 6aa48bcf..9acee9ce 100644 --- a/static/MySQL/deprecated/000_init_tables_authentication.sql +++ b/static/MySQL/deprecated/000_init_tables_authentication.sql @@ -54,7 +54,7 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; SELECT * FROM Shop_User_Change_Set; @@ -88,7 +88,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Access_Level_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -135,7 +135,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Access_Level ( display_order, code, name, priority @@ -179,7 +179,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Permission_Group_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -223,7 +223,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Permission_Group ( display_order, code, name @@ -273,7 +273,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Permission_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -325,7 +325,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Permission ( display_order, code, name, id_permission_group, required_access_level @@ -368,7 +368,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Role_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -412,7 +412,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Role ( display_order, @@ -468,7 +468,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Role_Permission_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -516,7 +516,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Role_Permission_Link ( id_role, id_permission, id_access_level @@ -561,7 +561,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_User_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -605,7 +605,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_User ( name, @@ -655,7 +655,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_User_Role_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -691,7 +691,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_User_Role_Link ( id_user, id_role @@ -742,7 +742,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Address_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -810,7 +810,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Address ( id_user, region, name_full, phone_number, postcode, address_line_1, address_line_2, city, county diff --git a/static/MySQL/deprecated/000_init_tables_product.sql b/static/MySQL/deprecated/000_init_tables_product.sql index 214fb6ac..31fa9bb9 100644 --- a/static/MySQL/deprecated/000_init_tables_product.sql +++ b/static/MySQL/deprecated/000_init_tables_product.sql @@ -72,7 +72,7 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; SELECT * FROM Shop_Product_Change_Set; @@ -98,7 +98,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE File_Type_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -124,7 +124,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type_Audit @@ -134,7 +134,7 @@ BEGIN SET NEW.updated_last_on = NOW(); SET NEW.updated_last_by = CURRENT_USER(); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type @@ -160,7 +160,7 @@ BEGIN WHERE NOT OLD.extension <=> NEW.extension ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO File_Type ( code, name, extension @@ -197,7 +197,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_General_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -232,7 +232,7 @@ BEGIN WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_General ( quantity_max @@ -270,7 +270,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Category_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -321,7 +321,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product_Category ( display_order, @@ -363,7 +363,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Interval_Recurrence_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -406,7 +406,7 @@ BEGIN WHERE NOT OLD.name_plural <=> NEW.name_plural ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Interval_Recurrence ( code, name, name_plural @@ -464,7 +464,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -559,7 +559,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product ( display_order, @@ -613,7 +613,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Variation_Type_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -664,7 +664,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Variation_Type ( display_order, code, name, name_plural @@ -706,7 +706,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Variation_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -753,7 +753,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Variation ( display_order, id_type, code, name @@ -802,7 +802,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Variation_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -850,7 +850,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product_Variation_Link ( display_order, id_product, id_variation @@ -888,7 +888,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Image_Type_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -939,7 +939,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Image_Type ( display_order, code, name, name_plural @@ -985,7 +985,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Image_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1035,7 +1035,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Image ( display_order, id_product, id_type, url @@ -1083,7 +1083,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Image_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1129,7 +1129,7 @@ BEGIN ) ); END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product_Image_Link ( id_product, id_image @@ -1170,7 +1170,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Delivery_Option_Type_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1233,7 +1233,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Delivery_Option_Type ( display_order, code, name, latency_delivery_min, latency_delivery_max, quantity_min, quantity_max @@ -1283,7 +1283,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Delivery_Option_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1331,7 +1331,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Delivery_Option ( id_product, id_delivery_type, price_GBP @@ -1368,7 +1368,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Delivery_Region_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1415,7 +1415,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Delivery_Region ( display_order, code, name @@ -1463,7 +1463,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Delivery_Region_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1507,7 +1507,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product_Delivery_Region_Link ( id_product, id_region diff --git a/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql b/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql index 32f479ae..92e65558 100644 --- a/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql +++ b/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql @@ -16,7 +16,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -53,4 +53,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/313.1_tri_Shop_Product_Variation_Type_Link.sql b/static/MySQL/deprecated/313.1_tri_Shop_Product_Variation_Type_Link.sql index b5c14ee5..b035334c 100644 --- a/static/MySQL/deprecated/313.1_tri_Shop_Product_Variation_Type_Link.sql +++ b/static/MySQL/deprecated/313.1_tri_Shop_Product_Variation_Type_Link.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -58,4 +58,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql b/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql index 50dbcb62..434dbde0 100644 --- a/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql +++ b/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -58,4 +58,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/322_tri_Shop_Price.sql b/static/MySQL/deprecated/322_tri_Shop_Price.sql index 277ca4e6..9180ab20 100644 --- a/static/MySQL/deprecated/322_tri_Shop_Price.sql +++ b/static/MySQL/deprecated/322_tri_Shop_Price.sql @@ -29,7 +29,7 @@ BEGIN ); */ END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -90,4 +90,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/deprecated/328_tri_Shop_Product_Delivery_Region_Link.sql b/static/MySQL/deprecated/328_tri_Shop_Product_Delivery_Region_Link.sql index c14e165b..45647958 100644 --- a/static/MySQL/deprecated/328_tri_Shop_Product_Delivery_Region_Link.sql +++ b/static/MySQL/deprecated/328_tri_Shop_Product_Delivery_Region_Link.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -54,4 +54,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/371_tri_Shop_User_Order.sql b/static/MySQL/deprecated/371_tri_Shop_User_Order.sql index cbfc2987..0fcda7c1 100644 --- a/static/MySQL/deprecated/371_tri_Shop_User_Order.sql +++ b/static/MySQL/deprecated/371_tri_Shop_User_Order.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -64,4 +64,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/373_tri_Shop_User_Order_Product_Link.sql b/static/MySQL/deprecated/373_tri_Shop_User_Order_Product_Link.sql index 16a324fd..d9229e5a 100644 --- a/static/MySQL/deprecated/373_tri_Shop_User_Order_Product_Link.sql +++ b/static/MySQL/deprecated/373_tri_Shop_User_Order_Product_Link.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/7000_p_shop_get_many_role_permission.sql b/static/MySQL/deprecated/7000_p_shop_get_many_role_permission.sql index 19ae066a..0352273e 100644 --- a/static/MySQL/deprecated/7000_p_shop_get_many_role_permission.sql +++ b/static/MySQL/deprecated/7000_p_shop_get_many_role_permission.sql @@ -127,5 +127,5 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_Image; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/deprecated/7000_p_shop_get_many_user_order.sql b/static/MySQL/deprecated/7000_p_shop_get_many_user_order.sql index 207846c1..33c37952 100644 --- a/static/MySQL/deprecated/7000_p_shop_get_many_user_order.sql +++ b/static/MySQL/deprecated/7000_p_shop_get_many_user_order.sql @@ -255,7 +255,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_User; DROP TABLE IF EXISTS tmp_Shop_Order; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/deprecated/706_p_shop_get_product.sql b/static/MySQL/deprecated/706_p_shop_get_product.sql index 6f7c0c86..fc8526c7 100644 --- a/static/MySQL/deprecated/706_p_shop_get_product.sql +++ b/static/MySQL/deprecated/706_p_shop_get_product.sql @@ -633,7 +633,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Variation; DROP TABLE IF EXISTS tmp_Shop_Product; END // -DELIMITER ;; +DELIMITER ;