From 2364931054f3734a7af0c72a5199a2159a13479e Mon Sep 17 00:00:00 2001 From: Teddy Middleton-Smith Date: Mon, 23 Dec 2024 23:10:16 +0000 Subject: [PATCH] Fix (MySQL): Update for MariaDB v10.3 to match ERPNext installation on Oracle VPS. --- .../store/manufacturing_purchase_order.py | 2 +- business_objects/store/product_permutation.py | 12 +- models/model_view_store.py | 2 +- static/MySQL/0000_combined.sql | 2122 ++++++++--------- static/MySQL/0001_destroy.sql | 4 +- .../1000_tbl_Shop_Product_Change_Set.sql | 2 +- static/MySQL/1000_tbl_Split_Temp.sql | 2 +- .../MySQL/1001_tbl_Shop_User_Change_Set.sql | 2 +- ...1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql | 2 +- ...l_Shop_Sales_And_Purchasing_Change_Set.sql | 2 +- static/MySQL/1003_tbl_Shop_Access_Level.sql | 2 +- .../1004_tbl_Shop_Access_Level_Audit.sql | 2 +- static/MySQL/1005_tbl_Msg_Error_Type.sql | 2 +- static/MySQL/1010_tbl_File_Type.sql | 2 +- static/MySQL/1011_tbl_File_Type_Audit.sql | 2 +- static/MySQL/1012_tbl_Shop_General.sql | 2 +- static/MySQL/1013_tbl_Shop_General_Audit.sql | 2 +- static/MySQL/1014_tbl_Shop_Image_Type.sql | 2 +- .../MySQL/1015_tbl_Shop_Image_Type_Audit.sql | 2 +- static/MySQL/1100_tbl_Shop_Region.sql | 2 +- static/MySQL/1101_tbl_Shop_Region_Audit.sql | 2 +- static/MySQL/1102_tbl_Shop_Region_Temp.sql | 2 +- static/MySQL/1103_tbl_Shop_Region_Branch.sql | 2 +- .../1104_tbl_Shop_Region_Branch_Audit.sql | 2 +- .../1105_tbl_Shop_Region_Branch_Temp.sql | 2 +- static/MySQL/1106_tbl_Shop_Address.sql | 2 +- static/MySQL/1106_tbl_Shop_Plant.sql | 2 +- static/MySQL/1107_tbl_Shop_Address_Audit.sql | 2 +- static/MySQL/1107_tbl_Shop_Plant_Audit.sql | 2 +- static/MySQL/1108_tbl_Shop_Plant_Temp.sql | 2 +- .../MySQL/1109_tbl_Shop_Storage_Location.sql | 2 +- .../1110_tbl_Shop_Storage_Location_Audit.sql | 2 +- .../1111_tbl_Shop_Storage_Location_Temp.sql | 2 +- .../1112_tbl_Shop_Storage_Location_Branch.sql | 2 +- ...tbl_Shop_Storage_Location_Branch_Audit.sql | 2 +- ..._tbl_Shop_Storage_Location_Branch_Temp.sql | 2 +- static/MySQL/1115_tbl_Shop_Currency.sql | 2 +- static/MySQL/1116_tbl_Shop_Currency_Audit.sql | 2 +- static/MySQL/1117_tbl_Shop_Currency_Temp.sql | 2 +- .../MySQL/1118_tbl_Shop_Tax_Or_Surcharge.sql | 2 +- .../1119_tbl_Shop_Tax_Or_Surcharge_Audit.sql | 2 +- .../1120_tbl_Shop_Tax_Or_Surcharge_Temp.sql | 2 +- .../MySQL/1121_tbl_Shop_Unit_Measurement.sql | 2 +- .../1122_tbl_Shop_Unit_Measurement_Audit.sql | 2 +- ...4_tbl_Shop_Unit_Measurement_Conversion.sql | 2 +- ...Shop_Unit_Measurement_Conversion_Audit.sql | 2 +- .../MySQL/1200_tbl_Shop_Product_Category.sql | 2 +- .../1201_tbl_Shop_Product_Category_Audit.sql | 2 +- .../1202_tbl_Shop_Product_Category_Temp.sql | 2 +- static/MySQL/1203_tbl_Shop_Product.sql | 8 +- static/MySQL/1204_tbl_Shop_Product_Audit.sql | 2 +- static/MySQL/1205_tbl_Shop_Product_Temp.sql | 2 +- .../1206_tbl_Shop_Product_Permutation.sql | 2 +- ...207_tbl_Shop_Product_Permutation_Audit.sql | 2 +- ...1208_tbl_Shop_Product_Permutation_Temp.sql | 2 +- static/MySQL/1209_tbl_Shop_Variation_Type.sql | 2 +- .../1210_tbl_Shop_Variation_Type_Audit.sql | 2 +- .../1211_tbl_Shop_Variation_Type_Temp.sql | 2 +- static/MySQL/1212_tbl_Shop_Variation.sql | 2 +- .../MySQL/1213_tbl_Shop_Variation_Audit.sql | 2 +- static/MySQL/1214_tbl_Shop_Variation_Temp.sql | 2 +- ...hop_Product_Permutation_Variation_Link.sql | 2 +- ...oduct_Permutation_Variation_Link_Audit.sql | 2 +- ...roduct_Permutation_Variation_Link_Temp.sql | 2 +- static/MySQL/1221_tbl_Shop_Product_Price.sql | 2 +- .../1222_tbl_Shop_Product_Price_Audit.sql | 2 +- .../1223_tbl_Shop_Product_Price_Temp.sql | 2 +- static/MySQL/1224_tbl_Shop_Product_Image.sql | 2 +- .../1225_tbl_Shop_Product_Image_Audit.sql | 2 +- .../MySQL/1227_tbl_Shop_Delivery_Option.sql | 2 +- .../1228_tbl_Shop_Delivery_Option_Audit.sql | 2 +- ...oduct_Permutation_Delivery_Option_Link.sql | 2 +- ...Permutation_Delivery_Option_Link_Audit.sql | 2 +- static/MySQL/1233_tbl_Shop_Discount.sql | 2 +- static/MySQL/1234_tbl_Shop_Discount_Audit.sql | 2 +- ...tbl_Shop_Discount_Region_Currency_Link.sql | 2 +- ...op_Discount_Region_Currency_Link_Audit.sql | 2 +- .../MySQL/1300_tbl_Shop_Permission_Group.sql | 2 +- .../1301_tbl_Shop_Permission_Group_Audit.sql | 2 +- static/MySQL/1303_tbl_Shop_Permission.sql | 2 +- .../MySQL/1304_tbl_Shop_Permission_Audit.sql | 2 +- static/MySQL/1306_tbl_Shop_Role.sql | 2 +- static/MySQL/1307_tbl_Shop_Role_Audit.sql | 2 +- .../1309_tbl_Shop_Role_Permission_Link.sql | 2 +- ...10_tbl_Shop_Role_Permission_Link_Audit.sql | 2 +- static/MySQL/1312_tbl_Shop_User.sql | 2 +- static/MySQL/1313_tbl_Shop_User_Audit.sql | 2 +- static/MySQL/1314_tbl_Shop_User_Temp.sql | 2 +- static/MySQL/1315_tbl_Shop_User_Role_Link.sql | 2 +- .../1316_tbl_Shop_User_Role_Link_Audit.sql | 2 +- static/MySQL/1318_tbl_Shop_User_Address.sql | 2 +- .../1319_tbl_Shop_User_Address_Audit.sql | 2 +- static/MySQL/1321_tbl_Shop_User_Basket.sql | 2 +- .../MySQL/1322_tbl_Shop_User_Basket_Audit.sql | 2 +- static/MySQL/1397_tbl_Shop_Order_Status.sql | 2 +- .../1398_tbl_Shop_Order_Status_Audit.sql | 2 +- static/MySQL/1400_tbl_Shop_Supplier.sql | 2 +- static/MySQL/1401_tbl_Shop_Supplier_Audit.sql | 2 +- static/MySQL/1402_tbl_Shop_Supplier_Temp.sql | 2 +- .../MySQL/1403_tbl_Shop_Supplier_Address.sql | 2 +- .../1404_tbl_Shop_Supplier_Address_Audit.sql | 2 +- .../1405_tbl_Shop_Supplier_Address_Temp.sql | 2 +- .../1409_tbl_Shop_Supplier_Purchase_Order.sql | 2 +- ...tbl_Shop_Supplier_Purchase_Order_Audit.sql | 2 +- ..._tbl_Shop_Supplier_Purchase_Order_Temp.sql | 2 +- ..._tbl_Shop_Manufacturing_Purchase_Order.sql | 2 +- ...hop_Manufacturing_Purchase_Order_Audit.sql | 2 +- ...Shop_Manufacturing_Purchase_Order_Temp.sql | 2 +- static/MySQL/1415_tbl_Shop_Customer.sql | 2 +- static/MySQL/1416_tbl_Shop_Customer_Audit.sql | 2 +- .../1418_tbl_Shop_Customer_Sales_Order.sql | 2 +- ...19_tbl_Shop_Customer_Sales_Order_Audit.sql | 2 +- static/MySQL/1421_tbl_Shop_Stock_Item.sql | 2 +- .../MySQL/1422_tbl_Shop_Stock_Item_Audit.sql | 2 +- .../MySQL/1423_tbl_Shop_Stock_Item_Temp.sql | 2 +- ...p_Supplier_Purchase_Order_Product_Link.sql | 2 +- ...lier_Purchase_Order_Product_Link_Audit.sql | 2 +- ...plier_Purchase_Order_Product_Link_Temp.sql | 2 +- ...ufacturing_Purchase_Order_Product_Link.sql | 2 +- ...ring_Purchase_Order_Product_Link_Audit.sql | 2 +- ...uring_Purchase_Order_Product_Link_Temp.sql | 2 +- ...Shop_Customer_Sales_Order_Product_Link.sql | 2 +- ...ustomer_Sales_Order_Product_Link_Audit.sql | 2 +- ...Customer_Sales_Order_Product_Link_Temp.sql | 2 +- static/MySQL/1500_tbl_Shop_Calc_User_Temp.sql | 2 +- static/MySQL/3000_tri_Shop_Access_Level.sql | 12 +- .../3000_tri_Shop_Product_Change_Set.sql | 2 +- .../MySQL/3001_tri_Shop_User_Change_Set.sql | 2 +- ...i_Shop_Sales_And_Purchasing_Change_Set.sql | 2 +- static/MySQL/3010_tri_File_Type.sql | 8 +- static/MySQL/3011_tri_File_Type_Audit.sql | 2 +- static/MySQL/3012_tri_Shop_General.sql | 4 +- static/MySQL/3014_tri_Shop_Image_Type.sql | 14 +- static/MySQL/3100_tri_Shop_Region.sql | 10 +- static/MySQL/3103_tri_Shop_Region_Branch.sql | 8 +- static/MySQL/3106_tri_Shop_Address.sql | 16 +- .../MySQL/3109_tri_Shop_Storage_Location.sql | 10 +- static/MySQL/3115_tri_Shop_Currency.sql | 14 +- .../MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql | 20 +- static/MySQL/3200_tri_Shop_Category.sql | 14 +- static/MySQL/3203_tri_Shop_Product.sql | 42 +- .../3206_tri_Shop_Product_Permutation.sql | 52 +- static/MySQL/3209_tri_Shop_Variation_Type.sql | 12 +- static/MySQL/3212_tri_Shop_Variation.sql | 14 +- ...hop_Product_Permutation_Variation_Link.sql | 10 +- static/MySQL/3218_tri_Shop_Stock_Item.sql | 28 +- static/MySQL/3221_tri_Shop_Product_Price.sql | 16 +- static/MySQL/3224_tri_Shop_Product_Image.sql | 16 +- .../MySQL/3227_tri_Shop_Delivery_Option.sql | 18 +- ...oduct_Permutation_Delivery_Option_Link.sql | 20 +- static/MySQL/3233_tri_Shop_Discount.sql | 24 +- ...tri_Shop_Discount_Region_Currency_Link.sql | 8 +- .../MySQL/3300_tri_Shop_Permission_Group.sql | 10 +- static/MySQL/3303_tri_Shop_Permission.sql | 14 +- static/MySQL/3306_tri_Shop_Role.sql | 10 +- .../3309_tri_Shop_Role_Permission_Link.sql | 10 +- static/MySQL/3312_tri_Shop_User.sql | 22 +- static/MySQL/3315_tri_Shop_User_Role_Link.sql | 4 +- static/MySQL/3318_tri_Shop_User_Address.sql | 20 +- static/MySQL/3321_tri_Shop_User_Basket.sql | 10 +- .../MySQL/3324_tri_Shop_User_Order_Status.sql | 12 +- static/MySQL/3400_tri_Shop_Supplier.sql | 22 +- .../MySQL/3403_tri_Shop_Supplier_Address.sql | 16 +- .../MySQL/3403_tri_Shop_Unit_Measurement.sql | 20 +- ...ri_Shop_Unit_Of_Measurement_Conversion.sql | 14 +- .../3409_tri_Shop_Supplier_Purchase_Order.sql | 20 +- ...p_Supplier_Purchase_Order_Product_Link.sql | 28 +- ..._tri_Shop_Manufacturing_Purchase_Order.sql | 16 +- ...ufacturing_Purchase_Order_Product_Link.sql | 28 +- static/MySQL/3421_tri_Shop_Customer.sql | 18 +- .../3424_tri_Shop_Customer_Sales_Order.sql | 10 +- ...Shop_Customer_Sales_Order_Product_Link.sql | 22 +- static/MySQL/6000_p_split.sql | 6 +- .../MySQL/6003_p_split_key_value_pair_csv.sql | 2 +- ...ct_permutation_from_variation_csv_list.sql | 2 +- static/MySQL/6500_p_shop_calc_user.sql | 22 +- static/MySQL/6501_p_shop_clear_calc_user.sql | 2 +- .../7003_p_shop_get_many_access_level.sql | 4 +- static/MySQL/7101_p_shop_get_many_region.sql | 4 +- static/MySQL/7106_p_shop_get_many_plant.sql | 2 +- .../7109_p_shop_get_many_storage_location.sql | 2 +- .../MySQL/7116_p_shop_get_many_currency.sql | 4 +- .../7122_p_shop_get_many_unit_measurement.sql | 2 +- .../7200_p_shop_save_product_category.sql | 2 +- ..._p_shop_clear_calc_product_permutation.sql | 2 +- .../7204_p_shop_calc_product_permutation.sql | 34 +- static/MySQL/7204_p_shop_get_many_product.sql | 54 +- ...205_p_shop_get_many_stripe_product_new.sql | 36 +- .../7206_p_shop_save_product_permutation.sql | 8 +- ...7210_p_shop_get_many_product_variation.sql | 32 +- .../7212_p_shop_save_product_variation.sql | 8 +- .../MySQL/7219_p_shop_get_many_stock_item.sql | 64 +- static/MySQL/7220_p_shop_save_stock_item.sql | 12 +- ...price_and_discount_and_delivery_option.sql | 44 +- .../7223_p_shop_get_many_stripe_price_new.sql | 26 +- static/MySQL/7312_p_shop_save_user.sql | 2 +- static/MySQL/7313_p_get_many_user.sql | 16 +- static/MySQL/7321_p_shop_save_user_basket.sql | 140 +- static/MySQL/7400_p_shop_save_supplier.sql | 18 +- .../MySQL/7401_p_shop_get_many_supplier.sql | 16 +- ...03_p_shop_save_supplier_purchase_order.sql | 50 +- ..._shop_get_many_supplier_purchase_order.sql | 30 +- ...shop_save_manufacturing_purchase_order.sql | 52 +- ..._get_many_manufacturing_purchase_order.sql | 24 +- static/MySQL/7421_p_shop_save_customer.sql | 26 +- .../MySQL/7422_p_shop_get_many_customer.sql | 40 +- .../7424_p_shop_save_customer_sales_order.sql | 58 +- ...5_p_shop_get_many_customer_sales_order.sql | 84 +- static/MySQL/9000_populate.sql | 118 +- static/MySQL/9001_view.sql | 100 +- .../000_init_tables_authentication.sql | 88 +- .../deprecated/000_init_tables_product.sql | 182 +- .../108_tbl_Shop_Recurrence_Interval.sql | 2 +- ...109_tbl_Shop_Recurrence_Interval_Audit.sql | 2 +- ...1_tbl_Shop_Product_Variation_Type_Link.sql | 2 +- ...Shop_Product_Variation_Type_Link_Audit.sql | 2 +- .../116_tbl_Shop_Product_Variation_Link.sql | 2 +- ..._tbl_Shop_Product_Variation_Link_Audit.sql | 2 +- ..._tbl_Shop_Product_Delivery_Region_Link.sql | 2 +- ...hop_Product_Delivery_Region_Link_Audit.sql | 2 +- .../deprecated/170_ish_tbl_ERP_Order.sql | 2 +- .../deprecated/171_tbl_Shop_User_Order.sql | 2 +- .../172_tbl_Shop_User_Order_Audit.sql | 2 +- .../173_tbl_Shop_User_Order_Product_Link.sql | 2 +- ...tbl_Shop_User_Order_Product_Link_Audit.sql | 2 +- .../308_tri_Shop_Recurrence_Interval.sql | 10 +- ...1_tri_Shop_Product_Variation_Type_Link.sql | 10 +- .../316_tri_Shop_Product_Variation_Link.sql | 10 +- .../MySQL/deprecated/322_tri_Shop_Price.sql | 16 +- ..._tri_Shop_Product_Delivery_Region_Link.sql | 8 +- .../deprecated/371_tri_Shop_User_Order.sql | 12 +- .../373_tri_Shop_User_Order_Product_Link.sql | 8 +- .../7000_p_shop_get_many_user_order.sql | 36 +- .../deprecated/706_p_shop_get_product.sql | 78 +- static/MySQL/deprecated/dump.sql | 662 ++--- static/MySQL/deprecated/dump2.sql | 662 ++--- templates/js/sections/store.js | 2 +- 237 files changed, 3035 insertions(+), 3035 deletions(-) diff --git a/business_objects/store/manufacturing_purchase_order.py b/business_objects/store/manufacturing_purchase_order.py index 67896d15..8e1a21e5 100644 --- a/business_objects/store/manufacturing_purchase_order.py +++ b/business_objects/store/manufacturing_purchase_order.py @@ -125,7 +125,7 @@ class Manufacturing_Purchase_Order_Product_Link(db.Model, Store_Base): id_permutation = db.Column(db.Integer) id_unit_quantity = db.Column(db.Integer) name_permutation = db.Column(db.String(255)) - csv_id_pairs_variation = db.Column(db.String) + csv_id_pairs_variation = db.Column(db.String(4000)) quantity_used = db.Column(db.Float) quantity_produced = db.Column(db.Float) id_unit_latency_manufacture = db.Column(db.Integer) diff --git a/business_objects/store/product_permutation.py b/business_objects/store/product_permutation.py index a15c4544..2aa0de6a 100644 --- a/business_objects/store/product_permutation.py +++ b/business_objects/store/product_permutation.py @@ -59,7 +59,7 @@ class Product_Permutation(db.Model, Store_Base): FLAG_DOES_EXPIRE_FASTER_ONCE_UNSEALED = 'does_expire_faster_once_unsealed' FLAG_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED = f'{Unit_Measurement.ATTR_ID_UNIT_MEASUREMENT}_interval_expiration_unsealed' FLAG_SYMBOL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED = f'{Unit_Measurement.FLAG_SYMBOL}_interval_expiration_unsealed' - FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED = f'{Unit_Measurement.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX}_interval_expiration_unsealed' + FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_INTERVAL_EXPIRATION_UNSEALED = f'{Unit_Measurement.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX}_interval_expiration_unsealed' FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED = f'{Unit_Measurement.FLAG_NAME_SINGULAR}_interval_expiration_unsealed' FLAG_NAME_PLURAL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED = f'{Unit_Measurement.FLAG_NAME_PLURAL}_interval_expiration_unsealed' FLAG_COUNT_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED = 'count_interval_expiration_unsealed' @@ -103,7 +103,7 @@ class Product_Permutation(db.Model, Store_Base): does_expire_faster_once_unsealed = db.Column(db.Boolean) id_unit_measurement_interval_expiration_unsealed = db.Column(db.Integer) symbol_unit_measurement_interval_expiration_unsealed = db.Column(db.String(50)) - symbol_is_suffix_not_prefix_unit_measurement_interval_expiration_unsealed = db.Column(db.Boolean) + symbol_is_suffix_not_prefix_unit_interval_expiration_unsealed = db.Column(db.Boolean) name_singular_unit_measurement_interval_expiration_unsealed = db.Column(db.String(255)) name_plural_unit_measurement_interval_expiration_unsealed = db.Column(db.String(256)) count_interval_expiration_unsealed = db.Column(db.Integer) @@ -174,7 +174,7 @@ class Product_Permutation(db.Model, Store_Base): permutation.does_expire_faster_once_unsealed = av.input_bool(query_row[28], "does_expire_faster_once_unsealed", _m, v_arg_type=v_arg_type) permutation.id_unit_measurement_interval_expiration_unsealed = query_row[29] permutation.symbol_unit_measurement_interval_expiration_unsealed = query_row[30] - permutation.symbol_is_suffix_not_prefix_unit_measurement_interval_expiration_unsealed = av.input_bool(query_row[31], cls.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED, _m, v_arg_type=v_arg_type) + permutation.symbol_is_suffix_not_prefix_unit_interval_expiration_unsealed = av.input_bool(query_row[31], cls.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_INTERVAL_EXPIRATION_UNSEALED, _m, v_arg_type=v_arg_type) permutation.name_singular_unit_measurement_interval_expiration_unsealed = query_row[32] permutation.name_plural_unit_measurement_interval_expiration_unsealed = query_row[33] permutation.count_interval_expiration_unsealed = query_row[34] @@ -248,7 +248,7 @@ class Product_Permutation(db.Model, Store_Base): permutation.does_expire_faster_once_unsealed = 1 if av.input_bool(json[cls.FLAG_DOES_EXPIRE_FASTER_ONCE_UNSEALED], cls.FLAG_DOES_EXPIRE_FASTER_ONCE_UNSEALED, _m) else 0 permutation.id_unit_measurement_interval_expiration_unsealed = json[cls.FLAG_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED] if json[cls.FLAG_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED] != '' else None permutation.symbol_unit_measurement_interval_expiration_unsealed = json.get(cls.FLAG_SYMBOL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED) - permutation.symbol_is_suffix_not_prefix_unit_measurement_interval_expiration_unsealed = json.get(cls.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED) + permutation.symbol_is_suffix_not_prefix_unit_interval_expiration_unsealed = json.get(cls.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_INTERVAL_EXPIRATION_UNSEALED) permutation.name_singular_unit_measurement_interval_expiration_unsealed = json.get(cls.FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED) permutation.name_plural_unit_measurement_interval_expiration_unsealed = json.get(cls.FLAG_NAME_PLURAL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED) permutation.count_interval_expiration_unsealed = json[cls.FLAG_COUNT_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED] if json[cls.FLAG_COUNT_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED] != '' else None @@ -295,7 +295,7 @@ class Product_Permutation(db.Model, Store_Base): self.FLAG_DOES_EXPIRE_FASTER_ONCE_UNSEALED: self.does_expire_faster_once_unsealed, self.FLAG_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: self.id_unit_measurement_interval_expiration_unsealed, self.FLAG_SYMBOL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: self.symbol_unit_measurement_interval_expiration_unsealed, - self.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: self.symbol_is_suffix_not_prefix_unit_measurement_interval_expiration_unsealed, + self.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_INTERVAL_EXPIRATION_UNSEALED: self.symbol_is_suffix_not_prefix_unit_interval_expiration_unsealed, self.FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: self.name_singular_unit_measurement_interval_expiration_unsealed, self.FLAG_NAME_PLURAL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: self.name_plural_unit_measurement_interval_expiration_unsealed, self.FLAG_COUNT_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: self.count_interval_expiration_unsealed, @@ -380,7 +380,7 @@ class Product_Permutation(db.Model, Store_Base): does_expire_faster_once_unsealed: {self.does_expire_faster_once_unsealed} id_unit_measurement_interval_expiration_unsealed: {self.id_unit_measurement_interval_expiration_unsealed} symbol_unit_measurement_interval_expiration_unsealed: {self.symbol_unit_measurement_interval_expiration_unsealed} - symbol_is_suffix_not_prefix_unit_measurement_interval_expiration_unsealed: {self.symbol_is_suffix_not_prefix_unit_measurement_interval_expiration_unsealed} + symbol_is_suffix_not_prefix_unit_interval_expiration_unsealed: {self.symbol_is_suffix_not_prefix_unit_interval_expiration_unsealed} name_singular_unit_measurement_interval_expiration_unsealed: {self.name_singular_unit_measurement_interval_expiration_unsealed} name_plural_unit_measurement_interval_expiration_unsealed: {self.name_plural_unit_measurement_interval_expiration_unsealed} count_interval_expiration_unsealed: {self.count_interval_expiration_unsealed} diff --git a/models/model_view_store.py b/models/model_view_store.py index 81ddc2e9..d6806940 100644 --- a/models/model_view_store.py +++ b/models/model_view_store.py @@ -133,7 +133,7 @@ class Model_View_Store(Model_View_Base): FLAG_SUPPLIER_ADDRESS: ClassVar[str] = Store_Base.FLAG_SUPPLIER_ADDRESS FLAG_SUPPLIER_PURCHASE_ORDER: ClassVar[str] = Store_Base.FLAG_SUPPLIER_PURCHASE_ORDER FLAG_SYMBOL_CURRENCY_COST: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_CURRENCY_COST - FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED + FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_INTERVAL_EXPIRATION_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_INTERVAL_EXPIRATION_UNSEALED FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_RECURRENCE: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_RECURRENCE FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_QUANTITY: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_QUANTITY FLAG_SYMBOL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED diff --git a/static/MySQL/0000_combined.sql b/static/MySQL/0000_combined.sql index ec48f6e0..ace1c9c9 100644 --- a/static/MySQL/0000_combined.sql +++ b/static/MySQL/0000_combined.sql @@ -4,7 +4,7 @@ USE partsltd_prod; -# Drop dependencies +-- Drop dependencies DROP TABLE IF EXISTS tmp_Shop_Calc_User; DROP TABLE IF EXISTS tmp_Product_Calc_User; DROP TABLE IF EXISTS tmp_Product_p_Shop_User_Eval; @@ -56,7 +56,7 @@ DROP TABLE IF EXISTS tmp_Shop_Customer_Sale_Order; DROP TABLE IF EXISTS tmp_Get_Variation_From_Csv_Variations; -# Delete old tables +-- Delete old tables DROP TABLE IF EXISTS Split_Temp; DROP TABLE IF EXISTS Split_Key_Value_Pair_Csv_Temp; DROP TABLE IF EXISTS Split_Key_Value_Pair_Temp; @@ -340,7 +340,7 @@ DROP PROCEDURE IF EXISTS p_shop_get_many_customer_sales_order; -- File: 1000_tbl_Shop_Product_Change_Set.sql -# Product Change Sets +-- Product Change Sets @@ -355,7 +355,7 @@ CREATE TABLE Shop_Product_Change_Set ( -- File: 1000_tbl_Split_Temp.sql -# Split Staging +-- Split Staging -- USE partsltd_prod; -- DROP TABLE IF EXISTS Split_Temp; @@ -370,7 +370,7 @@ CREATE TABLE Split_Temp ( -- File: 1001_tbl_Shop_User_Change_Set.sql -# User Change Sets +-- User Change Sets @@ -385,7 +385,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Change_Set ( -- File: 1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql -# Split Key Value Pair CSV Staging +-- Split Key Value Pair CSV Staging -- USE partsltd_prod; -- DROP TABLE IF EXISTS Split_Temp; @@ -401,7 +401,7 @@ CREATE TABLE Split_Key_Value_Pair_Csv_Temp ( -- File: 1002_tbl_Shop_Sales_And_Purchasing_Change_Set.sql -# Sales And Purchasing Change Sets +-- Sales And Purchasing Change Sets @@ -416,7 +416,7 @@ CREATE TABLE Shop_Sales_And_Purchasing_Change_Set ( -- File: 1003_tbl_Shop_Access_Level.sql -# Access Levels +-- Access Levels @@ -442,7 +442,7 @@ CREATE TABLE IF NOT EXISTS Shop_Access_Level ( -- File: 1004_tbl_Shop_Access_Level_Audit.sql -# Access Level Audits +-- Access Level Audits @@ -466,7 +466,7 @@ CREATE TABLE IF NOT EXISTS Shop_Access_Level_Audit ( -- File: 1005_tbl_Msg_Error_Type.sql -# Error Message Type +-- Error Message Type @@ -482,7 +482,7 @@ CREATE TABLE IF NOT EXISTS Shop_Msg_Error_Type ( -- File: 1010_tbl_File_Type.sql -# File Types +-- File Types @@ -502,7 +502,7 @@ CREATE TABLE IF NOT EXISTS File_Type ( -- File: 1011_tbl_File_Type_Audit.sql -# File Type Audit +-- File Type Audit @@ -526,7 +526,7 @@ CREATE TABLE IF NOT EXISTS File_Type_Audit ( -- File: 1012_tbl_Shop_General.sql -# Generic / shared properties +-- Generic / shared properties @@ -545,7 +545,7 @@ CREATE TABLE IF NOT EXISTS Shop_General ( -- File: 1013_tbl_Shop_General_Audit.sql -# Shop General Audits +-- Shop General Audits @@ -569,7 +569,7 @@ CREATE TABLE IF NOT EXISTS Shop_General_Audit ( -- File: 1014_tbl_Shop_Image_Type.sql -# Image Types +-- Image Types @@ -599,7 +599,7 @@ CREATE TABLE IF NOT EXISTS Shop_Image_Type ( -- File: 1015_tbl_Shop_Image_Type_Audit.sql -# Image Type Audits +-- Image Type Audits @@ -623,7 +623,7 @@ CREATE TABLE IF NOT EXISTS Shop_Image_Type_Audit ( -- File: 1100_tbl_Shop_Region.sql -# Regions +-- Regions SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Region'; @@ -643,7 +643,7 @@ CREATE TABLE IF NOT EXISTS Shop_Region ( -- File: 1101_tbl_Shop_Region_Audit.sql -# Region Audits +-- Region Audits @@ -667,7 +667,7 @@ CREATE TABLE IF NOT EXISTS Shop_Region_Audit ( -- File: 1102_tbl_Shop_Region_Temp.sql -# Region Temp +-- Region Temp @@ -689,7 +689,7 @@ CREATE TABLE IF NOT EXISTS Shop_Region_Temp ( -- File: 1103_tbl_Shop_Region_Branch.sql -# Region Branchs +-- Region Branchs @@ -720,7 +720,7 @@ CREATE TABLE IF NOT EXISTS Shop_Region_Branch ( -- File: 1104_tbl_Shop_Region_Branch_Audit.sql -# Region Audits +-- Region Audits @@ -744,7 +744,7 @@ CREATE TABLE IF NOT EXISTS Shop_Region_Branch_Audit ( -- File: 1105_tbl_Shop_Region_Branch_Temp.sql -# Region Branch Temp +-- Region Branch Temp @@ -761,7 +761,7 @@ CREATE TABLE IF NOT EXISTS Shop_Region_Branch_Temp ( -- File: 1106_tbl_Shop_Address.sql -# Addresses +-- Addresses SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address'; @@ -794,7 +794,7 @@ CREATE TABLE Shop_Address ( -- File: 1106_tbl_Shop_Plant.sql -# Plant +-- Plant SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Plant'; @@ -819,7 +819,7 @@ CREATE TABLE IF NOT EXISTS Shop_Plant ( -- File: 1107_tbl_Shop_Address_Audit.sql -# Address Audits +-- Address Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address_Audit'; @@ -842,7 +842,7 @@ CREATE TABLE IF NOT EXISTS Shop_Address_Audit ( -- File: 1107_tbl_Shop_Plant_Audit.sql -# Plant Audits +-- Plant Audits @@ -867,7 +867,7 @@ CREATE TABLE IF NOT EXISTS Shop_Plant_Audit ( -- File: 1108_tbl_Shop_Plant_Temp.sql -# Plant Temp +-- Plant Temp @@ -886,7 +886,7 @@ CREATE TABLE IF NOT EXISTS Shop_Plant_Temp ( -- File: 1109_tbl_Shop_Storage_Location.sql -# Storage Location +-- Storage Location @@ -912,7 +912,7 @@ CREATE TABLE IF NOT EXISTS Shop_Storage_Location ( -- File: 1110_tbl_Shop_Storage_Location_Audit.sql -# Storage Location Audits +-- Storage Location Audits @@ -937,7 +937,7 @@ CREATE TABLE IF NOT EXISTS Shop_Storage_Location_Audit ( -- File: 1111_tbl_Shop_Storage_Location_Temp.sql -# Storage Location Temp +-- Storage Location Temp @@ -953,7 +953,7 @@ CREATE TABLE IF NOT EXISTS Shop_Storage_Location ( -- File: 1112_tbl_Shop_Storage_Location_Branch.sql -# Storage Location Branch +-- Storage Location Branch @@ -984,7 +984,7 @@ CREATE TABLE IF NOT EXISTS Shop_Storage_Location_Branch ( -- File: 1113_tbl_Shop_Storage_Location_Branch_Audit.sql -# Storage Location Branch Audits +-- Storage Location Branch Audits @@ -1009,7 +1009,7 @@ CREATE TABLE IF NOT EXISTS Shop_Storage_Location_Branch_Audit ( -- File: 1114_tbl_Shop_Storage_Location_Branch_Temp.sql -# Storage Location Branch Temp +-- Storage Location Branch Temp @@ -1026,7 +1026,7 @@ CREATE TABLE IF NOT EXISTS Shop_Storage_Location_Branch_Temp ( -- File: 1115_tbl_Shop_Currency.sql -# Currencies +-- Currencies @@ -1051,7 +1051,7 @@ CREATE TABLE IF NOT EXISTS Shop_Currency ( -- File: 1116_tbl_Shop_Currency_Audit.sql -# Currency Audits +-- Currency Audits @@ -1076,7 +1076,7 @@ CREATE TABLE IF NOT EXISTS Shop_Currency_Audit ( -- File: 1117_tbl_Shop_Currency_Temp.sql -# Currency Temp +-- Currency Temp @@ -1094,7 +1094,7 @@ CREATE TABLE IF NOT EXISTS Shop_Currency_Temp ( -- File: 1118_tbl_Shop_Tax_Or_Surcharge.sql -# Taxes and Surcharges +-- Taxes and Surcharges @@ -1135,7 +1135,7 @@ CREATE TABLE Shop_Tax_Or_Surcharge ( -- File: 1119_tbl_Shop_Tax_Or_Surcharge_Audit.sql -# Tax Or Surcharge Audits +-- Tax Or Surcharge Audits @@ -1160,7 +1160,7 @@ CREATE TABLE IF NOT EXISTS Shop_Tax_Or_Surcharge_Audit ( -- File: 1120_tbl_Shop_Tax_Or_Surcharge_Temp.sql -# Taxes and Surcharges Temp +-- Taxes and Surcharges Temp @@ -1185,7 +1185,7 @@ CREATE TABLE Shop_Tax_Or_Surcharge_Temp ( -- File: 1121_tbl_Shop_Unit_Measurement.sql -# Unit of Measurement +-- Unit of Measurement @@ -1214,7 +1214,7 @@ CREATE TABLE IF NOT EXISTS Shop_Unit_Measurement ( -- File: 1122_tbl_Shop_Unit_Measurement_Audit.sql -# Unit of Measurement Audits +-- Unit of Measurement Audits @@ -1239,7 +1239,7 @@ CREATE TABLE IF NOT EXISTS Shop_Unit_Measurement_Audit ( -- File: 1124_tbl_Shop_Unit_Measurement_Conversion.sql -# Unit of Measurement Conversion +-- Unit of Measurement Conversion @@ -1265,7 +1265,7 @@ CREATE TABLE IF NOT EXISTS Shop_Unit_Measurement_Conversion ( -- File: 1125_tbl_Shop_Unit_Measurement_Conversion_Audit.sql -# Unit of Measurement Conversion Audits +-- Unit of Measurement Conversion Audits @@ -1290,7 +1290,7 @@ CREATE TABLE IF NOT EXISTS Shop_Unit_Measurement_Conversion_Audit ( -- File: 1200_tbl_Shop_Product_Category.sql -# Categories +-- Categories SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Product_Category'; @@ -1317,7 +1317,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Category ( -- File: 1201_tbl_Shop_Product_Category_Audit.sql -# Category Audits +-- Category Audits @@ -1342,7 +1342,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Category_Audit ( -- File: 1202_tbl_Shop_Product_Category_Temp.sql -# Categories Temp +-- Categories Temp -- DROP TABLE Shop_Product_Category_Temp; @@ -1366,7 +1366,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Category_Temp ( -- File: 1203_tbl_Shop_Product.sql -# Products +-- Products @@ -1381,7 +1381,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product ( /* price_GBP_full FLOAT, price_GBP_min FLOAT, - # ratio_discount_overall FLOAT NOT NULL DEFAULT 0, + -- ratio_discount_overall FLOAT NOT NULL DEFAULT 0, CONSTRAINT FK_Shop_Product_id_category FOREIGN KEY (id_category) REFERENCES Shop_Product_Category(id_category) @@ -1402,8 +1402,8 @@ CREATE TABLE IF NOT EXISTS Shop_Product ( CONSTRAINT FK_Shop_Product_id_access_level_required FOREIGN KEY (id_access_level_required) REFERENCES Shop_Access_Level(id_access_level), - # id_stripe_product VARCHAR(100), - # id_stripe_price VARCHAR(100) NOT NULL, + -- id_stripe_product VARCHAR(100), + -- id_stripe_price VARCHAR(100) NOT NULL, active BIT NOT NULL DEFAULT 1, display_order INT NOT NULL, created_on DATETIME NOT NULL, @@ -1417,7 +1417,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product ( -- File: 1204_tbl_Shop_Product_Audit.sql -# Products +-- Products @@ -1441,7 +1441,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Audit ( -- File: 1205_tbl_Shop_Product_Temp.sql -# Products Temp +-- Products Temp -- DROP TABLE IF EXISTS Shop_Product_Temp; @@ -1465,7 +1465,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Temp ( -- File: 1206_tbl_Shop_Product_Permutation.sql -# Product Permutation +-- Product Permutation -- DROP TABLE partsltd_prod.Shop_Product_Permutation; @@ -1529,7 +1529,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation ( -- File: 1207_tbl_Shop_Product_Permutation_Audit.sql -# Product Permutation Audits +-- Product Permutation Audits @@ -1555,7 +1555,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation_Audit ( -- File: 1208_tbl_Shop_Product_Permutation_Temp.sql -# Product Permutation Temp +-- Product Permutation Temp -- DROP TABLE IF EXISTS Shop_Product_Permutation_Temp; @@ -1595,7 +1595,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation_Temp ( -- File: 1209_tbl_Shop_Variation_Type.sql -# Variation Types +-- Variation Types @@ -1619,7 +1619,7 @@ CREATE TABLE IF NOT EXISTS Shop_Variation_Type ( -- File: 1210_tbl_Shop_Variation_Type_Audit.sql -# Variation Type Audits +-- Variation Type Audits @@ -1644,7 +1644,7 @@ CREATE TABLE IF NOT EXISTS Shop_Variation_Type_Audit ( -- File: 1211_tbl_Shop_Variation_Type_Temp.sql -# Variation Types Temp +-- Variation Types Temp -- DROP TABLE partsltd_prod.Shop_Variation_Type_Temp; @@ -1666,7 +1666,7 @@ CREATE TABLE IF NOT EXISTS Shop_Variation_Type_Temp ( -- File: 1212_tbl_Shop_Variation.sql -# Variations +-- Variations @@ -1699,7 +1699,7 @@ CREATE TABLE Shop_Variation ( -- File: 1213_tbl_Shop_Variation_Audit.sql -# Variation Audits +-- Variation Audits @@ -1724,7 +1724,7 @@ CREATE TABLE IF NOT EXISTS Shop_Variation_Audit ( -- File: 1214_tbl_Shop_Variation_Temp.sql -# Variations Temp +-- Variations Temp -- DROP TABLE partsltd_prod.Shop_Variation_Temp; @@ -1748,7 +1748,7 @@ CREATE TABLE Shop_Variation_Temp ( -- File: 1215_tbl_Shop_Product_Permutation_Variation_Link.sql -# Product Permutation Variation Link +-- Product Permutation Variation Link @@ -1779,7 +1779,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation_Variation_Link ( -- File: 1216_tbl_Shop_Product_Permutation_Variation_Link_Audit.sql -# Product Permutation Variation Link Audits +-- Product Permutation Variation Link Audits @@ -1804,7 +1804,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation_Variation_Link_Audit ( -- File: 1217_tbl_Shop_Product_Permutation_Variation_Link_Temp.sql -# Product Permutation Variation Link +-- Product Permutation Variation Link -- DROP TABLE IF EXISTS Shop_Product_Permutation_Variation_Link_Temp; @@ -1823,7 +1823,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation_Variation_Link_Temp ( -- File: 1221_tbl_Shop_Product_Price.sql -# Product Price +-- Product Price @@ -1857,7 +1857,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Price ( -- File: 1222_tbl_Shop_Product_Price_Audit.sql -# Product Price Audits +-- Product Price Audits @@ -1882,7 +1882,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Price_Audit ( -- File: 1223_tbl_Shop_Product_Price_Temp.sql -# Product Price Temp +-- Product Price Temp @@ -1901,7 +1901,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Price_Temp ( -- File: 1224_tbl_Shop_Product_Image.sql -# Product Permutation Images +-- Product Permutation Images @@ -1930,7 +1930,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Image ( -- File: 1225_tbl_Shop_Product_Image_Audit.sql -# Product Image Audits +-- Product Image Audits @@ -1953,7 +1953,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Image_Audit ( -- File: 1227_tbl_Shop_Delivery_Option.sql -# Delivery Options +-- Delivery Options @@ -1983,7 +1983,7 @@ CREATE TABLE IF NOT EXISTS Shop_Delivery_Option ( -- File: 1228_tbl_Shop_Delivery_Option_Audit.sql -# Delivery Option Audits +-- Delivery Option Audits @@ -2007,7 +2007,7 @@ CREATE TABLE IF NOT EXISTS Shop_Delivery_Option_Audit ( -- File: 1230_tbl_Shop_Product_Permutation_Delivery_Option_Link.sql -# Delivery Option +-- Delivery Option @@ -2055,7 +2055,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation_Delivery_Option_Link ( -- File: 1231_tbl_Shop_Product_Permutation_Delivery_Option_Link_Audit.sql -# Delivery Option Audits +-- Delivery Option Audits @@ -2079,7 +2079,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation_Delivery_Option_Link_Audit ( -- File: 1233_tbl_Shop_Discount.sql -# Discounts +-- Discounts @@ -2130,7 +2130,7 @@ CREATE TABLE Shop_Discount ( -- File: 1234_tbl_Shop_Discount_Audit.sql -# Discount Audits +-- Discount Audits @@ -2155,7 +2155,7 @@ CREATE TABLE IF NOT EXISTS Shop_Discount_Audit ( -- File: 1236_tbl_Shop_Discount_Region_Currency_Link.sql -# Discount Region Currency Link +-- Discount Region Currency Link @@ -2189,7 +2189,7 @@ CREATE TABLE IF NOT EXISTS Shop_Discount_Region_Currency_Link ( -- File: 1237_tbl_Shop_Discount_Region_Currency_Link_Audit.sql -# Discount Region Currency Link Audits +-- Discount Region Currency Link Audits @@ -2214,7 +2214,7 @@ CREATE TABLE IF NOT EXISTS Shop_Discount_Region_Currency_Link_Audit ( -- File: 1300_tbl_Shop_Permission_Group.sql -# Permission Groups +-- Permission Groups @@ -2237,7 +2237,7 @@ CREATE TABLE IF NOT EXISTS Shop_Permission_Group ( -- File: 1301_tbl_Shop_Permission_Group_Audit.sql -# Permission Group Audits +-- Permission Group Audits @@ -2262,7 +2262,7 @@ CREATE TABLE IF NOT EXISTS Shop_Permission_Group_Audit ( -- File: 1303_tbl_Shop_Permission.sql -# Permissions +-- Permissions @@ -2293,7 +2293,7 @@ CREATE TABLE IF NOT EXISTS Shop_Permission ( -- File: 1304_tbl_Shop_Permission_Audit.sql -# Permission Audits +-- Permission Audits @@ -2318,7 +2318,7 @@ CREATE TABLE IF NOT EXISTS Shop_Permission_Audit ( -- File: 1306_tbl_Shop_Role.sql -# Roles +-- Roles @@ -2340,7 +2340,7 @@ CREATE TABLE IF NOT EXISTS Shop_Role ( -- File: 1307_tbl_Shop_Role_Audit.sql -# Role Audits +-- Role Audits @@ -2365,7 +2365,7 @@ CREATE TABLE Shop_Role_Audit ( -- File: 1309_tbl_Shop_Role_Permission_Link.sql -# Role Permission link +-- Role Permission link @@ -2398,7 +2398,7 @@ CREATE TABLE IF NOT EXISTS Shop_Role_Permission_Link ( -- File: 1310_tbl_Shop_Role_Permission_Link_Audit.sql -# Role Permission link Audits +-- Role Permission link Audits @@ -2422,7 +2422,7 @@ CREATE TABLE IF NOT EXISTS Shop_Role_Permission_Link_Audit ( -- File: 1312_tbl_Shop_User.sql -# Users +-- Users @@ -2451,7 +2451,7 @@ CREATE TABLE IF NOT EXISTS Shop_User ( -- File: 1313_tbl_Shop_User_Audit.sql -# User Audits +-- User Audits @@ -2476,7 +2476,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Audit ( -- File: 1314_tbl_Shop_User_Temp.sql -# Users Temp +-- Users Temp -- DROP TABLE IF EXISTS Shop_User_Temp; @@ -2501,7 +2501,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Temp ( -- File: 1315_tbl_Shop_User_Role_Link.sql -# User Role link +-- User Role link @@ -2529,7 +2529,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Role_Link ( -- File: 1316_tbl_Shop_User_Role_Link_Audit.sql -# User Role Link Audits +-- User Role Link Audits @@ -2554,7 +2554,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Role_Link_Audit ( -- File: 1318_tbl_Shop_User_Address.sql -# User Addresses +-- User Addresses SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Address'; @@ -2585,7 +2585,7 @@ CREATE TABLE Shop_User_Address ( -- File: 1319_tbl_Shop_User_Address_Audit.sql -# Address Audits +-- Address Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Address_Audit'; @@ -2608,7 +2608,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Address_Audit ( -- File: 1321_tbl_Shop_User_Basket.sql -# User Basket (Product Link) +-- User Basket (Product Link) @@ -2650,7 +2650,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Basket ( -- File: 1322_tbl_Shop_User_Basket_Audit.sql -# Product Basket Audits +-- Product Basket Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Basket_Audit'; @@ -2680,7 +2680,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Basket_Audit ( -- File: 1397_tbl_Shop_Order_Status.sql -# User Order Types +-- User Order Types @@ -2704,7 +2704,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Order_Status ( -- File: 1398_tbl_Shop_Order_Status_Audit.sql -# Order Type Audits +-- Order Type Audits @@ -2728,7 +2728,7 @@ CREATE TABLE IF NOT EXISTS Shop_User_Order_Status_Audit ( -- File: 1400_tbl_Shop_Supplier.sql -# Supplier +-- Supplier SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier'; @@ -2764,7 +2764,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier ( -- File: 1401_tbl_Shop_Supplier_Audit.sql -# Supplier Audits +-- Supplier Audits @@ -2789,7 +2789,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Audit ( -- File: 1402_tbl_Shop_Supplier_Temp.sql -# Supplier Staging +-- Supplier Staging SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier_Temp'; @@ -2812,7 +2812,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Temp ( -- File: 1403_tbl_Shop_Supplier_Address.sql -# Supplier Addresses +-- Supplier Addresses SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier_Address'; @@ -2843,7 +2843,7 @@ CREATE TABLE Shop_Supplier_Address ( -- File: 1404_tbl_Shop_Supplier_Address_Audit.sql -# Supplier Address Audits +-- Supplier Address Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier_Address_Audit'; @@ -2866,7 +2866,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Address_Audit ( -- File: 1405_tbl_Shop_Supplier_Address_Temp.sql -# Supplier Addresses Staging +-- Supplier Addresses Staging SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier_Address_Temp'; @@ -2885,7 +2885,7 @@ CREATE TABLE Shop_Supplier_Address_Temp ( -- File: 1409_tbl_Shop_Supplier_Purchase_Order.sql -# Supplier Purchase Order +-- Supplier Purchase Order @@ -2931,7 +2931,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Purchase_Order ( -- File: 1410_tbl_Shop_Supplier_Purchase_Order_Audit.sql -# Supplier Purchase Order Audits +-- Supplier Purchase Order Audits @@ -2956,7 +2956,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Purchase_Order_Audit ( -- File: 1411_tbl_Shop_Supplier_Purchase_Order_Temp.sql -# Supplier Purchase Order Staging +-- Supplier Purchase Order Staging DROP TABLE IF EXISTS Shop_Supplier_Purchase_Order_Temp; @@ -2974,7 +2974,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Purchase_Order_Temp ( -- File: 1412_tbl_Shop_Manufacturing_Purchase_Order.sql -# Manufacturing Purchase Order +-- Manufacturing Purchase Order SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Manufacturing_Purchase_Order'; @@ -3017,7 +3017,7 @@ CREATE TABLE IF NOT EXISTS Shop_Manufacturing_Purchase_Order ( -- File: 1413_tbl_Shop_Manufacturing_Purchase_Order_Audit.sql -# Manufacturing Purchase Order Audits +-- Manufacturing Purchase Order Audits @@ -3042,7 +3042,7 @@ CREATE TABLE IF NOT EXISTS Shop_Manufacturing_Purchase_Order_Audit ( -- File: 1414_tbl_Shop_Manufacturing_Purchase_Order_Temp.sql -# Manufacturing Purchase Order Temp +-- Manufacturing Purchase Order Temp -- DROP TABLE Shop_Manufacturing_Purchase_Order_Temp @@ -3075,7 +3075,7 @@ CREATE TABLE IF NOT EXISTS Shop_Manufacturing_Purchase_Order_Temp ( -- File: 1415_tbl_Shop_Customer.sql -# Customer +-- Customer @@ -3108,7 +3108,7 @@ CREATE TABLE IF NOT EXISTS Shop_Customer ( -- File: 1416_tbl_Shop_Customer_Audit.sql -# Customer Audits +-- Customer Audits @@ -3133,7 +3133,7 @@ CREATE TABLE IF NOT EXISTS Shop_Customer_Audit ( -- File: 1418_tbl_Shop_Customer_Sales_Order.sql -# Customer Sales Purchase Order +-- Customer Sales Purchase Order @@ -3171,7 +3171,7 @@ CREATE TABLE IF NOT EXISTS Shop_Customer_Sales_Order ( -- File: 1419_tbl_Shop_Customer_Sales_Order_Audit.sql -# Customer Sales Order Audits +-- Customer Sales Order Audits @@ -3196,7 +3196,7 @@ CREATE TABLE IF NOT EXISTS Shop_Customer_Sales_Order_Audit ( -- File: 1421_tbl_Shop_Stock_Item.sql -# Stock Stock Item +-- Stock Stock Item -- DROP TABLE IF EXISTS Shop_Stock_Item_Audit; -- DROP TABLE IF EXISTS Shop_Stock_Item; @@ -3250,7 +3250,7 @@ CREATE TABLE IF NOT EXISTS Shop_Stock_Item ( -- File: 1422_tbl_Shop_Stock_Item_Audit.sql -# Stock Item Audits +-- Stock Item Audits @@ -3276,7 +3276,7 @@ CREATE TABLE IF NOT EXISTS Shop_Stock_Item_Audit ( -- File: 1423_tbl_Shop_Stock_Item_Temp.sql -# Stock Stock Item Temp +-- Stock Stock Item Temp DROP TABLE IF EXISTS Shop_Stock_Item_Temp; @@ -3306,7 +3306,7 @@ CREATE TABLE IF NOT EXISTS Shop_Stock_Item_Temp ( -- File: 1424_tbl_Shop_Supplier_Purchase_Order_Product_Link.sql -# Supplier Purchase Order Product Link +-- Supplier Purchase Order Product Link @@ -3349,7 +3349,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Purchase_Order_Product_Link ( -- File: 1425_tbl_Shop_Supplier_Purchase_Order_Product_Link_Audit.sql -# Supplier Purchase Order Product Link Audits +-- Supplier Purchase Order Product Link Audits @@ -3374,7 +3374,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Purchase_Order_Product_Link_Audit ( -- File: 1426_tbl_Shop_Supplier_Purchase_Order_Product_Link_Temp.sql -# Supplier Purchase Order Product Link Temp +-- Supplier Purchase Order Product Link Temp @@ -3403,7 +3403,7 @@ CREATE TABLE IF NOT EXISTS Shop_Supplier_Purchase_Order_Product_Link_Temp ( -- File: 1427_tbl_Shop_Manufacturing_Purchase_Order_Product_Link.sql -# Manufacturing Purchase Order Product Link +-- Manufacturing Purchase Order Product Link -- DROP TABLE partsltd_prod.Shop_Manufacturing_Purchase_Order_Product_Link_Audit -- DROP TABLE partsltd_prod.Shop_Manufacturing_Purchase_Order_Product_Link @@ -3450,7 +3450,7 @@ CREATE TABLE IF NOT EXISTS Shop_Manufacturing_Purchase_Order_Product_Link ( -- File: 1428_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Audit.sql -# Manufacturing Purchase Order Product Link Audits +-- Manufacturing Purchase Order Product Link Audits @@ -3475,7 +3475,7 @@ CREATE TABLE IF NOT EXISTS Shop_Manufacturing_Purchase_Order_Product_Link_Audit -- File: 1429_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Temp.sql -# Manufacturing Purchase Order Product Link Temp +-- Manufacturing Purchase Order Product Link Temp -- DROP TABLE Shop_Manufacturing_Purchase_Order_Product_Link_Temp; -- SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp; @@ -3506,7 +3506,7 @@ CREATE TABLE IF NOT EXISTS Shop_Manufacturing_Purchase_Order_Product_Link_Temp ( -- File: 1430_tbl_Shop_Customer_Sales_Order_Product_Link.sql -# Customer Sales Order Product Link +-- Customer Sales Order Product Link @@ -3547,7 +3547,7 @@ CREATE TABLE IF NOT EXISTS Shop_Customer_Sales_Order_Product_Link ( -- File: 1431_tbl_Shop_Customer_Sales_Order_Product_Link_Audit.sql -# Customer Sales Order Product Link Audits +-- Customer Sales Order Product Link Audits @@ -3572,7 +3572,7 @@ CREATE TABLE IF NOT EXISTS Shop_Customer_Sales_Order_Product_Link_Audit ( -- File: 1432_tbl_Shop_Customer_Sales_Order_Product_Link_Temp.sql -# Customer Sales Order Product Link Temp +-- Customer Sales Order Product Link Temp @@ -3609,7 +3609,7 @@ CREATE TABLE IF NOT EXISTS Shop_Customer_Sales_Order_Product_Link_Temp ( -- File: 1500_tbl_Shop_Calc_User_Temp.sql -# Calc User Staging +-- Calc User Staging -- USE partsltd_prod; -- DROP TABLE IF EXISTS Shop_Calc_User_Temp; @@ -3637,7 +3637,7 @@ CREATE TABLE Shop_Calc_User_Temp ( -- File: 3000_tri_Shop_Access_Level.sql -# Shop Access Level +-- Shop Access Level @@ -3673,23 +3673,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_access_level, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT (OLD.code <=> NEW.code) UNION - # Changed name + -- Changed name SELECT NEW.id_access_level, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION - # Changed priority + -- Changed priority SELECT NEW.id_access_level, 'priority', CONVERT(OLD.priority, CHAR), CONVERT(NEW.priority, CHAR), NEW.id_change_set WHERE NOT (OLD.priority <=> NEW.priority) UNION - # Changed active + -- Changed active SELECT NEW.id_access_level, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_access_level, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -3699,7 +3699,7 @@ DELIMITER ; -- File: 3000_tri_Shop_Product_Change_Set.sql -# Product Change Set +-- Product Change Set @@ -3722,7 +3722,7 @@ DELIMITER ; -- File: 3001_tri_Shop_User_Change_Set.sql -# Shop User Change Set +-- Shop User Change Set @@ -3745,7 +3745,7 @@ DELIMITER ; -- File: 3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql -# Product Change Set +-- Product Change Set @@ -3768,7 +3768,7 @@ DELIMITER ; -- File: 3010_tri_File_Type.sql -# File Type +-- File Type @@ -3798,15 +3798,15 @@ BEGIN value_prev, value_new ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name WHERE NOT OLD.name <=> NEW.name UNION - # Changed extension + -- Changed extension SELECT NEW.id_type, 'extension', CONVERT(OLD.extension, CHAR), CONVERT(NEW.extension, CHAR) WHERE NOT OLD.extension <=> NEW.extension ; @@ -3816,7 +3816,7 @@ DELIMITER ; -- File: 3011_tri_File_Type_Audit.sql -# File Type Audits +-- File Type Audits @@ -3846,7 +3846,7 @@ DELIMITER ; -- File: 3012_tri_Shop_General.sql -# Shop General +-- Shop General @@ -3880,7 +3880,7 @@ BEGIN value_new, id_change_set ) - # Changed quantity max + -- Changed quantity max SELECT NEW.id_general, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; @@ -3889,7 +3889,7 @@ DELIMITER ; -- File: 3014_tri_Shop_Image_Type.sql -# Shop Image Type +-- Shop Image Type @@ -3926,28 +3926,28 @@ BEGIN id_change_set ) /* - # Changed id_type_file + -- Changed id_type_file SELECT NEW.id_type, 'id_type_file', OLD.id_type_file, NEW.id_type_file, NEW.id_change_set WHERE NOT OLD.id_type_file <=> NEW.id_type_file UNION */ - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -3956,7 +3956,7 @@ DELIMITER ; -- File: 3100_tri_Shop_Region.sql -# Shop Delivery Region +-- Shop Delivery Region @@ -3992,19 +3992,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_region, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_region, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_region, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_region, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -4014,7 +4014,7 @@ DELIMITER ; -- File: 3103_tri_Shop_Region_Branch.sql -# Shop Region Branch +-- Shop Region Branch @@ -4051,16 +4051,16 @@ BEGIN id_change_set ) /* - # Changed depth + -- Changed depth SELECT NEW.id_branch, 'depth', CONVERT(OLD.depth, CHAR), CONVERT(NEW.depth, CHAR), NEW.id_change_set WHERE NOT OLD.depth <=> NEW.depth UNION */ - # Changed active + -- Changed active SELECT NEW.id_branch, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_branch, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -4070,7 +4070,7 @@ DELIMITER ; -- File: 3106_tri_Shop_Address.sql -# Shop Address +-- Shop Address @@ -4106,31 +4106,31 @@ BEGIN value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -4139,7 +4139,7 @@ DELIMITER ; -- File: 3109_tri_Shop_Storage_Location.sql -# Shop Storage Location +-- Shop Storage Location @@ -4175,19 +4175,19 @@ BEGIN value_new, id_change_set ) - # Changed id_plant + -- Changed id_plant SELECT NEW.id_location, 'id_plant', OLD.id_plant, NEW.id_plant, NEW.id_change_set WHERE NOT OLD.id_plant <=> NEW.id_plant UNION - # Changed code + -- Changed code SELECT NEW.id_location, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_location, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_location, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -4197,7 +4197,7 @@ DELIMITER ; -- File: 3115_tri_Shop_Currency.sql -# Shop Currency +-- Shop Currency @@ -4233,27 +4233,27 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_currency, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_currency, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed symbol + -- Changed symbol SELECT NEW.id_currency, 'symbol', OLD.symbol, NEW.symbol, NEW.id_change_set WHERE NOT OLD.symbol <=> NEW.symbol UNION - # Changed ratio_2_GBP + -- Changed ratio_2_GBP SELECT NEW.id_currency, 'factor_from_GBP', OLD.factor_from_GBP, NEW.factor_from_GBP, NEW.id_change_set WHERE NOT OLD.factor_from_GBP <=> NEW.factor_from_GBP UNION - # Changed active + -- Changed active SELECT NEW.id_currency, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_currency, 'display_order', CONVERT(display_order, CHAR), CONVERT(display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4262,7 +4262,7 @@ DELIMITER ; -- File: 3118_tri_Shop_Tax_Or_Surcharge.sql -# Shop Tax_Or_Surcharge +-- Shop Tax_Or_Surcharge @@ -4297,39 +4297,39 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_tax, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_tax, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed fixed_fee + -- Changed fixed_fee SELECT NEW.id_tax, 'fixed_fee', OLD.fixed_fee, NEW.fixed_fee, NEW.id_change_set WHERE NOT OLD.fixed_fee <=> NEW.fixed_fee UNION - # Changed multiplier + -- Changed multiplier SELECT NEW.id_tax, 'multiplier', OLD.multiplier, NEW.multiplier, NEW.id_change_set WHERE NOT OLD.multiplier <=> NEW.multiplier UNION - # Changed apply_fixed_fee_before_multiplier + -- Changed apply_fixed_fee_before_multiplier SELECT NEW.id_tax, 'apply_fixed_fee_before_multiplier', CONVERT(CONVERT(OLD.apply_fixed_fee_before_multiplier, SIGNED), CHAR), CONVERT(CONVERT(NEW.apply_fixed_fee_before_multiplier, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.apply_fixed_fee_before_multiplier <=> NEW.apply_fixed_fee_before_multiplier UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_tax, 'quantity_min', OLD.quantity_min, NEW.quantity_min, NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_tax, 'quantity_max', OLD.quantity_max, NEW.quantity_max, NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_tax, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_tax, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -4340,7 +4340,7 @@ DELIMITER ; -- File: 3200_tri_Shop_Category.sql -# Shop Category +-- Shop Category @@ -4374,27 +4374,27 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_category, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_category, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed description + -- Changed description SELECT NEW.id_category, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed active + -- Changed active SELECT NEW.id_category, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_category, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed id_access_level_required + -- Changed id_access_level_required SELECT NEW.id_category, 'id_access_level_required', CONVERT(OLD.id_access_level_required, CHAR), CONVERT(NEW.id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required ; @@ -4404,7 +4404,7 @@ DELIMITER ; -- File: 3203_tri_Shop_Product.sql -# Shop Product +-- Shop Product @@ -4485,89 +4485,89 @@ BEGIN value_new, id_change_set ) - # Changed name + -- Changed name SELECT NEW.id_product, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name /* UNION - # Changed description + -- Changed description SELECT NEW.id_product, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed price_GBP_full + -- Changed price_GBP_full SELECT NEW.id_product, 'price_GBP_full', CONVERT(OLD.price_GBP_full, CHAR), CONVERT(NEW.price_GBP_full, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP_full <=> NEW.price_GBP_full UNION - # Changed price_GBP_min + -- Changed price_GBP_min SELECT NEW.id_product, 'price_GBP_min', CONVERT(OLD.price_GBP_min, CHAR), CONVERT(NEW.price_GBP_min, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP_min <=> NEW.price_GBP_min UNION /* - # Changed discount + -- Changed discount SELECT NEW.id_product, 'discount', CONVERT(OLD.discount, CHAR), CONVERT(NEW.discount, CHAR), NEW.id_change_set WHERE NOT OLD.discount <=> NEW.discount */ UNION - # Changed id_category + -- Changed id_category SELECT NEW.id_product, 'id_category', CONVERT(OLD.id_category, CHAR), CONVERT(NEW.id_category, CHAR), NEW.id_change_set WHERE NOT OLD.id_category <=> NEW.id_category UNION - # Changed has_variations + -- Changed has_variations SELECT NEW.id_product, 'has_variations', CONVERT(CONVERT(NEW.has_variations, SIGNED), CHAR), CONVERT(CONVERT(NEW.has_variations, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.has_variations <=> NEW.has_variations /* UNION - # Changed latency_manuf + -- Changed latency_manuf SELECT NEW.id_product, 'latency_manuf', CONVERT(OLD.latency_manuf, CHAR), CONVERT(NEW.latency_manuf, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manuf <=> NEW.latency_manuf UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_product, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_product, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_step + -- Changed quantity_step SELECT NEW.id_product, 'quantity_step', CONVERT(OLD.quantity_step, CHAR), CONVERT(NEW.quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_step <=> NEW.quantity_step UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_product, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_product, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_product, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_product, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_product, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT OLD.id_stripe_product <=> NEW.id_stripe_product /* UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_product, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price */ UNION - # Changed id_access_level_required + -- Changed id_access_level_required SELECT NEW.id_product, 'id_access_level_required', CONVERT(OLD.id_access_level_required, CHAR), CONVERT(NEW.id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required UNION - # Changed active + -- Changed active SELECT NEW.id_product, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_product, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -4577,7 +4577,7 @@ DELIMITER ; -- File: 3206_tri_Shop_Product_Permutation.sql -# Shop Product Permutation +-- Shop Product Permutation @@ -4634,109 +4634,109 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_permutation, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_permutation, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION - # Changed name + -- Changed name SELECT NEW.id_permutation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION */ - # Changed description + -- Changed description SELECT NEW.id_permutation, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT (OLD.description <=> NEW.description) UNION - # Changed cost_local_VAT_excl + -- Changed cost_local_VAT_excl SELECT NEW.id_permutation, 'cost_local_VAT_excl', CONVERT(OLD.cost_local_VAT_excl, CHAR), CONVERT(NEW.cost_local_VAT_excl, CHAR), NEW.id_change_set WHERE NOT (OLD.cost_local_VAT_excl <=> NEW.cost_local_VAT_excl) UNION - # Changed cost_local_VAT_incl + -- Changed cost_local_VAT_incl SELECT NEW.id_permutation, 'cost_local_VAT_incl', CONVERT(OLD.cost_local_VAT_incl, CHAR), CONVERT(NEW.cost_local_VAT_incl, CHAR), NEW.id_change_set WHERE NOT (OLD.cost_local_VAT_incl <=> NEW.cost_local_VAT_incl) UNION - # Changed id_currency_cost + -- Changed id_currency_cost SELECT NEW.id_permutation, 'id_currency_cost', CONVERT(OLD.id_currency_cost, CHAR), CONVERT(NEW.id_currency_cost, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_cost <=> NEW.id_currency_cost) UNION /* - # Changed profit_local_min + -- Changed profit_local_min SELECT NEW.id_permutation, 'profit_local_min', CONVERT(OLD.profit_local_min, CHAR), CONVERT(NEW.profit_local_min, CHAR), NEW.id_change_set WHERE NOT (OLD.profit_local_min <=> NEW.profit_local_min) UNION - # Changed id_currency_profit_min + -- Changed id_currency_profit_min SELECT NEW.id_permutation, 'id_currency_profit_min', CONVERT(OLD.id_currency_profit_min, CHAR), CONVERT(NEW.id_currency_profit_min, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_profit_min <=> NEW.id_currency_profit_min) UNION */ /* - # Changed price_GBP_min + -- Changed price_GBP_min SELECT NEW.id_permutation, 'price_GBP_min', CONVERT(OLD.price_GBP_min, CHAR), CONVERT(NEW.price_GBP_min, CHAR), NEW.id_change_set WHERE NOT (OLD.price_GBP_min <=> NEW.price_GBP_min) UNION */ - # Changed latency_manufacture + -- Changed latency_manufacture SELECT NEW.id_permutation, 'latency_manufacture', CONVERT(OLD.latency_manufacture, CHAR), CONVERT(NEW.latency_manufacture, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manufacture <=> NEW.latency_manufacture UNION - # Changed id_unit_measurement_quantity + -- Changed id_unit_measurement_quantity SELECT NEW.id_permutation, 'id_unit_measurement_quantity', CONVERT(OLD.id_unit_measurement_quantity, CHAR), CONVERT(NEW.id_unit_measurement_quantity, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_quantity <=> NEW.id_unit_measurement_quantity UNION - # Changed count_unit_measurement_per_quantity_step + -- Changed count_unit_measurement_per_quantity_step SELECT NEW.id_permutation, 'count_unit_measurement_per_quantity_step', CONVERT(OLD.count_unit_measurement_per_quantity_step, CHAR), CONVERT(NEW.count_unit_measurement_per_quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.count_unit_measurement_per_quantity_step <=> NEW.count_unit_measurement_per_quantity_step UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_permutation, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_permutation, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_permutation, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_permutation, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_permutation, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_permutation, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_permutation, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT (OLD.id_stripe_product <=> NEW.id_stripe_product) UNION - # Changed does_expire_faster_once_unsealed + -- Changed does_expire_faster_once_unsealed SELECT NEW.id_permutation, 'does_expire_faster_once_unsealed', CONVERT(OLD.does_expire_faster_once_unsealed, CHAR), CONVERT(NEW.does_expire_faster_once_unsealed, CHAR), NEW.id_change_set WHERE NOT OLD.does_expire_faster_once_unsealed <=> NEW.does_expire_faster_once_unsealed UNION - # Changed id_unit_measurement_interval_expiration_unsealed + -- Changed id_unit_measurement_interval_expiration_unsealed SELECT NEW.id_permutation, 'id_unit_measurement_interval_expiration_unsealed', CONVERT(OLD.id_unit_measurement_interval_expiration_unsealed, CHAR), CONVERT(NEW.id_unit_measurement_interval_expiration_unsealed, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_expiration_unsealed <=> NEW.id_unit_measurement_interval_expiration_unsealed UNION - # Changed count_interval_expiration_unsealed + -- Changed count_interval_expiration_unsealed SELECT NEW.id_permutation, 'count_interval_expiration_unsealed', CONVERT(OLD.count_interval_expiration_unsealed, CHAR), CONVERT(NEW.count_interval_expiration_unsealed, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_expiration_unsealed <=> NEW.count_interval_expiration_unsealed UNION - # Changed active + -- Changed active SELECT NEW.id_permutation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) /* UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_permutation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) */ @@ -4747,7 +4747,7 @@ DELIMITER ; -- File: 3209_tri_Shop_Variation_Type.sql -# Shop Variation Type +-- Shop Variation Type @@ -4784,23 +4784,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4810,7 +4810,7 @@ DELIMITER ; -- File: 3212_tri_Shop_Variation.sql -# Shop Variation +-- Shop Variation @@ -4846,27 +4846,27 @@ BEGIN value_new, id_change_set ) - # Changed id_unit_measurement + -- Changed id_unit_measurement SELECT NEW.id_variation, 'id_unit_measurement', OLD.id_unit_measurement, NEW.id_unit_measurement, NEW.id_change_set WHERE NOT OLD.id_unit_measurement <=> NEW.id_unit_measurement UNION - # Changed count_unit_measurement + -- Changed count_unit_measurement SELECT NEW.id_variation, 'count_unit_measurement', OLD.count_unit_measurement, NEW.count_unit_measurement, NEW.id_change_set WHERE NOT OLD.count_unit_measurement <=> NEW.count_unit_measurement UNION - # Changed code + -- Changed code SELECT NEW.id_variation, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_variation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_variation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_variation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4876,7 +4876,7 @@ DELIMITER ; -- File: 3215_tri_Shop_Product_Permutation_Variation_Link.sql -# Shop Product Permutation Variation Link +-- Shop Product Permutation Variation Link @@ -4913,20 +4913,20 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_link, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4935,7 +4935,7 @@ DELIMITER ; -- File: 3218_tri_Shop_Stock_Item.sql -# Shop Product Permutation +-- Shop Product Permutation @@ -4971,55 +4971,55 @@ BEGIN value_new, id_change_set ) - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_stock, 'id_permutation', OLD.id_permutation, NEW.id_permutation, NEW.id_change_set WHERE NOT (OLD.id_permutation <=> NEW.id_permutation) UNION - # Changed date_purchased + -- Changed date_purchased SELECT NEW.id_stock, 'date_purchased', OLD.date_purchased, NEW.date_purchased, NEW.id_change_set WHERE NOT (OLD.date_purchased <=> NEW.date_purchased) UNION - # Changed date_received + -- Changed date_received SELECT NEW.id_stock, 'date_received', OLD.date_received, NEW.date_received, NEW.id_change_set WHERE NOT (OLD.date_received <=> NEW.date_received) UNION - # Changed id_location_storage + -- Changed id_location_storage SELECT NEW.id_stock, 'id_location_storage', OLD.id_location_storage, NEW.id_location_storage, NEW.id_change_set WHERE NOT (OLD.id_location_storage <=> NEW.id_location_storage) UNION - # Changed id_currency_cost + -- Changed id_currency_cost SELECT NEW.id_stock, 'id_currency_cost', OLD.id_currency_cost, NEW.id_currency_cost, NEW.id_change_set WHERE NOT (OLD.id_currency_cost <=> NEW.id_currency_cost) UNION - # Changed cost_local_VAT_incl + -- Changed cost_local_VAT_incl SELECT NEW.id_stock, 'cost_local_VAT_incl', OLD.cost_local_VAT_incl, NEW.cost_local_VAT_incl, NEW.id_change_set WHERE NOT (OLD.cost_local_VAT_incl <=> NEW.cost_local_VAT_incl) UNION - # Changed cost_local_VAT_excl + -- Changed cost_local_VAT_excl SELECT NEW.id_stock, 'cost_local_VAT_excl', OLD.cost_local_VAT_excl, NEW.cost_local_VAT_excl, NEW.id_change_set WHERE NOT (OLD.cost_local_VAT_excl <=> NEW.cost_local_VAT_excl) UNION - # Changed is_sealed + -- Changed is_sealed SELECT NEW.id_stock, 'is_sealed', OLD.is_sealed, NEW.is_sealed, NEW.id_change_set WHERE NOT (OLD.is_sealed <=> NEW.is_sealed) UNION - # Changed date_unsealed + -- Changed date_unsealed SELECT NEW.id_stock, 'date_unsealed', OLD.date_unsealed, NEW.date_unsealed, NEW.id_change_set WHERE NOT (OLD.date_unsealed <=> NEW.date_unsealed) UNION - # Changed date_expiration + -- Changed date_expiration SELECT NEW.id_stock, 'date_expiration', OLD.date_expiration, NEW.date_expiration, NEW.id_change_set WHERE NOT (OLD.date_expiration <=> NEW.date_expiration) UNION - # Changed is_consumed + -- Changed is_consumed SELECT NEW.id_stock, 'is_consumed', OLD.is_consumed, NEW.is_consumed, NEW.id_change_set WHERE NOT (OLD.is_consumed <=> NEW.is_consumed) UNION - # Changed date_consumed + -- Changed date_consumed SELECT NEW.id_stock, 'date_consumed', OLD.date_consumed, NEW.date_consumed, NEW.id_change_set WHERE NOT (OLD.date_consumed <=> NEW.date_consumed) UNION - # Changed active + -- Changed active SELECT NEW.id_stock, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -5029,7 +5029,7 @@ DELIMITER ; -- File: 3221_tri_Shop_Product_Price.sql -# Shop Product Currency Link +-- Shop Product Currency Link @@ -5085,31 +5085,31 @@ BEGIN value_new, id_change_set ) - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_price, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_price, 'id_currency', CONVERT(OLD.id_currency, CHAR), CONVERT(NEW.id_currency, CHAR), NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed id_region_purchase + -- Changed id_region_purchase SELECT NEW.id_price, 'id_region_purchase', CONVERT(OLD.id_region_purchase, CHAR), CONVERT(NEW.id_region_purchase, CHAR), NEW.id_change_set WHERE NOT OLD.id_region_purchase <=> NEW.id_region_purchase UNION - # Changed price_local_VAT_incl + -- Changed price_local_VAT_incl SELECT NEW.id_price, 'price_local_VAT_incl', OLD.price_local_VAT_incl, NEW.price_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_incl <=> NEW.price_local_VAT_incl UNION - # Changed price_local_VAT_excl + -- Changed price_local_VAT_excl SELECT NEW.id_price, 'price_local_VAT_excl', OLD.price_local_VAT_excl, NEW.price_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_excl <=> NEW.price_local_VAT_excl UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_price, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price UNION - # Changed active + -- Changed active SELECT NEW.id_price, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -5119,7 +5119,7 @@ DELIMITER ; -- File: 3224_tri_Shop_Product_Image.sql -# Shop Image +-- Shop Image @@ -5159,33 +5159,33 @@ BEGIN value_new, id_change_set ) - # Changed id_type_image + -- Changed id_type_image SELECT NEW.id_image, 'id_type_image', CONVERT(OLD.id_type_image, CHAR), CONVERT(NEW.id_type_image, CHAR), NEW.id_change_set WHERE NOT OLD.id_type_image <=> NEW.id_type_image UNION /* - # Changed id_type_file + -- Changed id_type_file SELECT NEW.id_image, 'id_type_file', CONVERT(OLD.id_type_file, CHAR), CONVERT(NEW.id_type_file, CHAR), NEW.id_change_set WHERE NOT OLD.id_type_file <=> NEW.id_type_file UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_image, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION */ - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_image, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed url + -- Changed url SELECT NEW.id_image, 'url', OLD.url, NEW.url, NEW.id_change_set WHERE NOT OLD.url <=> NEW.url UNION - # Changed active + -- Changed active SELECT NEW.id_image, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_image, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -5194,7 +5194,7 @@ DELIMITER ; -- File: 3227_tri_Shop_Delivery_Option.sql -# Shop Delivery Option Type +-- Shop Delivery Option Type @@ -5230,37 +5230,37 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_option, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_option, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed latency_delivery_min + -- Changed latency_delivery_min SELECT NEW.id_option, 'latency_delivery_min', CONVERT(OLD.latency_delivery_min, CHAR), CONVERT(NEW.latency_delivery_min, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_min <=> NEW.latency_delivery_min UNION - # Changed latency_delivery_max + -- Changed latency_delivery_max SELECT NEW.id_option, 'latency_delivery_max', CONVERT(OLD.latency_delivery_max, CHAR), CONVERT(NEW.latency_delivery_max, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_max <=> NEW.latency_delivery_max /* UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_option, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_option, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max */ UNION - # Changed active + -- Changed active SELECT NEW.id_option, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_option, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -5269,7 +5269,7 @@ DELIMITER ; -- File: 3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql -# Shop Product Delivery Option Link +-- Shop Product Delivery Option Link @@ -5306,42 +5306,42 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed id_option + -- Changed id_option SELECT NEW.id_link, 'id_option', CONVERT(OLD.id_option, CHAR), CONVERT(NEW.id_option, CHAR), NEW.id_change_set WHERE NOT OLD.id_option <=> NEW.id_option UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', CONVERT(OLD.price_local, CHAR), CONVERT(NEW.price_local, CHAR), NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local /* UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_link, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_link, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max */ UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -5350,7 +5350,7 @@ DELIMITER ; -- File: 3233_tri_Shop_Discount.sql -# Shop Discount +-- Shop Discount @@ -5385,47 +5385,47 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_discount, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_discount, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed multiplier + -- Changed multiplier SELECT NEW.id_discount, 'multiplier', OLD.multiplier, NEW.multiplier, NEW.id_change_set WHERE NOT OLD.multiplier <=> NEW.multiplier UNION - # Changed subtractor + -- Changed subtractor SELECT NEW.id_discount, 'subtractor', OLD.subtractor, NEW.subtractor, NEW.id_change_set WHERE NOT OLD.subtractor <=> NEW.subtractor UNION - # Changed apply_multiplier_first + -- Changed apply_multiplier_first SELECT NEW.id_discount, 'apply_multiplier_first', CONVERT(CONVERT(OLD.apply_multiplier_first, SIGNED), CHAR), CONVERT(CONVERT(NEW.apply_multiplier_first, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.apply_multiplier_first <=> NEW.apply_multiplier_first UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_discount, 'quantity_min', OLD.quantity_min, NEW.quantity_min, NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_discount, 'quantity_max', OLD.quantity_max, NEW.quantity_max, NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed date_start + -- Changed date_start SELECT NEW.id_discount, 'date_start', OLD.date_start, NEW.date_start, NEW.id_change_set WHERE NOT OLD.date_start <=> NEW.date_start UNION - # Changed date_end + -- Changed date_end SELECT NEW.id_discount, 'date_end', OLD.date_end, NEW.date_end, NEW.id_change_set WHERE NOT OLD.date_end <=> NEW.date_end UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_discount, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_discount, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -5436,7 +5436,7 @@ DELIMITER ; -- File: 3236_tri_Shop_Discount_Region_Currency_Link.sql -# Shop Discount Region Currency Link +-- Shop Discount Region Currency Link @@ -5473,16 +5473,16 @@ BEGIN id_change_set ) /* - # Changed id_discount + -- Changed id_discount SELECT NEW.id_link, 'id_discount', CONVERT(OLD.id_discount, CHAR), CONVERT(NEW.id_discount, CHAR), NEW.id_change_set WHERE NOT OLD.id_discount <=> NEW.id_discount UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -5491,7 +5491,7 @@ DELIMITER ; -- File: 3300_tri_Shop_Permission_Group.sql -# Shop Permission Group +-- Shop Permission Group @@ -5527,19 +5527,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_group, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_group, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_group, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_group, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -5548,7 +5548,7 @@ DELIMITER ; -- File: 3303_tri_Shop_Permission.sql -# Shop Permission +-- Shop Permission @@ -5584,27 +5584,27 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_permission, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_permission, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed id_permission_group + -- Changed id_permission_group SELECT NEW.id_permission, 'id_permission_group', CONVERT(OLD.id_permission_group, CHAR), CONVERT(NEW.id_permission_group, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission_group <=> NEW.id_permission_group UNION - # Changed Id_access_level_required + -- Changed Id_access_level_required SELECT NEW.id_permission, 'Id_access_level_required', CONVERT(OLD.Id_access_level_required, CHAR), CONVERT(NEW.Id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.Id_access_level_required <=> NEW.Id_access_level_required UNION - # Changed active + -- Changed active SELECT NEW.id_permission, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_permission, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -5613,7 +5613,7 @@ DELIMITER ; -- File: 3306_tri_Shop_Role.sql -# Shop Role +-- Shop Role @@ -5649,19 +5649,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_role, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_role, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_role, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_role, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -5671,7 +5671,7 @@ DELIMITER ; -- File: 3309_tri_Shop_Role_Permission_Link.sql -# Shop Role Permission Link +-- Shop Role Permission Link @@ -5708,20 +5708,20 @@ BEGIN id_change_set ) /* - # Changed id_role + -- Changed id_role SELECT NEW.id_link, 'id_role', CONVERT(OLD.id_role, CHAR), CONVERT(NEW.id_role, CHAR), NEW.id_change_set WHERE NOT OLD.id_role <=> NEW.id_role UNION - # Changed id_permission + -- Changed id_permission SELECT NEW.id_link, 'id_permission', CONVERT(OLD.id_permission, CHAR), CONVERT(NEW.id_permission, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission <=> NEW.id_permission UNION */ - # Changed id_access_level + -- Changed id_access_level SELECT NEW.id_link, 'id_access_level', CONVERT(OLD.id_access_level, CHAR), CONVERT(NEW.id_access_level, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level <=> NEW.id_access_level UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -5731,7 +5731,7 @@ DELIMITER ; -- File: 3312_tri_Shop_User.sql -# Shop User +-- Shop User @@ -5767,43 +5767,43 @@ BEGIN value_new, id_change_set ) - # Changed id_user_auth0 + -- Changed id_user_auth0 SELECT NEW.id_user, 'id_user_auth0', OLD.id_user_auth0, NEW.id_user_auth0, NEW.id_change_set WHERE NOT (OLD.id_user_auth0 <=> NEW.id_user_auth0) UNION - # Changed firstname + -- Changed firstname SELECT NEW.id_user, 'firstname', OLD.firstname, NEW.firstname, NEW.id_change_set WHERE NOT (OLD.firstname <=> NEW.firstname) UNION - # Changed surname + -- Changed surname SELECT NEW.id_user, 'surname', OLD.surname, NEW.surname, NEW.id_change_set WHERE NOT (OLD.surname <=> NEW.surname) UNION - # Changed email + -- Changed email SELECT NEW.id_user, 'email', OLD.email, NEW.email, NEW.id_change_set WHERE NOT (OLD.email <=> NEW.email) UNION - # Changed is_email_verified + -- Changed is_email_verified SELECT NEW.id_user, 'is_email_verified', CONVERT(CONVERT(OLD.is_email_verified, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_email_verified, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_email_verified <=> NEW.is_email_verified) UNION - # Changed is_super_user + -- Changed is_super_user SELECT NEW.id_user, 'is_super_user', CONVERT(CONVERT(OLD.is_super_user, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_super_user, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_super_user <=> NEW.is_super_user) UNION - # Changed active + -- Changed active SELECT NEW.id_user, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed id_currency_default + -- Changed id_currency_default SELECT NEW.id_user, 'id_currency_default', CONVERT(OLD.id_currency_default, CHAR), CONVERT(NEW.id_currency_default, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_default <=> NEW.id_currency_default) UNION - # Changed id_region_default + -- Changed id_region_default SELECT NEW.id_user, 'id_region_default', CONVERT(OLD.id_region_default, CHAR), CONVERT(NEW.id_region_default, CHAR), NEW.id_change_set WHERE NOT (OLD.id_region_default <=> NEW.id_region_default) UNION - # Changed is_included_VAT_default + -- Changed is_included_VAT_default SELECT NEW.id_user, 'is_included_VAT_default', CONVERT(CONVERT(OLD.is_included_VAT_default, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_included_VAT_default, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_included_VAT_default <=> NEW.is_included_VAT_default) ; @@ -5812,7 +5812,7 @@ DELIMITER ; -- File: 3315_tri_Shop_User_Role_Link.sql -# Shop User Role Link +-- Shop User Role Link @@ -5848,7 +5848,7 @@ BEGIN value_new, id_change_set ) - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -5857,7 +5857,7 @@ DELIMITER ; -- File: 3318_tri_Shop_User_Address.sql -# Shop Address +-- Shop Address @@ -5893,39 +5893,39 @@ BEGIN value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_user_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed name_full + -- Changed name_full SELECT NEW.id_user_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set WHERE NOT OLD.name_full <=> NEW.name_full UNION - # Changed phone_number + -- Changed phone_number SELECT NEW.id_user_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_user_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_user_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_user_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_user_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_user_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_user_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -5934,7 +5934,7 @@ DELIMITER ; -- File: 3321_tri_Shop_User_Basket.sql -# Shop Product Variation Link +-- Shop Product Variation Link @@ -5970,19 +5970,19 @@ BEGIN value_new, id_change_set_user ) - # Changed id_user + -- Changed id_user SELECT NEW.id_item, 'id_user', OLD.id_user, NEW.id_user, NEW.id_change_set_user WHERE NOT OLD.id_user <=> NEW.id_user UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_item, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set_user WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed quantity + -- Changed quantity SELECT NEW.id_item, 'quantity', CONVERT(OLD.quantity, CHAR), CONVERT(NEW.quantity, CHAR), NEW.id_change_set_user WHERE NOT (OLD.quantity <=> NEW.quantity) UNION - # Changed active + -- Changed active SELECT NEW.id_item, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set_user WHERE NOT (OLD.active <=> NEW.active) ; @@ -5991,7 +5991,7 @@ DELIMITER ; -- File: 3324_tri_Shop_User_Order_Status.sql -# Shop User Order Type +-- Shop User Order Type @@ -6027,23 +6027,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_Status, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_Status, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_Status, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_Status, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_Status, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -6052,7 +6052,7 @@ DELIMITER ; -- File: 3400_tri_Shop_Supplier.sql -# Shop Supplier +-- Shop Supplier @@ -6088,45 +6088,45 @@ BEGIN value_new, id_change_set ) - # Changed name_company + -- Changed name_company SELECT NEW.id_supplier, 'name_company', OLD.name_company, NEW.name_company, NEW.id_change_set WHERE NOT OLD.name_company <=> NEW.name_company UNION - # Changed name_contact + -- Changed name_contact SELECT NEW.id_supplier, 'name_contact', OLD.name_contact, NEW.name_contact, NEW.id_change_set WHERE NOT OLD.name_contact <=> NEW.name_contact UNION - # Changed department_contact + -- Changed department_contact SELECT NEW.id_supplier, 'department_contact', OLD.department_contact, NEW.department_contact, NEW.id_change_set WHERE NOT OLD.department_contact <=> NEW.department_contact UNION /* - # Changed id_address + -- Changed id_address SELECT NEW.id_supplier, 'id_address', OLD.id_address, NEW.id_address, NEW.id_change_set WHERE NOT OLD.id_address <=> NEW.id_address UNION */ - # Changed phone_number + -- Changed phone_number SELECT NEW.id_supplier, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed fax + -- Changed fax SELECT NEW.id_supplier, 'fax', OLD.fax, NEW.fax, NEW.id_change_set WHERE NOT OLD.fax <=> NEW.fax UNION - # Changed email + -- Changed email SELECT NEW.id_supplier, 'email', OLD.email, NEW.email, NEW.id_change_set WHERE NOT OLD.email <=> NEW.email UNION - # Changed website + -- Changed website SELECT NEW.id_supplier, 'website', OLD.website, NEW.website, NEW.id_change_set WHERE NOT OLD.website <=> NEW.website UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_supplier, 'id_currency', OLD.id_currency, NEW.id_currency, NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed id_supplier_temp + -- Changed id_supplier_temp SELECT NEW.id_supplier, 'id_supplier_temp', OLD.id_supplier_temp, NEW.id_supplier_temp, NEW.id_change_set WHERE NOT OLD.id_supplier_temp <=> NEW.id_supplier_temp ; @@ -6136,7 +6136,7 @@ DELIMITER ; -- File: 3403_tri_Shop_Supplier_Address.sql -# Shop Supplier Address +-- Shop Supplier Address DROP TRIGGER IF EXISTS before_insert_Shop_Supplier_Address; DROP TRIGGER IF EXISTS before_update_Shop_Supplier_Address; @@ -6170,31 +6170,31 @@ BEGIN value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -6203,7 +6203,7 @@ DELIMITER ; -- File: 3403_tri_Shop_Unit_Measurement.sql -# Shop Unit of Measurement +-- Shop Unit of Measurement @@ -6239,39 +6239,39 @@ BEGIN value_new, id_change_set ) - # Changed name_singular + -- Changed name_singular SELECT NEW.id_unit_measurement, 'name_singular', OLD.name_singular, NEW.name_singular, NEW.id_change_set WHERE NOT OLD.name_singular <=> NEW.name_singular UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_unit_measurement, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed symbol + -- Changed symbol SELECT NEW.id_unit_measurement, 'symbol', OLD.symbol, NEW.symbol, NEW.id_change_set WHERE NOT OLD.symbol <=> NEW.symbol UNION - # Changed is_base_unit + -- Changed is_base_unit SELECT NEW.id_unit_measurement, 'is_base_unit', OLD.is_base_unit, NEW.is_base_unit, NEW.id_change_set WHERE NOT OLD.is_base_unit <=> NEW.is_base_unit UNION - # Changed is_unit_of_distance + -- Changed is_unit_of_distance SELECT NEW.id_unit_measurement, 'is_unit_of_distance', OLD.is_unit_of_distance, NEW.is_unit_of_distance, NEW.id_change_set WHERE NOT OLD.is_unit_of_distance <=> NEW.is_unit_of_distance UNION - # Changed is_unit_of_mass + -- Changed is_unit_of_mass SELECT NEW.id_unit_measurement, 'is_unit_of_mass', OLD.is_unit_of_mass, NEW.is_unit_of_mass, NEW.id_change_set WHERE NOT OLD.is_unit_of_mass <=> NEW.is_unit_of_mass UNION - # Changed is_unit_of_time + -- Changed is_unit_of_time SELECT NEW.id_unit_measurement, 'is_unit_of_time', OLD.is_unit_of_time, NEW.is_unit_of_time, NEW.id_change_set WHERE NOT OLD.is_unit_of_time <=> NEW.is_unit_of_time UNION - # Changed is_unit_of_volume + -- Changed is_unit_of_volume SELECT NEW.id_unit_measurement, 'is_unit_of_volume', OLD.is_unit_of_volume, NEW.is_unit_of_volume, NEW.id_change_set WHERE NOT OLD.is_unit_of_volume <=> NEW.is_unit_of_volume UNION - # Changed active + -- Changed active SELECT NEW.id_unit_measurement, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -6282,7 +6282,7 @@ DELIMITER ; -- File: 3406_tri_Shop_Unit_Of_Measurement_Conversion.sql -# Shop Unit of Measurement Conversion +-- Shop Unit of Measurement Conversion @@ -6318,27 +6318,27 @@ BEGIN value_new, id_change_set ) - # Changed id_unit_derived + -- Changed id_unit_derived SELECT NEW.id_conversion, 'id_unit_derived', OLD.id_unit_derived, NEW.id_unit_derived, NEW.id_change_set WHERE NOT OLD.id_unit_derived <=> NEW.id_unit_derived UNION - # Changed id_unit_base + -- Changed id_unit_base SELECT NEW.id_conversion, 'id_unit_base', OLD.id_unit_base, NEW.id_unit_base, NEW.id_change_set WHERE NOT OLD.id_unit_base <=> NEW.id_unit_base UNION - # Changed multiplier_unit_base + -- Changed multiplier_unit_base SELECT NEW.id_conversion, 'multiplier_unit_base', OLD.multiplier_unit_base, NEW.multiplier_unit_base, NEW.id_change_set WHERE NOT OLD.multiplier_unit_base <=> NEW.multiplier_unit_base UNION - # Changed increment_unit_base + -- Changed increment_unit_base SELECT NEW.id_conversion, 'active', OLD.increment_unit_base, NEW.increment_unit_base, NEW.id_change_set WHERE NOT OLD.increment_unit_base <=> NEW.increment_unit_base UNION - # Changed apply_multiplier_before_increment + -- Changed apply_multiplier_before_increment SELECT NEW.id_conversion, 'apply_multiplier_before_increment', OLD.apply_multiplier_before_increment, NEW.apply_multiplier_before_increment, NEW.id_change_set WHERE NOT OLD.apply_multiplier_before_increment <=> NEW.apply_multiplier_before_increment UNION - # Changed active + -- Changed active SELECT NEW.id_conversion, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -6349,7 +6349,7 @@ DELIMITER ; -- File: 3409_tri_Shop_Supplier_Purchase_Order.sql -# Shop Supplier Purchase Order +-- Shop Supplier Purchase Order @@ -6385,40 +6385,40 @@ BEGIN value_new, id_change_set ) - # Changed id_order_temp + -- Changed id_order_temp SELECT NEW.id_order, 'id_order_temp', OLD.id_order_temp, NEW.id_order_temp, NEW.id_change_set WHERE NOT OLD.id_order_temp <=> NEW.id_order_temp UNION - # Changed id_supplier_ordered + -- Changed id_supplier_ordered SELECT NEW.id_order, 'id_supplier_ordered', OLD.id_supplier_ordered, NEW.id_supplier_ordered, NEW.id_change_set WHERE NOT OLD.id_supplier_ordered <=> NEW.id_supplier_ordered UNION - # Changed id_currency_cost + -- Changed id_currency_cost SELECT NEW.id_order, 'id_currency_cost', OLD.id_currency_cost, NEW.id_currency_cost, NEW.id_change_set WHERE NOT OLD.id_currency_cost <=> NEW.id_currency_cost UNION - # Changed cost_total_local_VAT_excl + -- Changed cost_total_local_VAT_excl SELECT NEW.id_order, 'cost_total_local_VAT_excl', OLD.cost_total_local_VAT_excl, NEW.cost_total_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_excl <=> NEW.cost_total_local_VAT_excl UNION - # Changed cost_total_local_VAT_incl + -- Changed cost_total_local_VAT_incl SELECT NEW.id_order, 'cost_total_local_VAT_incl', OLD.cost_total_local_VAT_incl, NEW.cost_total_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_incl <=> NEW.cost_total_local_VAT_incl /* UNION - # Changed latency_delivery + -- Changed latency_delivery SELECT NEW.id_order, 'latency_delivery', OLD.latency_delivery, NEW.latency_delivery, NEW.id_change_set WHERE NOT OLD.latency_delivery <=> NEW.latency_delivery UNION - # Changed quantity_ordered + -- Changed quantity_ordered SELECT NEW.id_order, 'quantity_ordered', OLD.quantity_ordered, NEW.quantity_ordered, NEW.id_change_set WHERE NOT OLD.quantity_ordered <=> NEW.quantity_ordered UNION - # Changed id_unit_quantity + -- Changed id_unit_quantity SELECT NEW.id_order, 'id_unit_quantity', OLD.id_unit_quantity, NEW.id_unit_quantity, NEW.id_change_set WHERE NOT OLD.id_unit_quantity <=> NEW.id_unit_quantity UNION - # Changed quantity_received + -- Changed quantity_received SELECT NEW.id_order, 'quantity_received', OLD.quantity_received, NEW.quantity_received, NEW.id_change_set WHERE NOT OLD.quantity_received <=> NEW.quantity_received */ @@ -6430,7 +6430,7 @@ DELIMITER ; -- File: 3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql -# Shop Supplier Purchase Order Product Link +-- Shop Supplier Purchase Order Product Link @@ -6466,57 +6466,57 @@ BEGIN value_new, id_change_set ) - # Changed id_order + -- Changed id_order SELECT NEW.id_link, 'id_order', OLD.id_order, NEW.id_order, NEW.id_change_set WHERE NOT OLD.id_order <=> NEW.id_order UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', OLD.id_permutation, NEW.id_permutation, NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION /* - # Changed id_currency_cost + -- Changed id_currency_cost SELECT NEW.id_link, 'id_currency_cost', OLD.id_currency_cost, NEW.id_currency_cost, NEW.id_change_set WHERE NOT OLD.id_currency_cost <=> NEW.id_currency_cost UNION */ - # Changed quantity_ordered + -- Changed quantity_ordered SELECT NEW.id_link, 'quantity_ordered', OLD.quantity_ordered, NEW.quantity_ordered, NEW.id_change_set WHERE NOT OLD.quantity_ordered <=> NEW.quantity_ordered UNION - # Changed id_unit_quantity + -- Changed id_unit_quantity SELECT NEW.id_link, 'id_unit_quantity', OLD.id_unit_quantity, NEW.id_unit_quantity, NEW.id_change_set WHERE NOT OLD.id_unit_quantity <=> NEW.id_unit_quantity UNION - # Changed quantity_received + -- Changed quantity_received SELECT NEW.id_link, 'quantity_received', OLD.quantity_received, NEW.quantity_received, NEW.id_change_set WHERE NOT OLD.quantity_received <=> NEW.quantity_received UNION - # Changed latency_delivery_days + -- Changed latency_delivery_days SELECT NEW.id_link, 'latency_delivery_days', OLD.latency_delivery_days, NEW.latency_delivery_days, NEW.id_change_set WHERE NOT OLD.latency_delivery_days <=> NEW.latency_delivery_days UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', OLD.display_order, NEW.display_order, NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed cost_total_local_VAT_excl + -- Changed cost_total_local_VAT_excl SELECT NEW.id_link, 'cost_total_local_VAT_excl', OLD.cost_total_local_VAT_excl, NEW.cost_total_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_excl <=> NEW.cost_total_local_VAT_excl UNION - # Changed cost_total_local_VAT_incl + -- Changed cost_total_local_VAT_incl SELECT NEW.id_link, 'cost_total_local_VAT_incl', OLD.cost_total_local_VAT_incl, NEW.cost_total_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_incl <=> NEW.cost_total_local_VAT_incl UNION - # Changed cost_unit_local_VAT_excl + -- Changed cost_unit_local_VAT_excl SELECT NEW.id_link, 'cost_unit_local_VAT_excl', OLD.cost_unit_local_VAT_excl, NEW.cost_unit_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_unit_local_VAT_excl <=> NEW.cost_unit_local_VAT_excl UNION - # Changed cost_unit_local_VAT_incl + -- Changed cost_unit_local_VAT_incl SELECT NEW.id_link, 'cost_unit_local_VAT_incl', OLD.cost_unit_local_VAT_incl, NEW.cost_unit_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_unit_local_VAT_incl <=> NEW.cost_unit_local_VAT_incl ; @@ -6526,7 +6526,7 @@ DELIMITER ; -- File: 3415_tri_Shop_Manufacturing_Purchase_Order.sql -# Shop Manufacturing Purchase Order +-- Shop Manufacturing Purchase Order @@ -6566,31 +6566,31 @@ BEGIN value_new, id_change_set ) - # Changed id_order_temp + -- Changed id_order_temp SELECT NEW.id_order, 'id_order_temp', OLD.id_order_temp, NEW.id_order_temp, NEW.id_change_set WHERE NOT OLD.id_order_temp <=> NEW.id_order_temp UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_order, 'id_currency', OLD.id_currency, NEW.id_currency, NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed cost_total_local_VAT_excl + -- Changed cost_total_local_VAT_excl SELECT NEW.id_order, 'cost_total_local_VAT_excl', OLD.cost_total_local_VAT_excl, NEW.cost_total_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_excl <=> NEW.cost_total_local_VAT_excl UNION - # Changed cost_total_local_VAT_incl + -- Changed cost_total_local_VAT_incl SELECT NEW.id_order, 'cost_total_local_VAT_incl', OLD.cost_total_local_VAT_incl, NEW.cost_total_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_incl <=> NEW.cost_total_local_VAT_incl UNION - # Changed price_total_local_VAT_excl + -- Changed price_total_local_VAT_excl SELECT NEW.id_order, 'price_total_local_VAT_excl', OLD.price_total_local_VAT_excl, NEW.price_total_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_total_local_VAT_excl <=> NEW.price_total_local_VAT_excl UNION - # Changed price_total_local_VAT_incl + -- Changed price_total_local_VAT_incl SELECT NEW.id_order, 'price_total_local_VAT_incl', OLD.price_total_local_VAT_incl, NEW.price_total_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_total_local_VAT_incl <=> NEW.price_total_local_VAT_incl UNION - # Changed active + -- Changed active SELECT NEW.id_order, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -6600,7 +6600,7 @@ DELIMITER ; -- File: 3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql -# Shop Manufacturing Purchase Order Product Link +-- Shop Manufacturing Purchase Order Product Link @@ -6636,55 +6636,55 @@ BEGIN value_new, id_change_set ) - # Changed id_order + -- Changed id_order SELECT NEW.id_link, 'id_order', OLD.id_order, NEW.id_order, NEW.id_change_set WHERE NOT OLD.id_order <=> NEW.id_order UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', OLD.id_permutation, NEW.id_permutation, NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed id_unit_quantity + -- Changed id_unit_quantity SELECT NEW.id_link, 'id_unit_quantity', OLD.id_unit_quantity, NEW.id_unit_quantity, NEW.id_change_set WHERE NOT OLD.id_unit_quantity <=> NEW.id_unit_quantity UNION - # Changed quantity_used + -- Changed quantity_used SELECT NEW.id_link, 'quantity_used', OLD.quantity_used, NEW.quantity_used, NEW.id_change_set WHERE NOT OLD.quantity_used <=> NEW.quantity_used UNION - # Changed quantity_produced + -- Changed quantity_produced SELECT NEW.id_link, 'quantity_produced', OLD.quantity_produced, NEW.quantity_produced, NEW.id_change_set WHERE NOT OLD.quantity_produced <=> NEW.quantity_produced UNION - # Changed cost_unit_local_VAT_excl + -- Changed cost_unit_local_VAT_excl SELECT NEW.id_order, 'cost_unit_local_VAT_excl', OLD.cost_unit_local_VAT_excl, NEW.cost_unit_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_unit_local_VAT_excl <=> NEW.cost_unit_local_VAT_excl UNION - # Changed cost_unit_local_VAT_incl + -- Changed cost_unit_local_VAT_incl SELECT NEW.id_order, 'cost_unit_local_VAT_incl', OLD.cost_unit_local_VAT_incl, NEW.cost_unit_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_unit_local_VAT_incl <=> NEW.cost_unit_local_VAT_incl UNION - # Changed price_unit_local_VAT_excl + -- Changed price_unit_local_VAT_excl SELECT NEW.id_order, 'price_unit_local_VAT_excl', OLD.price_unit_local_VAT_excl, NEW.price_unit_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_unit_local_VAT_excl <=> NEW.price_unit_local_VAT_excl UNION - # Changed price_unit_local_VAT_incl + -- Changed price_unit_local_VAT_incl SELECT NEW.id_order, 'price_unit_local_VAT_incl', OLD.price_unit_local_VAT_incl, NEW.price_unit_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_unit_local_VAT_incl <=> NEW.price_unit_local_VAT_incl UNION - # Changed id_unit_latency_manufacture + -- Changed id_unit_latency_manufacture SELECT NEW.id_link, 'id_unit_latency_manufacture', OLD.id_unit_latency_manufacture, NEW.id_unit_latency_manufacture, NEW.id_change_set WHERE NOT OLD.id_unit_latency_manufacture <=> NEW.id_unit_latency_manufacture UNION - # Changed latency_manufacture + -- Changed latency_manufacture SELECT NEW.id_link, 'latency_manufacture', OLD.latency_manufacture, NEW.latency_manufacture, NEW.id_change_set WHERE NOT OLD.latency_manufacture <=> NEW.latency_manufacture UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', OLD.display_order, NEW.display_order, NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -6695,7 +6695,7 @@ DELIMITER ; -- File: 3421_tri_Shop_Customer.sql -# Shop Customer +-- Shop Customer @@ -6731,35 +6731,35 @@ BEGIN value_new, id_change_set ) - # Changed name_company + -- Changed name_company SELECT NEW.id_customer, 'name_company', OLD.name_company, NEW.name_company, NEW.id_change_set WHERE NOT OLD.name_company <=> NEW.name_company UNION - # Changed name_contact + -- Changed name_contact SELECT NEW.id_customer, 'name_contact', OLD.name_contact, NEW.name_contact, NEW.id_change_set WHERE NOT OLD.name_contact <=> NEW.name_contact UNION - # Changed department_contact + -- Changed department_contact SELECT NEW.id_customer, 'department_contact', OLD.department_contact, NEW.department_contact, NEW.id_change_set WHERE NOT OLD.department_contact <=> NEW.department_contact UNION - # Changed id_address + -- Changed id_address SELECT NEW.id_customer, 'id_address', OLD.id_address, NEW.id_address, NEW.id_change_set WHERE NOT OLD.id_address <=> NEW.id_address UNION - # Changed phone_number + -- Changed phone_number SELECT NEW.id_customer, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed email + -- Changed email SELECT NEW.id_customer, 'email', OLD.email, NEW.email, NEW.id_change_set WHERE NOT OLD.email <=> NEW.email UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_customer, 'id_currency', OLD.id_currency, NEW.id_currency, NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed active + -- Changed active SELECT NEW.id_customer, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -6770,7 +6770,7 @@ DELIMITER ; -- File: 3424_tri_Shop_Customer_Sales_Order.sql -# Shop Customer Sales Order +-- Shop Customer Sales Order @@ -6806,19 +6806,19 @@ BEGIN value_new, id_change_set ) - # Changed id_customer + -- Changed id_customer SELECT NEW.id_order, 'id_customer', OLD.id_customer, NEW.id_customer, NEW.id_change_set WHERE NOT OLD.id_customer <=> NEW.id_customer UNION - # Changed price_total_local + -- Changed price_total_local SELECT NEW.id_order, 'price_total_local', OLD.price_total_local, NEW.price_total_local, NEW.id_change_set WHERE NOT OLD.price_total_local <=> NEW.price_total_local UNION - # Changed id_currency_price + -- Changed id_currency_price SELECT NEW.id_order, 'id_currency_price', OLD.id_currency_price, NEW.id_currency_price, NEW.id_change_set WHERE NOT OLD.id_currency_price <=> NEW.id_currency_price UNION - # Changed active + -- Changed active SELECT NEW.id_order, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -6828,7 +6828,7 @@ DELIMITER ; -- File: 3427_tri_Shop_Customer_Sales_Order_Product_Link.sql -# Shop Customer Sales Order Product Link +-- Shop Customer Sales Order Product Link @@ -6864,43 +6864,43 @@ BEGIN value_new, id_change_set ) - # Changed id_order + -- Changed id_order SELECT NEW.id_link, 'id_order', OLD.id_order, NEW.id_order, NEW.id_change_set WHERE NOT OLD.id_order <=> NEW.id_order UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', OLD.id_permutation, NEW.id_permutation, NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed price_total_local + -- Changed price_total_local SELECT NEW.id_link, 'price_total_local', OLD.price_total_local, NEW.price_total_local, NEW.id_change_set WHERE NOT OLD.price_total_local <=> NEW.price_total_local UNION - # Changed id_currency_price + -- Changed id_currency_price SELECT NEW.id_link, 'id_currency_price', OLD.id_currency_price, NEW.id_currency_price, NEW.id_change_set WHERE NOT OLD.id_currency_price <=> NEW.id_currency_price UNION - # Changed quantity_ordered + -- Changed quantity_ordered SELECT NEW.id_link, 'quantity_ordered', OLD.quantity_ordered, NEW.quantity_ordered, NEW.id_change_set WHERE NOT OLD.quantity_ordered <=> NEW.quantity_ordered UNION - # Changed id_unit_quantity + -- Changed id_unit_quantity SELECT NEW.id_link, 'id_unit_quantity', OLD.id_unit_quantity, NEW.id_unit_quantity, NEW.id_change_set WHERE NOT OLD.id_unit_quantity <=> NEW.id_unit_quantity UNION - # Changed quantity_delivered + -- Changed quantity_delivered SELECT NEW.id_link, 'quantity_delivered', OLD.quantity_delivered, NEW.quantity_delivered, NEW.id_change_set WHERE NOT OLD.quantity_delivered <=> NEW.quantity_delivered UNION - # Changed latency_delivery_days + -- Changed latency_delivery_days SELECT NEW.id_link, 'latency_delivery_days', OLD.latency_delivery_days, NEW.latency_delivery_days, NEW.id_change_set WHERE NOT OLD.latency_delivery_days <=> NEW.latency_delivery_days UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', OLD.display_order, NEW.display_order, NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -7046,9 +7046,9 @@ DELIMITER ; /* CALL p_split ( 'nips' - , 'noods, cheese ' # a_string - , ',' # a_separator - # '0', # a_allow_empty + , 'noods, cheese ' -- a_string + , ',' -- a_separator + -- '0', -- a_allow_empty , 1 ); @@ -7252,7 +7252,7 @@ DELIMITER ; /* CALL p_split_key_value_pair_csv ( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' - , '1:100,2:200,3:300,4:400' # a_string + , '1:100,2:200,3:300,4:400' -- a_string , 1 ); @@ -7554,7 +7554,7 @@ DELIMITER ; /* CALL p_shop_get_id_product_permutation_from_variation_csv_list ( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' - , '1:100,2:200,3:300,4:400' # a_string + , '1:100,2:200,3:300,4:400' -- a_string , 1 ); @@ -7749,7 +7749,7 @@ BEGIN DECLARE v_id_permission INT; -- DECLARE v_ids_product VARCHAR(500); DECLARE v_id_access_level_view INT; - # DECLARE v_id_access_level_product_required INT; + -- DECLARE v_id_access_level_product_required INT; DECLARE v_priority_access_level_view INT; DECLARE v_priority_access_level_edit INT; DECLARE v_priority_access_level_admin INT; @@ -7862,7 +7862,7 @@ BEGIN ; END IF; - # Access levels + -- Access levels IF v_has_filter_access_level THEN CALL partsltd_prod.p_split(a_guid, a_ids_access_level, ',', a_debug); @@ -7882,7 +7882,7 @@ BEGIN CALL partsltd_prod.p_clear_split_temp( a_guid ); - # Invalid IDs + -- Invalid IDs IF EXISTS ( SELECT t_S.substring FROM tmp_Split t_S @@ -7949,7 +7949,7 @@ BEGIN CALL partsltd_prod.p_clear_split_temp( a_guid ); - # Invalid or inactive + -- Invalid or inactive IF EXISTS (SELECT PERM.id_permission FROM tmp_Split t_S LEFT JOIN partsltd_prod.Shop_Permission PERM ON t_S.as_int = PERM.id_permission WHERE ISNULL(t_S.as_int) OR ISNULL(PERM.id_permission) OR PERM.active = 0) THEN INSERT INTO tmp_Msg_Error ( -- guid, @@ -7981,7 +7981,7 @@ BEGIN END IF; DELETE FROM tmp_Split; - # Users + -- Users CALL partsltd_prod.p_split(a_guid, a_ids_user, ',', a_debug); INSERT INTO tmp_Split ( @@ -8000,7 +8000,7 @@ BEGIN CALL partsltd_prod.p_clear_split_temp( a_guid ); - # Invalid or inactive + -- Invalid or inactive IF EXISTS (SELECT U.id_user FROM tmp_Split t_S LEFT JOIN partsltd_prod.Shop_User U ON t_S.as_int = U.id_user WHERE ISNULL(t_S.as_int) OR ISNULL(U.id_user) OR (a_get_inactive_user = 0 AND U.active = 0)) THEN INSERT INTO tmp_Msg_Error ( -- guid, @@ -8124,11 +8124,11 @@ BEGIN ; */ - # SET v_has_filter_user = EXISTS ( SELECT * FROM tmp_User_Calc_User LIMIT 1 ); + -- SET v_has_filter_user = EXISTS ( SELECT * FROM tmp_User_Calc_User LIMIT 1 ); END IF; DELETE FROM tmp_Split; - # Products + -- Products IF v_has_filter_product = 1 THEN CALL partsltd_prod.p_split(a_guid, a_ids_product, ',', a_debug); @@ -8148,7 +8148,7 @@ BEGIN CALL partsltd_prod.p_clear_split_temp( a_guid ); - # Invalid product IDs + -- Invalid product IDs IF EXISTS (SELECT * FROM tmp_Split t_S LEFT JOIN partsltd_prod.Shop_Product P ON t_S.as_int = P.id_product WHERE ISNULL(t_S.as_int) OR ISNULL(P.id_product)) THEN INSERT INTO tmp_Msg_Error ( -- guid, @@ -8182,7 +8182,7 @@ BEGIN CASE WHEN AL_P.priority < AL_C.priority THEN AL_P.id_access_level ELSE AL_C.id_access_level END AS id_access_level_required, CASE WHEN AL_P.priority < AL_C.priority THEN AL_P.priority ELSE AL_C.priority END AS priority_access_level_required FROM tmp_Split t_S - INNER JOIN partsltd_prod.Shop_Product P ON t_S.as_int = P.id_product # Shop_Product_Permutation PP + INNER JOIN partsltd_prod.Shop_Product P ON t_S.as_int = P.id_product -- Shop_Product_Permutation PP INNER JOIN partsltd_prod.Shop_Access_Level AL_P ON P.id_access_level_required = AL_P.id_access_level AND AL_P.active @@ -8291,7 +8291,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Calc_User; DROP TABLE IF EXISTS tmp_User_Calc_User; DROP TABLE IF EXISTS tmp_Product_Calc_User; - # Don't destroy common tables in nested Stored Procedures! + -- Don't destroy common tables in nested Stored Procedures! -- DROP TABLE IF EXISTS tmp_Split; DELETE FROM tmp_Split; @@ -8385,7 +8385,7 @@ DELIMITER ; /* CALL p_shop_clear_calc_user ( - 'noods, cheese ' # a_guid + 'noods, cheese ' -- a_guid , 1 -- debug ); @@ -8404,7 +8404,7 @@ WHERE GUID = 'noods, cheese ' /* CALL p_shop_get_many_access_level ( - 0 # a_get_inactive_access_level + 0 -- a_get_inactive_access_level ) */ @@ -8440,7 +8440,7 @@ DELIMITER ; /* CALL p_shop_get_many_access_level ( - 0 # a_get_inactive_access_level + 0 -- a_get_inactive_access_level ); */ @@ -8452,7 +8452,7 @@ CALL p_shop_get_many_access_level ( /* CALL p_shop_get_many_region ( - 0 # a_get_inactive_region + 0 -- a_get_inactive_region ) */ @@ -8488,7 +8488,7 @@ DELIMITER ; /* CALL p_shop_get_many_region ( - 0 # a_get_inactive_region + 0 -- a_get_inactive_region ); */ @@ -8527,7 +8527,7 @@ DELIMITER ; /* CALL p_shop_get_many_plant ( - 0 # a_get_inactive_plant + 0 -- a_get_inactive_plant ); */ @@ -8567,7 +8567,7 @@ DELIMITER ; /* CALL p_shop_get_many_storage_location ( - 0 # a_get_inactive_storage_location + 0 -- a_get_inactive_storage_location ); */ @@ -8579,7 +8579,7 @@ CALL p_shop_get_many_storage_location ( /* CALL p_shop_get_many_currency ( - 0 # a_get_inactive_currency + 0 -- a_get_inactive_currency ) */ @@ -8617,7 +8617,7 @@ DELIMITER ; /* CALL p_shop_get_many_currency ( - 0 # a_get_inactive_currency + 0 -- a_get_inactive_currency ); */ @@ -8658,7 +8658,7 @@ DELIMITER ; /* CALL p_shop_get_many_unit_measurement ( - 0 # a_get_inactive_unit_measurement + 0 -- a_get_inactive_unit_measurement ); select * @@ -8975,7 +8975,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -9137,7 +9137,7 @@ DELIMITER ; /* CALL p_shop_clear_calc_product_permutation ( - 'noods, cheese ' # a_guid + 'noods, cheese ' -- a_guid ); SELECT * FROM Shop_Product_Category_Temp @@ -10081,7 +10081,7 @@ BEGIN */ START TRANSACTION; - # Categories + -- Categories INSERT INTO Shop_Product_Category_Temp ( id_category , code @@ -10113,7 +10113,7 @@ BEGIN GROUP BY PC.id_category ; - # Products + -- Products INSERT INTO Shop_Product_Temp ( id_product , id_category @@ -10146,7 +10146,7 @@ BEGIN GROUP BY P.id_product, t_P.can_view, t_P.can_edit, t_P.can_admin ; - # Product Permutations + -- Product Permutations INSERT INTO Shop_Product_Permutation_Temp ( id_permutation , id_product @@ -10217,7 +10217,7 @@ BEGIN END IF; /* - # Errors + -- Errors SELECT t_ME.display_order, t_ME.guid, @@ -10270,19 +10270,19 @@ DELIMITER ; /* CALL partsltd_prod.p_shop_calc_product_permutation ( - 1 #'auth0|6582b95c895d09a70ba10fef', # a_id_user - , 1 # a_get_all_product_category - , 0 # a_get_inactive_product_category - , '' # a_ids_product_category - , 1 # a_get_all_product - , 0 # a_get_inactive_product - , '' # a_ids_product - , 1 # a_get_all_product_permutation - , 0 # a_get_inactive_permutation - , '' # a_ids_permutation - , 0 # a_get_products_quantity_stock_below_minimum - , 'NIPS ' # a_guid - , 0 # a_debug + 1 --'auth0|6582b95c895d09a70ba10fef', -- a_id_user + , 1 -- a_get_all_product_category + , 0 -- a_get_inactive_product_category + , '' -- a_ids_product_category + , 1 -- a_get_all_product + , 0 -- a_get_inactive_product + , '' -- a_ids_product + , 1 -- a_get_all_product_permutation + , 0 -- a_get_inactive_permutation + , '' -- a_ids_permutation + , 0 -- a_get_products_quantity_stock_below_minimum + , 'NIPS ' -- a_guid + , 0 -- a_debug ); @@ -10345,12 +10345,12 @@ BEGIN -- Argument redeclaration -- Variable declaration - # DECLARE v_has_filter_product_category BIT; - # DECLARE v_has_filter_product BIT; - # DECLARE v_has_filter_permutation BIT; + -- DECLARE v_has_filter_product_category BIT; + -- DECLARE v_has_filter_product BIT; + -- DECLARE v_has_filter_permutation BIT; DECLARE v_has_filter_image BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); -- DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_product INT; DECLARE v_ids_product_permission VARCHAR(4000); @@ -10532,7 +10532,7 @@ BEGIN INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PP_T.id_permutation = PP.id_permutation ; - # Product Images + -- Product Images IF (v_has_filter_image = 1 AND NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1)) THEN CALL partsltd_prod.p_split(v_guid, a_ids_image, ',', a_debug); @@ -10607,7 +10607,7 @@ BEGIN DELETE FROM tmp_Split; -- Outputs - # Categories + -- Categories SELECT -- DISTINCT t_C.id_category @@ -10629,7 +10629,7 @@ BEGIN ORDER BY PC.display_order ; - # Products + -- Products SELECT t_P.id_product, P.id_category, @@ -10650,7 +10650,7 @@ BEGIN ORDER BY t_C.display_order, P.display_order ; - # Product Permutations + -- Product Permutations SELECT t_PP.id_permutation, PP.id_product, @@ -10683,7 +10683,7 @@ BEGIN PP.does_expire_faster_once_unsealed, PP.id_unit_measurement_interval_expiration_unsealed, UM_X.symbol AS symbol_unit_measurement_interval_expiration_unsealed, - UM_X.symbol_is_suffix_not_prefix AS symbol_is_suffix_not_prefix_unit_measurement_interval_expiration_unsealed, + UM_X.symbol_is_suffix_not_prefix AS symbol_is_suffix_not_prefix_unit_interval_expiration_unsealed, UM_X.name_singular AS name_singular_unit_measurement_interval_expiration_unsealed, UM_X.name_plural AS name_plural_unit_measurement_interval_expiration_unsealed, PP.count_interval_expiration_unsealed, @@ -10707,7 +10707,7 @@ BEGIN ORDER BY PC.display_order, P.display_order -- , t_PP.display_order ; - # Variations + -- Variations SELECT V.id_variation , V.id_type @@ -10734,7 +10734,7 @@ BEGIN AND PPVL.active ; - # Images + -- Images SELECT t_I.id_image, t_PP.id_product, @@ -10751,7 +10751,7 @@ BEGIN ORDER BY t_C.display_order, t_P.display_order, I.display_order ; - # Errors + -- Errors SELECT * /* t_ME.display_order, @@ -10792,21 +10792,21 @@ DELIMITER ; /* CALL partsltd_prod.p_shop_get_many_product ( - 1 #'auth0|6582b95c895d09a70ba10fef', # a_id_user - , 1 # a_get_all_product_category - , 0 # a_get_inactive_product_category - , '' # a_ids_product_category - , 1 # a_get_all_product - , 0 # a_get_inactive_product - , '' # a_ids_product - , 1 # a_get_all_product_permutation - , 0 # a_get_inactive_permutation - , '' # a_ids_permutation - , 1 # a_get_all_image - , 0 # a_get_inactive_image - , '' # a_ids_image - , 0 # a_get_products_quantity_stock_below_minimum - , 0 # a_debug + 1 --'auth0|6582b95c895d09a70ba10fef', -- a_id_user + , 1 -- a_get_all_product_category + , 0 -- a_get_inactive_product_category + , '' -- a_ids_product_category + , 1 -- a_get_all_product + , 0 -- a_get_inactive_product + , '' -- a_ids_product + , 1 -- a_get_all_product_permutation + , 0 -- a_get_inactive_permutation + , '' -- a_ids_permutation + , 1 -- a_get_all_image + , 0 -- a_get_inactive_image + , '' -- a_ids_image + , 0 -- a_get_products_quantity_stock_below_minimum + , 0 -- a_debug ); select * FROM partsltd_prod.Shop_Calc_User_Temp; @@ -10909,11 +10909,11 @@ BEGIN description VARCHAR(4000) NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), /* id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type @@ -11034,13 +11034,13 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN CALL p_shop_calc_user ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), # a_ids_access_level - (SELECT GROUP_CONCAT(id_product SEPARATOR ',') From tmp_Shop_Product), # a_ids_product - (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') From tmp_Shop_Product) # a_ids_permutation -- WHERE NOT ISNULL(id_permutation) + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), -- a_ids_access_level + (SELECT GROUP_CONCAT(id_product SEPARATOR ',') From tmp_Shop_Product), -- a_ids_product + (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') From tmp_Shop_Product) -- a_ids_permutation -- WHERE NOT ISNULL(id_permutation) ); IF EXISTS (SELECT can_admin FROM Shop_Calc_User_Temp WHERE guid = v_guid AND NOT can_admin) THEN @@ -11103,7 +11103,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -11111,7 +11111,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user ; @@ -11139,13 +11139,13 @@ select * from shop_product; select * from shop_product_permutation_variation_link; CALL p_shop_calc_user ( - 'ead789a1-c7ac-11ee-a256-b42e9986184a', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 0, # a_get_inactive_users - '4', # a_ids_permission - '3', # a_ids_access_level - '1', # a_ids_product - '1' # a_ids_permutation -- WHERE NOT ISNULL(id_permutation) + 'ead789a1-c7ac-11ee-a256-b42e9986184a', -- a_guid + 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 0, -- a_get_inactive_users + '4', -- a_ids_permission + '3', -- a_ids_access_level + '1', -- a_ids_product + '1' -- a_ids_permutation -- WHERE NOT ISNULL(id_permutation) ); */ @@ -11792,7 +11792,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -11876,9 +11876,9 @@ SELECT 'Shop_Product_Permutation before call' AS result_name; select * FROM Shop_Product_Permutation; CALL p_shop_save_product_permutation ( - 1, -- 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 'Initial data', # a_comment - 'NIPS' # a_guid + 1, -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 'Initial data', -- a_comment + 'NIPS' -- a_guid ); SELECT 'Shop_Product_Permutation_Temp after call' AS result_name; @@ -12092,11 +12092,11 @@ BEGIN DECLARE v_has_filter_variation BIT; DECLARE v_has_filter_variation_type BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); - # DECLARE v_ids_permutation_unavailable VARCHAR(4000); + -- DECLARE v_id_user VARCHAR(100); + -- DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_variation INT; - # DECLARE v_ids_product_permission VARCHAR(4000); - # DECLARE v_ids_permutation_permission VARCHAR(4000); + -- DECLARE v_ids_product_permission VARCHAR(4000); + -- DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_id_access_level_view INT; DECLARE v_time_start TIMESTAMP(6); DECLARE v_id_minimum INT; @@ -12317,7 +12317,7 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_variation := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); IF a_debug = 1 THEN @@ -12372,7 +12372,7 @@ BEGIN END IF; -- Returns - # Variation Types + -- Variation Types SELECT t_VT.id_type , VT.code @@ -12384,7 +12384,7 @@ BEGIN INNER JOIN Shop_Variation_Type VT ON t_VT.id_type = VT.id_type ; - # Variations + -- Variations SELECT t_V.id_variation , t_V.id_type @@ -12406,7 +12406,7 @@ BEGIN ORDER BY VT.display_order, V.display_order ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME @@ -12430,14 +12430,14 @@ DELIMITER ; /* CALL p_shop_get_many_product_variation ( - 1 # 'auth0|6582b95c895d09a70ba10fef', # a_id_user - , 1 # a_get_all_variation_type - , 1 # a_get_inactive_variation_type - , '' # a_ids_variation_type - , 1 # a_get_all_variation - , 1 # a_get_inactive_variation - , '' # a_ids_variation - , 0 # a_debug + 1 -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + , 1 -- a_get_all_variation_type + , 1 -- a_get_inactive_variation_type + , '' -- a_ids_variation_type + , 1 -- a_get_all_variation + , 1 -- a_get_inactive_variation + , '' -- a_ids_variation + , 0 -- a_debug ); @@ -12751,7 +12751,7 @@ BEGIN -- Validation -- Variation Type - # id_type + -- id_type IF EXISTS ( SELECT * FROM tmp_Variation_Type t_VT @@ -12781,7 +12781,7 @@ BEGIN ; END IF; -- Variation - # id_variation + -- id_variation IF EXISTS ( SELECT * FROM tmp_Variation t_V @@ -12810,7 +12810,7 @@ BEGIN AND ISNULL(V.id_variation) ; END IF; - # id_type + -- id_type IF EXISTS ( SELECT * FROM tmp_Variation t_V WHERE t_V.has_type = 0 LIMIT 1 ) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -13020,7 +13020,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -13467,7 +13467,7 @@ BEGIN INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PP_T.id_permutation = PP.id_permutation ; - # Stock Items + -- Stock Items CALL partsltd_prod.p_split(v_guid, a_ids_stock_item, ',', a_debug); DELETE FROM tmp_Split; @@ -13829,7 +13829,7 @@ BEGIN FIND_IN_SET(t_SI.id_product, ( SELECT GROUP_CONCAT(UET.id_product SEPARATOR ',') FROM partsltd_prod.Shop_Calc_User_Temp UET) - ) = 0 # id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM partsltd_prod.Shop_Calc_User_Temp), '%'); + ) = 0 -- id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM partsltd_prod.Shop_Calc_User_Temp), '%'); * / / * ISNULL(UE_T.id_product) @@ -13844,8 +13844,8 @@ BEGIN ) ; - # CALL p_shop_clear_calc_user(v_guid); - # DROP TABLE IF EXISTS Shop_Calc_User_Temp; + -- CALL p_shop_clear_calc_user(v_guid); + -- DROP TABLE IF EXISTS Shop_Calc_User_Temp; DELETE FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid ; @@ -13864,7 +13864,7 @@ BEGIN -- Returns -- SET v_now := NOW(); - # Stock Items + -- Stock Items SELECT t_SI.id_stock, t_SI.id_permutation, @@ -13914,7 +13914,7 @@ BEGIN IFNULL(t_PP.can_view, 0) = 1 ; - # Errors + -- Errors SELECT t_ME.display_order, -- t_ME.guid, @@ -13930,7 +13930,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_category, @@ -13965,31 +13965,31 @@ DELIMITER ; /* CALL p_shop_get_many_stock_item ( - 1, # a_id_user - 1, # a_get_all_product_permutation - -- 'nips', # a_guid_permutations - 0, # a_get_inactive_product_permutation - '', # a_ids_product_permutation - 1, # a_get_all_stock_item - 0, # a_get_inactive_stock_item - '', # a_ids_stock_item - 1, # a_get_all_region_storage - 0, # a_get_inactive_delivery_region - '', # a_ids_region_storage - 1, # a_get_all_plant_storage - 0, # a_get_inactive_plant_storage - '', # a_ids_plant_storage - 1, # a_get_all_location_storage - 0, # a_get_inactive_location_storage - '', # a_ids_location_storage - NULL, # a_date_received_to - 0, # a_get_sealed_stock_item_only - 0, # a_get_unsealed_stock_item_only - 0, # a_get_expired_stock_item_only - 0, # a_get_nonexpired_stock_item_only - 0, # a_get_consumed_stock_item_only - 0 # a_get_nonconsumed_stock_item_only - , 0 # a_debug + 1, -- a_id_user + 1, -- a_get_all_product_permutation + -- 'nips', -- a_guid_permutations + 0, -- a_get_inactive_product_permutation + '', -- a_ids_product_permutation + 1, -- a_get_all_stock_item + 0, -- a_get_inactive_stock_item + '', -- a_ids_stock_item + 1, -- a_get_all_region_storage + 0, -- a_get_inactive_delivery_region + '', -- a_ids_region_storage + 1, -- a_get_all_plant_storage + 0, -- a_get_inactive_plant_storage + '', -- a_ids_plant_storage + 1, -- a_get_all_location_storage + 0, -- a_get_inactive_location_storage + '', -- a_ids_location_storage + NULL, -- a_date_received_to + 0, -- a_get_sealed_stock_item_only + 0, -- a_get_unsealed_stock_item_only + 0, -- a_get_expired_stock_item_only + 0, -- a_get_nonexpired_stock_item_only + 0, -- a_get_consumed_stock_item_only + 0 -- a_get_nonconsumed_stock_item_only + , 0 -- a_debug ); @@ -14135,7 +14135,7 @@ BEGIN , is_consumed , date_consumed , active - # , name_error + -- , name_error , is_new ) SELECT @@ -14157,7 +14157,7 @@ BEGIN , IFNULL(IFNULL(SI_T.is_consumed, SI.is_consumed), 0) AS is_consumed , IFNULL(SI_T.date_consumed, SI.date_consumed) AS date_consumed , IFNULL(IFNULL(SI_T.active, SI.active), 1) AS active - # , fn_shop_get_product_permutation_name(SI_T.id_permutation) + -- , fn_shop_get_product_permutation_name(SI_T.id_permutation) , CASE WHEN IFNULL(SI_T.id_stock, 0) < 1 THEN 1 ELSE 0 END AS is_new FROM partsltd_prod.Shop_Stock_Item_Temp SI_T LEFT JOIN partsltd_prod.Shop_Stock_Item SI ON SI_T.id_stock = SI.id_stock @@ -14613,7 +14613,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -14695,9 +14695,9 @@ SELECT 'Shop_Product_Permutation before call' AS result_name; select * FROM Shop_Product_Permutation; CALL p_shop_save_product_permutation ( - 1, -- 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 'Initial data', # a_comment - 'NIPS' # a_guid + 1, -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 'Initial data', -- a_comment + 'NIPS' -- a_guid ); SELECT 'Shop_Product_Permutation_Temp after call' AS result_name; @@ -14859,7 +14859,7 @@ BEGIN DECLARE v_has_filter_delivery_option BIT; DECLARE v_has_filter_delivery_region BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_product INT; DECLARE v_ids_product_permission VARCHAR(4000); @@ -15067,7 +15067,7 @@ BEGIN INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PP_T.id_permutation = PP.id_permutation ; - # Product Prices + -- Product Prices CALL partsltd_prod.p_split(v_guid, a_ids_product_price, ',', a_debug); DELETE FROM tmp_Split; @@ -15160,7 +15160,7 @@ BEGIN INNER JOIN Shop_Product_Category C ON P.id_category = C.id_category WHERE - # permutations + -- permutations ( a_get_all_product_permutation OR ( @@ -15178,7 +15178,7 @@ BEGIN ) ; - # Delivery Regions + -- Delivery Regions INSERT INTO tmp_Delivery_Region ( id_region, active, @@ -15305,7 +15305,7 @@ BEGIN -- select * from tmp_Shop_Product; - # Currencies + -- Currencies IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN INSERT INTO tmp_Currency ( id_currency, @@ -15395,7 +15395,7 @@ BEGIN END IF; END IF; - # Discounts + -- Discounts IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN INSERT INTO tmp_Discount ( id_discount, @@ -15421,12 +15421,12 @@ BEGIN ) ; END IF; - # select 'pre-permission results'; - # select * from tmp_Shop_Product; + -- select 'pre-permission results'; + -- select * from tmp_Shop_Product; -- Permissions IF EXISTS (SELECT * FROM tmp_Shop_Product_Category LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_product := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); SET v_ids_product_permission := (SELECT GROUP_CONCAT(id_product SEPARATOR ',') FROM tmp_Shop_Product WHERE NOT ISNULL(id_product)); -- SET v_ids_permutation_permission := (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') FROM tmp_Shop_Product WHERE NOT ISNULL(id_permutation)); @@ -15452,7 +15452,7 @@ BEGIN DELETE t_P FROM tmp_Shop_Product t_P WHERE - FIND_IN_SET(t_P.id_product, (SELECT GROUP_CONCAT(UET.id_product SEPARATOR ',') FROM Shop_Calc_User_Temp UET)) = 0 # id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_Calc_User_Temp), '%'); + FIND_IN_SET(t_P.id_product, (SELECT GROUP_CONCAT(UET.id_product SEPARATOR ',') FROM Shop_Calc_User_Temp UET)) = 0 -- id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_Calc_User_Temp), '%'); OR ( ISNULL(t_P.can_view) AND ( @@ -15471,7 +15471,7 @@ BEGIN ; CALL p_shop_clear_calc_user(v_guid); - # DROP TABLE IF EXISTS Shop_Calc_User_Temp; + -- DROP TABLE IF EXISTS Shop_Calc_User_Temp; /* DELETE FROM Shop_Calc_User_Temp UE_T WHERE UE_T.GUID = v_guid @@ -15485,7 +15485,7 @@ BEGIN -- Returns -- SET v_now := NOW(); - # Categories + -- Categories SELECT DISTINCT t_C.id_category, C.name, @@ -15499,7 +15499,7 @@ BEGIN ORDER BY C.display_order ; - # Products + -- Products SELECT t_P.id_product, t_P.id_permutation, @@ -15537,7 +15537,7 @@ BEGIN ORDER BY t_P.rank_permutation ; - # Variations + -- Variations SELECT V.id_variation , V.code AS code_variation @@ -15562,7 +15562,7 @@ BEGIN ; /* - # Permutation variations output + -- Permutation variations output SELECT t_P.id_permutation, t_P.id_product, t_P.id_category, @@ -15581,7 +15581,7 @@ BEGIN select * from tmp_shop_product; */ - # Product Price + -- Product Price SELECT PCRL.id_link AS id_price, t_P.id_permutation, @@ -15614,7 +15614,7 @@ BEGIN ; /* - # Currency + -- Currency SELECT DISTINCT C.id_currency, C.code, @@ -15628,7 +15628,7 @@ BEGIN ; */ - # Images + -- Images SELECT t_I.id_image, t_I.id_product, @@ -15646,7 +15646,7 @@ BEGIN ORDER BY t_P.rank_permutation, I.display_order ; - # Delivery options + -- Delivery options SELECT _DO.id_option, PDOL.id_product, @@ -15682,7 +15682,7 @@ BEGIN ORDER BY t_P.rank_permutation, PDOL.display_order ; - # Discounts + -- Discounts SELECT D.id_discount, P.id_category, @@ -15721,7 +15721,7 @@ BEGIN ; /* - # Delivery Regions + -- Delivery Regions SELECT t_DR.id_region, t_P.id_category, @@ -15745,7 +15745,7 @@ BEGIN ; */ - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME @@ -15900,11 +15900,11 @@ BEGIN active BIT NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), /* id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type @@ -15974,17 +15974,17 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # SELECT * FROM tmp_Msg_Error LIMIT 1; + -- SELECT * FROM tmp_Msg_Error LIMIT 1; CALL p_shop_calc_user ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), # a_ids_access_level - (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link), # (SELECT DISTINCT id_product FROM tmp_Shop_Product_Currency_Link) calc_PCL) # a_ids_product - (SELECT GROUP_CONCAT(DISTINCT id_permutation SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link) # a_ids_permutation + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), -- a_ids_access_level + (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link), -- (SELECT DISTINCT id_product FROM tmp_Shop_Product_Currency_Link) calc_PCL) -- a_ids_product + (SELECT GROUP_CONCAT(DISTINCT id_permutation SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link) -- a_ids_permutation ); - # SELECT * FROM tmp_Msg_Error LIMIT 1; + -- SELECT * FROM tmp_Msg_Error LIMIT 1; IF EXISTS (SELECT can_admin FROM Shop_Calc_User_Temp WHERE guid = v_guid AND NOT can_admin LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( @@ -16040,7 +16040,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -16048,7 +16048,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user ; @@ -16334,7 +16334,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -16821,7 +16821,7 @@ BEGIN INNER JOIN partsltd_prod.Shop_User U ON t_U.id_user = U.id_user ; - # Errors + -- Errors SELECT t_ME.display_order, MET.code, @@ -16866,13 +16866,13 @@ CALL p_get_many_user ( , 'google-oauth2|109567376920138999933' , 0 ); - NULL # a_id_user - , 'auth0|6582b95c895d09a70ba10fef' # a_id_user_auth0 - , 0 # a_get_all_user - , 0 # a_get_inactive_user - -- , 0 # a_get_first_user_only - , NULL # a_ids_user - , 'auth0|6582b95c895d09a70ba10fef' # a_ids_user_auth0 + NULL -- a_id_user + , 'auth0|6582b95c895d09a70ba10fef' -- a_id_user_auth0 + , 0 -- a_get_all_user + , 0 -- a_get_inactive_user + -- , 0 -- a_get_first_user_only + , NULL -- a_ids_user + , 'auth0|6582b95c895d09a70ba10fef' -- a_ids_user_auth0 , 0 -- a_debug );*/ @@ -16903,14 +16903,14 @@ CALL p_get_many_user( /* CALL p_shop_edit_user_basket ( - '', # a_id_user - '', # a_ids_permutation_basket - '', # a_quantities_permutation_basket - 1, # a_id_permutation_edit - NULL, # a_quantity_permutation_edit - 1, # a_sum_not_edit - 1, # a_id_currency_edit - 1 # a_id_region_purchase + '', -- a_id_user + '', -- a_ids_permutation_basket + '', -- a_quantities_permutation_basket + 1, -- a_id_permutation_edit + NULL, -- a_quantity_permutation_edit + 1, -- a_sum_not_edit + 1, -- a_id_currency_edit + 1 -- a_id_region_purchase ) */ @@ -16943,11 +16943,11 @@ BEGIN DECLARE v_n_quantity_permutation_basket INT; DECLARE v_row_number INT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_id_permission_product INT; DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_now DATETIME; - # DECLARE v_quantity_new INT; + -- DECLARE v_quantity_new INT; DECLARE v_change_set_used BIT; DECLARE v_id_change_set INT; @@ -17040,8 +17040,8 @@ BEGIN display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, id_type INT NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) REFERENCES Shop_Msg_Error_Type(id_type), @@ -17055,7 +17055,7 @@ BEGIN SET v_has_filter_permutation_edit = NOT ISNULL(a_id_permutation_edit); SET v_has_filter_currency = NOT ISNULL(a_id_currency); SET v_has_filter_region = NOT ISNULL(a_id_region_purchase); - # SET v_quantity_new = CASE WHEN a_sum_not_edit THEN quantity + a_quantity_product_edit ELSE a_quantity_product_edit END; + -- SET v_quantity_new = CASE WHEN a_sum_not_edit THEN quantity + a_quantity_product_edit ELSE a_quantity_product_edit END; /* SELECT v_has_filter_user, v_has_filter_basket ; @@ -17277,7 +17277,7 @@ BEGIN -- String product id, permutation id, quantity list IF NOT EXISTS (SELECT * FROM tmp_Shop_Basket WHERE active LIMIT 1) AND NOT EXISTS (SELECT msg FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN -- NOT v_has_filter_user AND - # Get product ids + -- Get product ids CALL p_split(v_guid, a_ids_permutation_basket, ','); INSERT INTO tmp_Shop_Product ( id_product, id_permutation, display_order @@ -17295,7 +17295,7 @@ BEGIN */ DROP TABLE Split_Temp; - # Get product quantities + -- Get product quantities CALL p_split(v_guid, a_quantities_permutation_basket, ','); INSERT INTO tmp_Shop_Quantity ( quantity, display_order @@ -17310,7 +17310,7 @@ BEGIN */ DROP TABLE Split_Temp; - # Compare number of product ids to number of quantities + -- Compare number of product ids to number of quantities SET v_n_id_permutation_basket := (SELECT display_order FROM tmp_Shop_Product ORDER BY display_order DESC LIMIT 1); SET v_n_quantity_permutation_basket := (SELECT display_order FROM tmp_Shop_Quantity ORDER BY display_order DESC LIMIT 1); IF NOT v_n_id_permutation_basket = v_n_quantity_permutation_basket THEN @@ -17390,7 +17390,7 @@ BEGIN */ - # Edit basket product + -- Edit basket product IF v_has_filter_permutation_edit AND NOT EXISTS (SELECT msg FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN IF EXISTS ( SELECT * @@ -17561,44 +17561,44 @@ BEGIN */ -- Returns CALL p_shop_get_many_product ( - a_id_user, # a_id_user - 1, # a_get_all_categories - '', # a_ids_category - 0, # a_get_inactive_categories - 0, # a_get_all_products + a_id_user, -- a_id_user + 1, -- a_get_all_categories + '', -- a_ids_category + 0, -- a_get_inactive_categories + 0, -- a_get_all_products ( SELECT GROUP_CONCAT(t_B.id_product SEPARATOR ',') FROM tmp_Shop_Basket t_B WHERE active = 1 - ), # a_ids_product - 0, # a_get_inactive_products - 0, # a_get_first_product_only - 0, # a_get_all_product_permutations + ), -- a_ids_product + 0, -- a_get_inactive_products + 0, -- a_get_first_product_only + 0, -- a_get_all_product_permutations ( SELECT GROUP_CONCAT(t_B.id_permutation SEPARATOR ',') FROM tmp_Shop_Basket t_B WHERE NOT ISNULL(t_B.id_permutation) AND active = 1 - ), # a_ids_permutation - 0, # a_get_inactive_permutations - 0, # a_get_all_images - '', # a_ids_image - 0, # a_get_inactive_images - 1, # a_get_first_image_only - 0, # a_get_all_delivery_region - a_id_region_purchase, # a_ids_delivery_region - 0, # a_get_inactive_delivery_region - 0, # a_get_all_currency - a_id_currency, # a_ids_currency - 0, # a_get_inactive_currency - 1, # a_get_all_discount - '', # a_ids_discount - 0 # a_get_inactive_discount + ), -- a_ids_permutation + 0, -- a_get_inactive_permutations + 0, -- a_get_all_images + '', -- a_ids_image + 0, -- a_get_inactive_images + 1, -- a_get_first_image_only + 0, -- a_get_all_delivery_region + a_id_region_purchase, -- a_ids_delivery_region + 0, -- a_get_inactive_delivery_region + 0, -- a_get_all_currency + a_id_currency, -- a_ids_currency + 0, -- a_get_inactive_currency + 1, -- a_get_all_discount + '', -- a_ids_discount + 0 -- a_get_inactive_discount ); - # Basket + -- Basket SELECT t_UB.id_category, t_UB.id_product, t_UB.id_permutation, @@ -17622,7 +17622,7 @@ BEGIN ORDER BY C.display_order, P.display_order ; - # Errors + -- Errors /* Completed by product get many */ SELECT t_ME.display_order, @@ -17639,7 +17639,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_categories, @@ -17661,7 +17661,7 @@ BEGIN ; END IF; - # DROP TABLE IF EXISTS tmp_Msg_Error; + -- DROP TABLE IF EXISTS tmp_Msg_Error; DELETE FROM tmp_Msg_Error WHERE guid = v_guid; IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN DROP TABLE tmp_Msg_Error; @@ -17677,41 +17677,41 @@ DELIMITER ; /* CALL p_shop_edit_user_basket ( - '', # a_id_user - '', # a_ids_permutation_basket - '', # a_quantities_permutation_basket - 2, # a_id_permutation_edit - 1, # a_quantity_permutation_edit - 1, # a_sum_not_edit - 2, # a_id_currency_edit - 1 # a_id_region_purchase + '', -- a_id_user + '', -- a_ids_permutation_basket + '', -- a_quantities_permutation_basket + 2, -- a_id_permutation_edit + 1, -- a_quantity_permutation_edit + 1, -- a_sum_not_edit + 2, -- a_id_currency_edit + 1 -- a_id_region_purchase ); CALL p_shop_edit_user_basket ( - '', # a_id_user - '1', # a_ids_permutation_basket - '9', # a_quantities_permutation_basket - 1, # a_id_permutation_edit - 69, # a_quantity_permutation_edit - 1, # a_sum_not_edit - 1, # a_id_currency_edit - 1 # a_id_region_purchase + '', -- a_id_user + '1', -- a_ids_permutation_basket + '9', -- a_quantities_permutation_basket + 1, -- a_id_permutation_edit + 69, -- a_quantity_permutation_edit + 1, -- a_sum_not_edit + 1, -- a_id_currency_edit + 1 -- a_id_region_purchase ); CALL p_shop_edit_user_basket ( - 'auth0|6582b95c895d09a70ba10feF', # a_id_user - '2', # a_ids_permutation_basket - '7', # a_quantities_permutation_basket - 2, # a_id_permutation_edit - NULL, # a_quantity_permutation_edit - 1, # a_sum_not_edit - 1, # a_id_currency_edit - 1 # a_id_region_purchase + 'auth0|6582b95c895d09a70ba10feF', -- a_id_user + '2', -- a_ids_permutation_basket + '7', -- a_quantities_permutation_basket + 2, -- a_id_permutation_edit + NULL, -- a_quantity_permutation_edit + 1, -- a_sum_not_edit + 1, -- a_id_currency_edit + 1 -- a_id_region_purchase ); {'a_id_user': 'auth0|6582b95c895d09a70ba10fef', 'a_ids_permutation_basket': '1', - '7', # a_quantities_permutation_basket + '7', -- a_quantities_permutation_basket 'a_id_permutation_edit': 1, 'a_quantity_permutation_edit': 1, 'a_sum_not_edit': 1} @@ -17906,7 +17906,7 @@ BEGIN -- Validation -- Suppliers /* - # id_address + -- id_address IF EXISTS ( SELECT * FROM tmp_Supplier t_S @@ -17940,7 +17940,7 @@ BEGIN ; END IF; */ - # id_currency + -- id_currency IF EXISTS ( SELECT * FROM tmp_Supplier t_S @@ -17973,7 +17973,7 @@ BEGIN ) ; END IF; - # name_company + -- name_company IF EXISTS (SELECT * FROM tmp_Supplier t_S WHERE ISNULL(t_S.name_company) LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -17988,7 +17988,7 @@ BEGIN WHERE ISNULL(t_S.name_company) ; END IF; - # email + -- email IF EXISTS (SELECT * FROM tmp_Supplier t_S WHERE ISNULL(t_S.email) LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -18003,7 +18003,7 @@ BEGIN WHERE ISNULL(t_S.email) ; END IF; - # duplicate + -- duplicate IF EXISTS (SELECT COUNT(*) FROM tmp_Supplier t_S GROUP BY t_S.id_supplier HAVING COUNT(*) > 1) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -18021,7 +18021,7 @@ BEGIN END IF; -- Addresses - # id_supplier + -- id_supplier IF EXISTS ( SELECT * FROM tmp_Supplier_Address t_SA @@ -18054,7 +18054,7 @@ BEGIN ) ; END IF; - # id_region + -- id_region IF EXISTS ( SELECT * FROM tmp_Supplier_Address t_SA @@ -18087,7 +18087,7 @@ BEGIN ) ; END IF; - # duplicate + -- duplicate IF EXISTS (SELECT COUNT(*) FROM tmp_Supplier_Address t_SA GROUP BY t_SA.id_address HAVING COUNT(*) > 1) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -18297,7 +18297,7 @@ BEGIN WHERE GUID = a_guid; COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -18692,7 +18692,7 @@ BEGIN END IF; -- Returns - # Suppliers + -- Suppliers SELECT t_S.id_supplier, S.id_currency, @@ -18711,7 +18711,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Currency C ON S.id_currency = C.id_currency ; - # Supplier Addresses + -- Supplier Addresses SELECT t_S.id_supplier , SA.id_address @@ -18729,7 +18729,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Region R ON SA.id_region = R.id_region ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -18753,11 +18753,11 @@ DELIMITER ; /* CALL p_shop_get_many_supplier ( - 1 -- 'auth0|6582b95c895d09a70ba10fef' # a_id_user - , 1 # a_get_all_supplier - , 0 # a_get_inactive_supplier - , '' # a_ids_supplier - , 0 # a_debug + 1 -- 'auth0|6582b95c895d09a70ba10fef' -- a_id_user + , 1 -- a_get_all_supplier + , 0 -- a_get_inactive_supplier + , '' -- a_ids_supplier + , 0 -- a_debug ); */ @@ -19041,7 +19041,7 @@ BEGIN -- Validation -- Supplier Purchase Order - # id_order + -- id_order IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order t_SPO @@ -19070,7 +19070,7 @@ BEGIN AND ISNULL(SPO.id_stock) ; END IF; - # id_supplier_ordered + -- id_supplier_ordered IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order t_SPO @@ -19103,7 +19103,7 @@ BEGIN ) ; END IF; - # id_currency_cost + -- id_currency_cost IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order t_SPO @@ -19136,7 +19136,7 @@ BEGIN ) ; END IF; - # id_unit_quantity + -- id_unit_quantity IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order_Product_Link t_SPOPL @@ -19169,7 +19169,7 @@ BEGIN ) ; END IF; - # Invalid quantity ordered + -- Invalid quantity ordered IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order_Product_Link t_SPOPL @@ -19193,7 +19193,7 @@ BEGIN OR t_SPOPL.quantity_ordered <= 0 ; END IF; - # Invalid quantity received + -- Invalid quantity received IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order_Product_Link t_SPOPL @@ -19213,7 +19213,7 @@ BEGIN WHERE t_SPOPL.quantity_received < 0 ; END IF; - # Invalid delivery latency + -- Invalid delivery latency IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order_Product_Link t_SPOPL @@ -19581,7 +19581,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -19627,29 +19627,29 @@ INSERT INTO Shop_Supplier_Purchase_Order_Product_Link_Temp ( ) VALUES ( - 'NIPS', # guid - -1, # id_link, - -1, # id_order, - 1, # id_permutation, - 100, # cost_total_local, - 1, # id_currency_cost, - 1, # quantity_ordered, - 1, # id_unit_quantity, - 1, # quantity_received, - 14, # latency_delivery_days , - 1, # display_order - 1 # active + 'NIPS', -- guid + -1, -- id_link, + -1, -- id_order, + 1, -- id_permutation, + 100, -- cost_total_local, + 1, -- id_currency_cost, + 1, -- quantity_ordered, + 1, -- id_unit_quantity, + 1, -- quantity_received, + 14, -- latency_delivery_days , + 1, -- display_order + 1 -- active ) ; SELECT * FROM Shop_Supplier_Purchase_Order_Product_Link_Temp; CALL p_shop_save_supplier_purchase_order ( - 'NIPS', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - -1, # a_id_order - 1, # a_id_supplier_ordered - 1 # a_id_currency_cost + 'NIPS', -- a_guid + 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + -1, -- a_id_order + 1, -- a_id_supplier_ordered + 1 -- a_id_currency_cost ); SELECT * FROM Shop_Supplier_Purchase_Order_Product_Link_Temp; @@ -20216,7 +20216,7 @@ BEGIN -- Returns /* - # Suppliers + -- Suppliers SELECT t_S.id_supplier, S.name_company, @@ -20235,7 +20235,7 @@ BEGIN ; */ - # Supplier Purchase Order + -- Supplier Purchase Order SELECT t_SPO.id_order , SPO.id_supplier_ordered @@ -20258,7 +20258,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Currency C ON SPO.id_currency_cost = C.id_currency ; - # Supplier Purchase Order Product Link + -- Supplier Purchase Order Product Link SELECT SPOPL.id_link , SPOPL.id_order @@ -20284,7 +20284,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Product P ON PP.id_product = P.id_product ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -20313,17 +20313,17 @@ DELIMITER ; /* CALL p_shop_get_many_supplier_purchase_order ( - 1, # a_id_user - 1, # a_get_all_supplier - 0, # a_get_inactive_supplier - '', # a_ids_supplier - 1, # a_get_all_order - 0, # a_get_inactive_order - '', # a_ids_order - '', # a_ids_permutation - NULL, # a_date_from - NULL # a_date_to - , 0 # a_debug + 1, -- a_id_user + 1, -- a_get_all_supplier + 0, -- a_get_inactive_supplier + '', -- a_ids_supplier + 1, -- a_get_all_order + 0, -- a_get_inactive_order + '', -- a_ids_order + '', -- a_ids_permutation + NULL, -- a_date_from + NULL -- a_date_to + , 0 -- a_debug ); */ @@ -20619,7 +20619,7 @@ BEGIN -- Validation -- Manufacturing Purchase Order - # id_order + -- id_order IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order t_MPO @@ -20648,7 +20648,7 @@ BEGIN AND ISNULL(MPO.id_order) ; END IF; - # id_currency + -- id_currency IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order t_MPO @@ -20681,7 +20681,7 @@ BEGIN ) ; END IF; - # id_unit_quantity + -- id_unit_quantity IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -20714,7 +20714,7 @@ BEGIN ) ; END IF; - # Invalid quantity used + -- Invalid quantity used IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -20738,7 +20738,7 @@ BEGIN AND t_MPOPL.quantity_used <= 0 ; END IF; - # Invalid quantity produced + -- Invalid quantity produced IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -20762,7 +20762,7 @@ BEGIN AND t_MPOPL.quantity_produced < 0 ; END IF; - # id_unit_latency_manufacture + -- id_unit_latency_manufacture IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -20793,7 +20793,7 @@ BEGIN OR UM.active = 0 ; END IF; - # Invalid manufacture latency + -- Invalid manufacture latency IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -20814,7 +20814,7 @@ BEGIN ; END IF; - # Invalid costs excl VAT + -- Invalid costs excl VAT IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -20838,7 +20838,7 @@ BEGIN AND t_MPOPL.cost_unit_local_VAT_excl < 0 ; END IF; - # Invalid costs incl VAT + -- Invalid costs incl VAT IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -20863,7 +20863,7 @@ BEGIN ; END IF; - # Invalid prices excl VAT + -- Invalid prices excl VAT IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -20887,7 +20887,7 @@ BEGIN AND t_MPOPL.price_unit_local_VAT_excl < 0 ; END IF; - # Invalid prices incl VAT + -- Invalid prices incl VAT IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -21269,7 +21269,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -21315,18 +21315,18 @@ INSERT INTO Shop_Manufacturing_Purchase_Order_Product_Link_Temp ( ) VALUES ( - 'NIPS', # guid - -1, # id_link, - -1, # id_order, - 1, # id_permutation, - 100, # cost_total_local, - 1, # id_currency, - 1, # quantity_used, - 1, # id_unit_quantity, - 1, # quantity_produced, - 14, # latency_manufacture , - 1, # display_order - 1 # active + 'NIPS', -- guid + -1, -- id_link, + -1, -- id_order, + 1, -- id_permutation, + 100, -- cost_total_local, + 1, -- id_currency, + 1, -- quantity_used, + 1, -- id_unit_quantity, + 1, -- quantity_produced, + 14, -- latency_manufacture , + 1, -- display_order + 1 -- active ) ; @@ -21334,8 +21334,8 @@ SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp; CALL p_shop_save_manufacturing_purchase_order ( 'TEST SAVE' - , 'NIPS' # a_guid - , 1 -- 'auth0|6582b95c895d09a70ba10fef', # a_id_user + , 'NIPS' -- a_guid + , 1 -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user , 1 -- a_debug ); @@ -21801,7 +21801,7 @@ BEGIN -- Returns /* - # Manufacturings + -- Manufacturings SELECT t_S.id_manufacturing, S.name_company, @@ -21820,7 +21820,7 @@ BEGIN ; */ - # Manufacturing Purchase Order + -- Manufacturing Purchase Order SELECT t_MPO.id_order , MPO.id_currency @@ -21842,7 +21842,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Currency C ON MPO.id_currency = C.id_currency ; - # Manufacturing Purchase Order Product Link + -- Manufacturing Purchase Order Product Link SELECT MPOPL.id_link , MPOPL.id_order @@ -21868,7 +21868,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Product P ON PP.id_product = P.id_product ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -21895,14 +21895,14 @@ DELIMITER ; /* CALL p_shop_get_many_manufacturing_purchase_order ( - 0 # a_id_user - , 1 # a_get_all_order - , 1 # a_get_inactive_order - , '' # a_ids_order - , '' # a_ids_permutation - , NULL # a_date_from - , NULL # a_date_to - , 0 # a_debug + 0 -- a_id_user + , 1 -- a_get_all_order + , 1 -- a_get_inactive_order + , '' -- a_ids_order + , '' -- a_ids_permutation + , NULL -- a_date_from + , NULL -- a_date_to + , 0 -- a_debug ); @@ -22181,7 +22181,7 @@ BEGIN -- Returns -- SET v_now = NOW(); - # Errors + -- Errors SELECT * FROM tmp_Msg_Error ; @@ -22195,18 +22195,18 @@ DELIMITER ; /* CALL p_shop_save_customer ( - 'NIPS', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 'Initial Customer', # a_comment - '-1', # a_id_customer - 'good co', # a_name_company - 'teddy', # a_name_contact - 'manufacturing', # a_department_contact - 1, # a_id_address - 'BRING BRING', # a_phone_number - 'e@mail.com', # a_email - 1, # a_id_currency_cost - 1 # a_active + 'NIPS', -- a_guid + 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 'Initial Customer', -- a_comment + '-1', -- a_id_customer + 'good co', -- a_name_company + 'teddy', -- a_name_contact + 'manufacturing', -- a_department_contact + 1, -- a_id_address + 'BRING BRING', -- a_phone_number + 'e@mail.com', -- a_email + 1, -- a_id_currency_cost + 1 -- a_active ); SELECT * FROM Shop_Customer @@ -22225,11 +22225,11 @@ DELETE FROM Shop_Customer /* CALL p_shop_get_many_customer ( - '', # a_id_user - 1, # a_get_all_customer - 0, # a_get_inactive_customer - 0, # a_get_first_customer_only - '', # a_ids_customer + '', -- a_id_user + 1, -- a_get_all_customer + 0, -- a_get_inactive_customer + 0, -- a_get_first_customer_only + '', -- a_ids_customer ); */ @@ -22254,11 +22254,11 @@ BEGIN DECLARE v_code_error_type_bad_data VARCHAR(50); DECLARE v_has_filter_customer BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); - # DECLARE v_ids_permutation_unavailable VARCHAR(4000); + -- DECLARE v_id_user VARCHAR(100); + -- DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_customer INT; - # DECLARE v_ids_product_permission VARCHAR(4000); - # DECLARE v_ids_permutation_permission VARCHAR(4000); + -- DECLARE v_ids_product_permission VARCHAR(4000); + -- DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_id_access_level_view INT; DECLARE v_now DATETIME; DECLARE v_id_minimum INT; @@ -22382,7 +22382,7 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_customer := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_CUSTOMER' LIMIT 1); -- SELECT v_guid, a_id_user, false, v_id_permission_product, v_id_access_level_view, v_ids_permutation_permission; @@ -22415,7 +22415,7 @@ BEGIN -- Returns -- SET v_now := NOW(); - # customers + -- customers SELECT t_C.id_customer, C.name_company, @@ -22430,7 +22430,7 @@ BEGIN INNER JOIN Shop_Customer C ON t_C.id_customer = C.id_customer ; - # Errors + -- Errors SELECT /* t_ME.display_order, @@ -22449,7 +22449,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_category, @@ -22464,8 +22464,8 @@ BEGIN ; */ - # select 'other outputs'; - # select * from tmp_Shop_Product; + -- select 'other outputs'; + -- select * from tmp_Shop_Product; -- Clean up DROP TABLE IF EXISTS tmp_Shop_Customer; @@ -22479,11 +22479,11 @@ DELIMITER ; /* CALL p_shop_get_many_customer ( - '', # a_id_user - 1, # a_get_all_customer - 0, # a_get_inactive_customer - 0, # a_get_first_customer_only - '' # a_ids_customer + '', -- a_id_user + 1, -- a_get_all_customer + 0, -- a_get_inactive_customer + 0, -- a_get_first_customer_only + '' -- a_ids_customer ); SELECT * @@ -22599,7 +22599,7 @@ BEGIN -- Argument validation - # User ID + -- User ID IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_id_user) OR NOT EXISTS (SELECT * FROM Shop_User WHERE id_user = a_id_user) THEN INSERT INTO tmp_Msg_Error ( @@ -22611,7 +22611,7 @@ BEGIN END IF; END IF; - # Order ID + -- Order ID IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_id_order) OR ((a_id_order > 0) AND NOT EXISTS (SELECT * FROM Shop_Customer_Sales_Order WHERE id_order = a_id_order)) THEN INSERT INTO tmp_Msg_Error ( @@ -22623,7 +22623,7 @@ BEGIN END IF; END IF; - # Customer ID + -- Customer ID IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_id_customer) OR NOT EXISTS (SELECT * FROM Shop_Customer WHERE id_customer = a_id_customer) THEN INSERT INTO tmp_Msg_Error ( @@ -22635,7 +22635,7 @@ BEGIN END IF; END IF; - # Currency ID + -- Currency ID IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_id_currency_price) OR NOT EXISTS (SELECT * FROM Shop_Currency WHERE id_currency = a_id_currency_price) THEN INSERT INTO tmp_Msg_Error ( @@ -22647,7 +22647,7 @@ BEGIN END IF; END IF; - # Comment + -- Comment IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_comment) OR TRIM(a_comment) = '' THEN INSERT INTO tmp_Msg_Error ( @@ -22962,26 +22962,26 @@ BEGIN END IF; -- Returns - # SET v_now = NOW(); + -- SET v_now = NOW(); - # Supplier Purchase Orders + -- Supplier Purchase Orders SELECT * FROM Shop_Customer_Sales_Order WHERE id_order = a_id_order ; - # Supplier Purchase Order Product Links + -- Supplier Purchase Order Product Links SELECT * FROM Shop_Customer_Sales_Order_Product_Link WHERE id_order = a_id_order ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error ; - # DROP TABLE tmp_Shop_Customer_Sales_Order; + -- DROP TABLE tmp_Shop_Customer_Sales_Order; DROP TABLE tmp_Shop_Customer_Sales_Order_Product_Link; DROP TABLE tmp_Msg_Error; END // @@ -23012,31 +23012,31 @@ INSERT INTO Shop_Customer_Sales_Order_Product_Link_Temp ( ) VALUES ( - 'NIPS', # guid - -1, # id_link, - -1, # id_order, - 1, # id_permutation, - 100, # price_total_local, - 1, # id_currency_price, - 1, # quantity_ordered, - 1, # id_unit_quantity, - 1, # quantity_delivered, - 14, # latency_delivery_days , - 1, # display_order - 1 # active + 'NIPS', -- guid + -1, -- id_link, + -1, -- id_order, + 1, -- id_permutation, + 100, -- price_total_local, + 1, -- id_currency_price, + 1, -- quantity_ordered, + 1, -- id_unit_quantity, + 1, -- quantity_delivered, + 14, -- latency_delivery_days , + 1, -- display_order + 1 -- active ) ; SELECT * FROM Shop_Customer_Sales_Order_Product_Link_Temp; CALL p_shop_save_customer_sales_order ( - 'NIPS', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 'Initial customer', # a_comment - -1, # a_id_order - 4, # a_id_customer - 1, # a_id_currency_price - 1 # a_active + 'NIPS', -- a_guid + 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 'Initial customer', -- a_comment + -1, -- a_id_order + 4, -- a_id_customer + 1, -- a_id_currency_price + 1 -- a_active ); SELECT * FROM Shop_Customer_Sales_Order_Product_Link_Temp; @@ -23092,11 +23092,11 @@ BEGIN DECLARE v_has_filter_date_from BIT; DECLARE v_has_filter_date_to BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); - # DECLARE v_ids_permutation_unavailable VARCHAR(4000); + -- DECLARE v_id_user VARCHAR(100); + -- DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_ids_permission_customer_purchase_order VARCHAR(4000); DECLARE v_ids_product_permission VARCHAR(4000); - # DECLARE v_ids_permutation_permission VARCHAR(4000); + -- DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_id_access_level_view INT; -- DECLARE v_now DATETIME; -- DECLARE v_id_minimum INT; @@ -23250,7 +23250,7 @@ BEGIN display_order_category INT NOT NULL, display_order_product INT NOT NULL, display_order_permutation INT NULL, - rank_permutation INT NOT NULL, # _in_category + rank_permutation INT NOT NULL, -- _in_category -- name VARCHAR(255) NOT NULL, -- description VARCHAR(4000) NOT NULL, /* @@ -23476,7 +23476,7 @@ BEGIN C.display_order AS display_order_category, P.display_order AS display_order_product, PP.display_order AS display_order_permutation - -- RANK() OVER (ORDER BY C.display_order, P.display_order, PP.display_order) AS rank_permutation, #PARTITION BY P.id_category # _in_category + -- RANK() OVER (ORDER BY C.display_order, P.display_order, PP.display_order) AS rank_permutation, --PARTITION BY P.id_category -- _in_category /* P.name, PP.description, @@ -23502,7 +23502,7 @@ BEGIN INNER JOIN Shop_Product_Category C ON P.id_category = C.id_category WHERE - # permutations + -- permutations ( ( NOT v_has_filter_permutation @@ -23513,7 +23513,7 @@ BEGIN OR PP.active = 1 ) ) - # categories + -- categories AND ( ( NOT v_has_filter_category @@ -23524,7 +23524,7 @@ BEGIN OR C.active = 1 ) ) - # products + -- products AND ( ( NOT v_has_filter_product @@ -23581,7 +23581,7 @@ BEGIN LEFT JOIN tmp_Shop_Product t_P ON CSOPL.id_permutation = t_P.id_permutation LEFT JOIN tmp_Shop_Customer t_S ON CSO.id_customer = t_S.id_customer WHERE - # customer + -- customer /* ( a_get_all_customer = 1 @@ -23589,15 +23589,15 @@ BEGIN ) */ NOT ISNULL(t_S.id_customer) - # order + -- order AND ( ( a_get_all_order = 1 OR ( - # ID + -- ID -- FIND_IN_SET(CSO.id_order, a_ids_order) > 0 NOT ISNULL(S_T.substring) - # date + -- date AND ( ( v_has_filter_date_from = 0 @@ -23610,13 +23610,13 @@ BEGIN ) ) ) - # active + -- active AND ( a_get_inactive_order OR CSO.active = 1 ) ) - # permutations + -- permutations AND ( ( v_has_filter_category = 0 @@ -23643,7 +23643,7 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_ids_permission_customer_purchase_order := (SELECT GROUP_CONCAT(id_permission SEPARATOR ',') FROM Shop_Permission WHERE code IN ('STORE_customer', 'STORE_customer_PURCHASE_ORDER')); -- SET v_ids_permutation_permission := (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') FROM tmp_Shop_Product WHERE NOT ISNULL(id_permutation)); SET v_ids_product_permission := (SELECT GROUP_CONCAT(P.id_product SEPARATOR ',') FROM (SELECT DISTINCT id_product FROM tmp_Shop_Product WHERE NOT ISNULL(id_product)) P); @@ -23682,8 +23682,8 @@ BEGIN t_P.can_admin = UE_T.can_admin ; - # CALL p_shop_clear_calc_user(v_guid); - # DROP TABLE IF EXISTS Shop_Calc_User_Temp; + -- CALL p_shop_clear_calc_user(v_guid); + -- DROP TABLE IF EXISTS Shop_Calc_User_Temp; DELETE FROM Shop_Calc_User_Temp WHERE GUID = v_guid ; @@ -23696,7 +23696,7 @@ BEGIN -- Returns -- SET v_now := NOW(); - # customers + -- customers SELECT t_S.id_customer, S.name_company, @@ -23712,8 +23712,8 @@ BEGIN ON t_S.id_customer = S.id_customer ; - # Customer Sales Order - SELECT # * + -- Customer Sales Order + SELECT -- * t_CSO.id_order, CSO.id_customer, CSO.price_total_local, @@ -23723,7 +23723,7 @@ BEGIN INNER JOIN tmp_Shop_Customer_Sales_Order t_CSO ON CSO.id_order = t_CSO.id_order ; - # Customer Sales Order Product Link + -- Customer Sales Order Product Link SELECT CSOPL.id_link, CSOPL.id_order, @@ -23745,7 +23745,7 @@ BEGIN ORDER BY CSOPL.id_order, C.display_order, P.display_order, PP.display_order ; - # Errors + -- Errors SELECT /* t_ME.display_order, @@ -23764,7 +23764,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_category, @@ -23779,8 +23779,8 @@ BEGIN ; */ - # select 'other outputs'; - # select * from tmp_Shop_Product; + -- select 'other outputs'; + -- select * from tmp_Shop_Product; -- Clean up DROP TABLE IF EXISTS tmp_Shop_Customer_Sales_Order_Product_Link; @@ -23798,23 +23798,23 @@ DELIMITER ; /* CALL p_shop_get_many_customer_sales_order ( - '', # a_id_user - 1, # a_get_all_customer - 0, # a_get_inactive_customer - 0, # a_get_first_customer_only - '', # a_ids_customer - 1, # a_get_all_order - 0, # a_get_inactive_order - 0, # a_get_first_order_only - '', # a_ids_order - 0, # a_get_inactive_category - '', # a_ids_category - 0, # a_get_inactive_product - '', # a_ids_product - 0, # a_get_inactive_permutation - '', # a_ids_permutation - NULL, # a_date_from - NULL # a_date_to + '', -- a_id_user + 1, -- a_get_all_customer + 0, -- a_get_inactive_customer + 0, -- a_get_first_customer_only + '', -- a_ids_customer + 1, -- a_get_all_order + 0, -- a_get_inactive_order + 0, -- a_get_first_order_only + '', -- a_ids_order + 0, -- a_get_inactive_category + '', -- a_ids_category + 0, -- a_get_inactive_product + '', -- a_ids_product + 0, -- a_get_inactive_permutation + '', -- a_ids_permutation + NULL, -- a_date_from + NULL -- a_date_to ); select * from shop_image; @@ -23852,7 +23852,7 @@ BEGIN */ -# Access Levels +-- Access Levels INSERT INTO Shop_Access_Level ( display_order, code, name, priority ) @@ -23862,7 +23862,7 @@ VALUES (3, 'ADMIN', 'Admin', 1) ; -# Error Message Types +-- Error Message Types INSERT INTO Shop_Msg_Error_Type ( code, name, description ) @@ -23874,7 +23874,7 @@ VALUES , ('WARNING', 'Warning', 'Non-breaking error.') ; -# File Types +-- File Types INSERT INTO File_Type ( code, name, extension ) @@ -23885,7 +23885,7 @@ VALUES ('MPEG-4', 'Multimedia Photographic Export Group 4', 'mp4') ; -# Generic / shared properties +-- Generic / shared properties INSERT INTO Shop_General ( quantity_max ) @@ -23893,7 +23893,7 @@ VALUES ( 10 ); -# Image types +-- Image types INSERT INTO Shop_Image_Type ( display_order, code, name, name_plural ) @@ -23903,7 +23903,7 @@ VALUES (3, 'THUMBNAIL', 'Thumbnail Image', 'Thumbnail Images') ; -# Regions +-- Regions INSERT INTO Shop_Region ( display_order, code, name ) @@ -23912,7 +23912,7 @@ VALUES ; /* -# Region Branches +-- Region Branches INSERT INTO Shop_Region_Branch ( display_order, id_region_parent, id_region_child ) @@ -23921,7 +23921,7 @@ VALUES ; */ -# Addresses +-- Addresses INSERT INTO Shop_Address ( id_region, postcode, address_line_1, address_line_2, city, county ) @@ -23929,7 +23929,7 @@ VALUES ( 1, 'CV22 6DN', '53 Alfred Green Close', '', 'Rugby', 'Warwickshire' ); -# Plants +-- Plants INSERT INTO Shop_Plant ( code, name, id_address, id_user_manager ) @@ -23937,7 +23937,7 @@ VALUES ('MAIN', 'Main Plant', 1, 1) ; -# Storage Locations +-- Storage Locations INSERT INTO Shop_Storage_Location ( id_plant, code, name ) @@ -24018,7 +24018,7 @@ VALUES ; /* -# Storage Location Branches +-- Storage Location Branches INSERT INTO Shop_Storage_Location_Branch ( id_location_parent, id_location_child ) @@ -24027,7 +24027,7 @@ VALUES ; */ -# Currency +-- Currency INSERT INTO Shop_Currency ( display_order, code, name, symbol, factor_from_GBP ) @@ -24036,7 +24036,7 @@ VALUES (2, 'EUR', 'Euro', '€', 1.17) ; -# Taxes and Surcharges +-- Taxes and Surcharges INSERT INTO Shop_Tax_Or_Surcharge ( display_order, id_tax, @@ -24054,7 +24054,7 @@ VALUES (1, 1, 'VAT', 'Value Added Tax', 1, 1, 0, 0.2, 1, 0, 1) ; -# Unit of Measurement +-- Unit of Measurement INSERT INTO Shop_Unit_Measurement ( name_singular, name_plural, symbol, is_base_unit, is_unit_of_distance, is_unit_of_mass, is_unit_of_time, is_unit_of_volume ) @@ -24070,7 +24070,7 @@ VALUES , ('day', 'days', 'd', 0, 0, 0, 1, 0) ; -# Unit of Measurement Conversion +-- Unit of Measurement Conversion INSERT INTO Shop_Unit_Measurement_Conversion ( id_unit_derived , id_unit_base @@ -24115,7 +24115,7 @@ VALUES ; -# Categories +-- Categories INSERT INTO Shop_Product_Category ( display_order, code, @@ -24131,7 +24131,7 @@ VALUES ; /* -# Recurrence Interval +-- Recurrence Interval INSERT INTO Shop_Interval_Recurrence ( code, name, name_plural ) @@ -24142,7 +24142,7 @@ VALUES ; */ -# Products +-- Products INSERT INTO Shop_Product ( display_order, id_category, @@ -24194,7 +24194,7 @@ VALUES ) ; -# Product Permutations +-- Product Permutations INSERT INTO Shop_Product_Permutation ( -- display_order, id_permutation_temp, @@ -24204,7 +24204,7 @@ INSERT INTO Shop_Product_Permutation ( cost_local_VAT_incl, id_currency_cost, profit_local_min, - # id_currency_profit_min, + -- id_currency_profit_min, latency_manufacture, id_unit_measurement_quantity, count_unit_measurement_per_quantity_step, @@ -24230,7 +24230,7 @@ VALUES 6, 1, 3, - # 1, + -- 1, 14, 1, 1, @@ -24255,7 +24255,7 @@ VALUES 7.2, 1, 4, - # 1, + -- 1, 14, 1, 1, @@ -24280,7 +24280,7 @@ VALUES 12, 1, 5, - # 1, + -- 1, 14, 1, 1, @@ -24305,7 +24305,7 @@ VALUES 12, 1, 5, - # 1, + -- 1, 14, 1, 1, @@ -24330,7 +24330,7 @@ VALUES 12, 1, 5, - # 1, + -- 1, 14, 1, 1, @@ -24355,7 +24355,7 @@ VALUES 12, 1, 5, - # 1, + -- 1, 14, 1, 1, @@ -24373,7 +24373,7 @@ VALUES ) ; -# Variation Types +-- Variation Types INSERT INTO Shop_Variation_Type ( display_order, code, name, name_plural ) @@ -24382,7 +24382,7 @@ VALUES , (2, 'SIZE', 'Size', 'Sizes') ; -# Variations +-- Variations INSERT INTO Shop_Variation ( display_order, id_type, code, name, id_unit_measurement, count_unit_measurement ) @@ -24515,7 +24515,7 @@ WHERE V.id_type = 2 ; -# Product Permutation Variation Links +-- Product Permutation Variation Links INSERT INTO Shop_Product_Permutation_Variation_Link ( display_order, id_permutation, id_variation ) @@ -24524,7 +24524,7 @@ VALUES (2, 2, 2) ; -# Stock items +-- Stock items INSERT INTO Shop_Stock_Item ( id_permutation , date_purchased @@ -24543,7 +24543,7 @@ VALUES (6, NOW(), 1, 1, 10, 8.4, '2030-09-05 00:00:00') ; -# Product Price +-- Product Price INSERT INTO Shop_Product_Price ( id_permutation , id_currency @@ -24561,7 +24561,7 @@ VALUES (6, 1, 1, 180, 150) ; -# Product Images +-- Product Images INSERT INTO Shop_Product_Image ( display_order, id_permutation, @@ -24570,16 +24570,16 @@ INSERT INTO Shop_Product_Image ( ) VALUES (1, 1, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), - # (1, 1, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), + -- (1, 1, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), (2, 2, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), - # (1, 2, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg') + -- (1, 2, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg') (3, 3, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), (4, 4, 1, '/static/images/prod_.jpg'), (5, 5, 1, '/static/images/prod_1.jpg'), (6, 6, 1, '/static/images/prod_2.jpg') ; -# Delivery Options +-- Delivery Options INSERT INTO Shop_Delivery_Option ( display_order, code, name, latency_delivery_min, latency_delivery_max ) @@ -24588,7 +24588,7 @@ VALUES (2, 'SIGNED_1', 'First Class Signed-For', 2, 4) ; -# Product Delivery Option Links +-- Product Delivery Option Links INSERT INTO Shop_Product_Permutation_Delivery_Option_Link ( display_order, id_product, id_permutation, id_delivery_option, id_region, id_currency, price_local, quantity_min, quantity_max ) @@ -24601,7 +24601,7 @@ VALUES (6, 5, 6, 1, 1, 1, 10, 0, 1) ; -# Discounts +-- Discounts INSERT INTO Shop_Discount ( id_product, id_permutation, @@ -24619,7 +24619,7 @@ VALUES (1, 2, 'CRIMBO50', 'Christmas 50% off sale!', 0.5, 3, 9, NOW(), '2023-12-31 23:59:59', 1) ; -# Discount Delivery Region Currency Links +-- Discount Delivery Region Currency Links INSERT INTO Shop_Discount_Region_Currency_Link ( id_discount, id_region, @@ -24633,7 +24633,7 @@ VALUES ; -# Permission Groups +-- Permission Groups INSERT INTO Shop_Permission_Group ( display_order, code, name ) @@ -24649,7 +24649,7 @@ VALUES select * from Shop_Permission select * from Shop_Role_Permission_Link */ -# Permissions +-- Permissions INSERT INTO Shop_Permission ( display_order, code, name, id_permission_group, id_access_level_required ) @@ -24667,7 +24667,7 @@ VALUES (99, 'CONTACT_US', 'Contact Us Page', 2, 1) ; -# Roles +-- Roles INSERT INTO Shop_Role ( display_order, code, @@ -24678,7 +24678,7 @@ VALUES (2, 'USER', 'User') ; -# Role Permission link +-- Role Permission link INSERT INTO Shop_Role_Permission_Link ( id_role, id_permission, id_access_level ) @@ -24701,7 +24701,7 @@ VALUES (2, 5, 1) ; -# Users +-- Users INSERT INTO Shop_User ( id_user_auth0 , firstname @@ -24737,7 +24737,7 @@ VALUES ) ; -# User Role link +-- User Role link INSERT INTO Shop_User_Role_Link ( id_user, id_role ) @@ -24745,7 +24745,7 @@ VALUES (1, 1) ; -# User Addresses +-- User Addresses INSERT INTO Shop_User_Address ( id_user, id_region, name_full, phone_number, postcode, address_line_1, address_line_2, city, county ) @@ -24753,7 +24753,7 @@ SELECT U.id_user, 1, CONCAT(U.firstname, ' ', U.surname), '07375 571430', 'CV22 FROM Shop_User U ; -# User Basket +-- User Basket INSERT INTO Shop_User_Basket ( id_user, id_product, @@ -24764,7 +24764,7 @@ VALUES (1, 1, 1, 69) ; -# User Order Status +-- User Order Status INSERT INTO Shop_User_Order_Status ( display_order, code, name, name_plural ) @@ -24774,7 +24774,7 @@ VALUES ; /* -# User Order +-- User Order INSERT INTO Shop_User_Order ( id_user, value_total, id_order_status, id_checkout_session, id_currency ) @@ -24783,7 +24783,7 @@ VALUES (1, 25, 1, 'noods', 1) ; -# User Order Product Link +-- User Order Product Link INSERT INTO Shop_User_Order_Product_Link ( id_order, id_product, id_permutation, quantity ) @@ -24794,7 +24794,7 @@ VALUES ; */ -# Supplier +-- Supplier INSERT INTO Shop_Supplier ( id_supplier_temp , name_company @@ -24822,7 +24822,7 @@ VALUES ) ; -# Suppliers +-- Suppliers INSERT INTO Shop_Supplier ( id_supplier_temp , name_company @@ -24862,7 +24862,7 @@ VALUES ) ; -# Supplier Addresses +-- Supplier Addresses INSERT INTO Shop_Supplier_Address ( id_supplier , id_region @@ -24897,14 +24897,14 @@ VALUES ; /* -# Supplier Purchase Order +-- Supplier Purchase Order INSERT INTO Shop_Supplier_Purchase_Order ( id_supplier, value_total, id_order_status, id_checkout_session, id_currency ) VALUES ; -# Supplier Purchase Order Product Link +-- Supplier Purchase Order Product Link INSERT INTO Shop_Supplier_Purchase_Order_Product_Link ( id_order, id_permutation, cost_total_local, id_currency_cost, quantity_ordered, id_unit_quantity, quantity_received, latency_delivery, display_order ) @@ -24913,14 +24913,14 @@ VALUES */ /* -# Manufacturing Purchase Order +-- Manufacturing Purchase Order INSERT INTO Shop_Manufacturing_Purchase_Order ( cost_total_local, id_currency_cost ) VALUES ; -# Manufacturing Purchase Order Product Link +-- Manufacturing Purchase Order Product Link INSERT INTO Shop_Manufacturing_Purchase_Order_Product_Link ( id_order, id_permutation, cost_total_local, id_currency_cost, quantity_used, id_unit_quantity, quantity_produced, latency_manufacturing_days, display_order ) @@ -24929,7 +24929,7 @@ VALUES */ /* -# Customer +-- Customer INSERT INTO Shop_Customer ( name_company, name_contact, department_contact, id_address, phone_number, email, id_currency ) @@ -24939,14 +24939,14 @@ VALUES */ /* -# Customer Sales Order +-- Customer Sales Order INSERT INTO Shop_Customer_Sales_Order ( cost_total_local, id_currency_cost ) VALUES ; -# Customer Sales Order Product Link +-- Customer Sales Order Product Link INSERT INTO Shop_Customer_Sales_Order_Product_Link ( id_order, id_permutation, cost_total_local, id_currency_cost, quantity_ordered, id_unit_quantity, quantity_delivered, latency_delivery_days, display_order ) @@ -24974,207 +24974,207 @@ DROP PROCEDURE IF EXISTS p_populate_database; -# Product Change Sets +-- Product Change Sets SELECT * FROM Shop_Product_Change_Set; -# User Change Sets +-- User Change Sets SELECT * FROM Shop_User_Change_Set; -# User Change Sets +-- User Change Sets SELECT * FROM Shop_Sales_And_Purchasing_Change_Set; -# Access Levels +-- Access Levels SELECT * FROM Shop_Access_Level; SELECT * FROM Shop_Access_Level_Audit; -# Error Message type +-- Error Message type SELECT * FROM Shop_Msg_Error_Type; -# File Types +-- File Types SELECT * FROM File_Type; SELECT * FROM File_Type_Audit; -# Generic / shared properties +-- Generic / shared properties SELECT * FROM Shop_General; SELECT * FROM Shop_General_Audit; -# Image Types +-- Image Types SELECT * FROM Shop_Image_Type; SELECT * FROM Shop_Image_Type_Audit; -# Regions +-- Regions SELECT * FROM Shop_Region; SELECT * FROM Shop_Region_Audit; -# Region branches +-- Region branches SELECT * FROM Shop_Region_Branch; SELECT * FROM Shop_Region_Branch_Audit; -# Plants +-- Plants SELECT * FROM Shop_Plant; SELECT * FROM Shop_Plant_Audit; -# Storage Locations +-- Storage Locations SELECT * FROM Shop_Storage_Location; SELECT * FROM Shop_Storage_Location_Audit; -# Storage Location branches +-- Storage Location branches SELECT * FROM Shop_Storage_Location_Branch; SELECT * FROM Shop_Storage_Location_Branch_Audit; -# Currencies +-- Currencies SELECT * FROM Shop_Currency; SELECT * FROM Shop_Currency_Audit; -# Taxes and Surcharges +-- Taxes and Surcharges SELECT * FROM Shop_Tax_Or_Surcharge; SELECT * FROM Shop_Tax_Or_Surcharge_Audit; -# Unit of Measurement +-- Unit of Measurement SELECT * FROM Shop_Unit_Measurement; SELECT * FROM Shop_Unit_Measurement_Audit; -# Unit of Measurement Conversion +-- Unit of Measurement Conversion SELECT * FROM Shop_Unit_Measurement_Conversion; SELECT * FROM Shop_Unit_Measurement_Conversion_Audit; /* -# Recurrence Interval +-- Recurrence Interval SELECT * FROM Shop_Interval_Recurrence; SELECT * FROM Shop_Interval_Recurrence_Audit; */ -# Categories +-- Categories SELECT * FROM Shop_Product_Category; SELECT * FROM Shop_Product_Category_Audit; -# Products +-- Products SELECT * FROM Shop_Product; SELECT * FROM Shop_Product_Audit; -# Permutations +-- Permutations SELECT * FROM Shop_Product_Permutation; SELECT * FROM Shop_Product_Permutation_Audit; -# Variation Types +-- Variation Types SELECT * FROM Shop_Variation_Type; SELECT * FROM Shop_Variation_Type_Audit; -# Variations +-- Variations SELECT * FROM Shop_Variation; SELECT * FROM Shop_Variation_Audit; -# Permutation Variation Links +-- Permutation Variation Links SELECT * FROM Shop_Product_Permutation_Variation_Link; SELECT * FROM Shop_Product_Permutation_Variation_Link_Audit; -# Stock Items +-- Stock Items SELECT * FROM Shop_Stock_Item; SELECT * FROM Shop_Stock_Item_Audit; -# Product Currency Links +-- Product Currency Links SELECT * FROM Shop_Product_Price; SELECT * FROM Shop_Product_Price; -# Images +-- Images SELECT * FROM Shop_Product_Image; SELECT * FROM Shop_Product_Image_Audit; -# Delivery Option Types +-- Delivery Option Types SELECT * FROM Shop_Delivery_Option; SELECT * FROM Shop_Delivery_Option_Audit; -# Delivery Options +-- Delivery Options SELECT * FROM Shop_Product_Permutation_Delivery_Option_Link; SELECT * FROM Shop_Product_Permutation_Delivery_Option_Link_Audit; -# Discounts +-- Discounts SELECT * FROM Shop_Discount; SELECT * FROM Shop_Discount_Audit; -# Discount Delivery Region Links +-- Discount Delivery Region Links SELECT * FROM Shop_Discount_Region_Currency_Link; SELECT * FROM Shop_Discount_Region_Currency_Link_Audit; -# Permission Groups +-- Permission Groups SELECT * FROM Shop_Permission_Group; SELECT * FROM Shop_Permission_Group_Audit; -# Permissions +-- Permissions SELECT * FROM Shop_Permission; SELECT * FROM Shop_Permission_Audit; -# Roles +-- Roles SELECT * FROM Shop_Role; SELECT * FROM Shop_Role_Audit; -# Role Permission link +-- Role Permission link SELECT * FROM Shop_Role_Permission_Link; SELECT * FROM Shop_Role_Permission_Link_Audit; -# Users +-- Users SELECT * FROM Shop_User; SELECT * FROM Shop_User_Audit; -# User Role link +-- User Role link SELECT * FROM Shop_User_Role_Link; SELECT * FROM Shop_User_Role_Link_Audit; -# Addresses +-- Addresses SELECT * FROM Shop_Address; SELECT * FROM Shop_Address_Audit; -# Basket +-- Basket SELECT * FROM Shop_User_Basket; SELECT * FROM Shop_User_Basket_Audit; -# Order Statuses +-- Order Statuses SELECT * FROM Shop_User_Order_Status; SELECT * FROM Shop_User_Order_Status_Audit; /* -# Orders +-- Orders SELECT * FROM Shop_User_Order; SELECT * FROM Shop_User_Order_Audit; -# Order Products +-- Order Products SELECT * FROM Shop_User_Order_Product_Link; SELECT * FROM Shop_User_Order_Product_Link_Audit; */ -# Supplier +-- Supplier SELECT * FROM Shop_Supplier; SELECT * FROM Shop_Supplier_Audit; -# Supplier Purchase Order +-- Supplier Purchase Order SELECT * FROM Shop_Supplier_Purchase_Order; SELECT * FROM Shop_Supplier_Purchase_Order_Audit; -# Supplier Purchase Order Product Link +-- Supplier Purchase Order Product Link SELECT * FROM Shop_Supplier_Purchase_Order_Product_Link; SELECT * FROM Shop_Supplier_Purchase_Order_Product_Link_Audit; -# Manufacturing Purchase Order +-- Manufacturing Purchase Order SELECT * FROM Shop_Manufacturing_Purchase_Order; SELECT * FROM Shop_Manufacturing_Purchase_Order_Audit; -# Manufacturing Purchase Order Product Link +-- Manufacturing Purchase Order Product Link SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link; SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link_Audit; -# Customers +-- Customers SELECT * FROM Shop_Customer; SELECT * FROM Shop_Customer_Audit; -# Customer Sales Order +-- Customer Sales Order SELECT * FROM Shop_Customer_Sales_Order; SELECT * FROM Shop_Customer_Sales_Order_Audit; -# Customer Sales Order Product Link +-- Customer Sales Order Product Link SELECT * FROM Shop_Customer_Sales_Order_Product_Link; SELECT * FROM Shop_Customer_Sales_Order_Product_Link_Audit; diff --git a/static/MySQL/0001_destroy.sql b/static/MySQL/0001_destroy.sql index 512ca56d..1bd79699 100644 --- a/static/MySQL/0001_destroy.sql +++ b/static/MySQL/0001_destroy.sql @@ -3,7 +3,7 @@ -# Drop dependencies +-- Drop dependencies DROP TABLE IF EXISTS tmp_Shop_Calc_User; DROP TABLE IF EXISTS tmp_Product_Calc_User; DROP TABLE IF EXISTS tmp_Product_p_Shop_User_Eval; @@ -55,7 +55,7 @@ DROP TABLE IF EXISTS tmp_Shop_Customer_Sale_Order; DROP TABLE IF EXISTS tmp_Get_Variation_From_Csv_Variations; -# Delete old tables +-- Delete old tables DROP TABLE IF EXISTS Split_Temp; DROP TABLE IF EXISTS Split_Key_Value_Pair_Csv_Temp; DROP TABLE IF EXISTS Split_Key_Value_Pair_Temp; diff --git a/static/MySQL/1000_tbl_Shop_Product_Change_Set.sql b/static/MySQL/1000_tbl_Shop_Product_Change_Set.sql index 831dae2d..a00a728e 100644 --- a/static/MySQL/1000_tbl_Shop_Product_Change_Set.sql +++ b/static/MySQL/1000_tbl_Shop_Product_Change_Set.sql @@ -1,5 +1,5 @@ -# Product Change Sets +-- Product Change Sets diff --git a/static/MySQL/1000_tbl_Split_Temp.sql b/static/MySQL/1000_tbl_Split_Temp.sql index b7da37a5..27eae56b 100644 --- a/static/MySQL/1000_tbl_Split_Temp.sql +++ b/static/MySQL/1000_tbl_Split_Temp.sql @@ -1,5 +1,5 @@ -# Split Staging +-- Split Staging -- USE partsltd_prod; -- DROP TABLE IF EXISTS Split_Temp; diff --git a/static/MySQL/1001_tbl_Shop_User_Change_Set.sql b/static/MySQL/1001_tbl_Shop_User_Change_Set.sql index ac34c635..b9916cb6 100644 --- a/static/MySQL/1001_tbl_Shop_User_Change_Set.sql +++ b/static/MySQL/1001_tbl_Shop_User_Change_Set.sql @@ -1,5 +1,5 @@ -# User Change Sets +-- User Change Sets diff --git a/static/MySQL/1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql b/static/MySQL/1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql index 75275214..608a0d68 100644 --- a/static/MySQL/1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql +++ b/static/MySQL/1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql @@ -1,5 +1,5 @@ -# Split Key Value Pair CSV Staging +-- Split Key Value Pair CSV Staging -- USE partsltd_prod; -- DROP TABLE IF EXISTS Split_Temp; diff --git a/static/MySQL/1002_tbl_Shop_Sales_And_Purchasing_Change_Set.sql b/static/MySQL/1002_tbl_Shop_Sales_And_Purchasing_Change_Set.sql index 4e6630a4..04a664ee 100644 --- a/static/MySQL/1002_tbl_Shop_Sales_And_Purchasing_Change_Set.sql +++ b/static/MySQL/1002_tbl_Shop_Sales_And_Purchasing_Change_Set.sql @@ -1,5 +1,5 @@ -# Sales And Purchasing Change Sets +-- Sales And Purchasing Change Sets diff --git a/static/MySQL/1003_tbl_Shop_Access_Level.sql b/static/MySQL/1003_tbl_Shop_Access_Level.sql index 18c0ce7f..133f791a 100644 --- a/static/MySQL/1003_tbl_Shop_Access_Level.sql +++ b/static/MySQL/1003_tbl_Shop_Access_Level.sql @@ -1,5 +1,5 @@ -# Access Levels +-- Access Levels diff --git a/static/MySQL/1004_tbl_Shop_Access_Level_Audit.sql b/static/MySQL/1004_tbl_Shop_Access_Level_Audit.sql index bb55d33d..ca1b8cf1 100644 --- a/static/MySQL/1004_tbl_Shop_Access_Level_Audit.sql +++ b/static/MySQL/1004_tbl_Shop_Access_Level_Audit.sql @@ -1,5 +1,5 @@ -# Access Level Audits +-- Access Level Audits diff --git a/static/MySQL/1005_tbl_Msg_Error_Type.sql b/static/MySQL/1005_tbl_Msg_Error_Type.sql index f82879e4..ca61049e 100644 --- a/static/MySQL/1005_tbl_Msg_Error_Type.sql +++ b/static/MySQL/1005_tbl_Msg_Error_Type.sql @@ -1,5 +1,5 @@ -# Error Message Type +-- Error Message Type diff --git a/static/MySQL/1010_tbl_File_Type.sql b/static/MySQL/1010_tbl_File_Type.sql index 7063b499..64338624 100644 --- a/static/MySQL/1010_tbl_File_Type.sql +++ b/static/MySQL/1010_tbl_File_Type.sql @@ -1,5 +1,5 @@ -# File Types +-- File Types diff --git a/static/MySQL/1011_tbl_File_Type_Audit.sql b/static/MySQL/1011_tbl_File_Type_Audit.sql index 50939b7c..86aebf6a 100644 --- a/static/MySQL/1011_tbl_File_Type_Audit.sql +++ b/static/MySQL/1011_tbl_File_Type_Audit.sql @@ -1,5 +1,5 @@ -# File Type Audit +-- File Type Audit diff --git a/static/MySQL/1012_tbl_Shop_General.sql b/static/MySQL/1012_tbl_Shop_General.sql index 77ebee36..3d28ddbf 100644 --- a/static/MySQL/1012_tbl_Shop_General.sql +++ b/static/MySQL/1012_tbl_Shop_General.sql @@ -1,5 +1,5 @@ -# Generic / shared properties +-- Generic / shared properties diff --git a/static/MySQL/1013_tbl_Shop_General_Audit.sql b/static/MySQL/1013_tbl_Shop_General_Audit.sql index 72965d84..3f44caf1 100644 --- a/static/MySQL/1013_tbl_Shop_General_Audit.sql +++ b/static/MySQL/1013_tbl_Shop_General_Audit.sql @@ -1,5 +1,5 @@ -# Shop General Audits +-- Shop General Audits diff --git a/static/MySQL/1014_tbl_Shop_Image_Type.sql b/static/MySQL/1014_tbl_Shop_Image_Type.sql index 485ef555..fcc6b114 100644 --- a/static/MySQL/1014_tbl_Shop_Image_Type.sql +++ b/static/MySQL/1014_tbl_Shop_Image_Type.sql @@ -1,5 +1,5 @@ -# Image Types +-- Image Types diff --git a/static/MySQL/1015_tbl_Shop_Image_Type_Audit.sql b/static/MySQL/1015_tbl_Shop_Image_Type_Audit.sql index 2bef5d2a..f417ff84 100644 --- a/static/MySQL/1015_tbl_Shop_Image_Type_Audit.sql +++ b/static/MySQL/1015_tbl_Shop_Image_Type_Audit.sql @@ -1,5 +1,5 @@ -# Image Type Audits +-- Image Type Audits diff --git a/static/MySQL/1100_tbl_Shop_Region.sql b/static/MySQL/1100_tbl_Shop_Region.sql index 23295e43..91645659 100644 --- a/static/MySQL/1100_tbl_Shop_Region.sql +++ b/static/MySQL/1100_tbl_Shop_Region.sql @@ -1,5 +1,5 @@ -# Regions +-- Regions SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Region'; diff --git a/static/MySQL/1101_tbl_Shop_Region_Audit.sql b/static/MySQL/1101_tbl_Shop_Region_Audit.sql index 88fbf23e..7df551ae 100644 --- a/static/MySQL/1101_tbl_Shop_Region_Audit.sql +++ b/static/MySQL/1101_tbl_Shop_Region_Audit.sql @@ -1,5 +1,5 @@ -# Region Audits +-- Region Audits diff --git a/static/MySQL/1102_tbl_Shop_Region_Temp.sql b/static/MySQL/1102_tbl_Shop_Region_Temp.sql index 94c3d12e..bf5ef33d 100644 --- a/static/MySQL/1102_tbl_Shop_Region_Temp.sql +++ b/static/MySQL/1102_tbl_Shop_Region_Temp.sql @@ -1,5 +1,5 @@ -# Region Temp +-- Region Temp diff --git a/static/MySQL/1103_tbl_Shop_Region_Branch.sql b/static/MySQL/1103_tbl_Shop_Region_Branch.sql index d2dc7944..dce52238 100644 --- a/static/MySQL/1103_tbl_Shop_Region_Branch.sql +++ b/static/MySQL/1103_tbl_Shop_Region_Branch.sql @@ -1,5 +1,5 @@ -# Region Branchs +-- Region Branchs diff --git a/static/MySQL/1104_tbl_Shop_Region_Branch_Audit.sql b/static/MySQL/1104_tbl_Shop_Region_Branch_Audit.sql index 924ed646..f6efb58d 100644 --- a/static/MySQL/1104_tbl_Shop_Region_Branch_Audit.sql +++ b/static/MySQL/1104_tbl_Shop_Region_Branch_Audit.sql @@ -1,5 +1,5 @@ -# Region Audits +-- Region Audits diff --git a/static/MySQL/1105_tbl_Shop_Region_Branch_Temp.sql b/static/MySQL/1105_tbl_Shop_Region_Branch_Temp.sql index 7e3f0ec6..5de0ac35 100644 --- a/static/MySQL/1105_tbl_Shop_Region_Branch_Temp.sql +++ b/static/MySQL/1105_tbl_Shop_Region_Branch_Temp.sql @@ -1,5 +1,5 @@ -# Region Branch Temp +-- Region Branch Temp diff --git a/static/MySQL/1106_tbl_Shop_Address.sql b/static/MySQL/1106_tbl_Shop_Address.sql index 3f58e177..be052bdc 100644 --- a/static/MySQL/1106_tbl_Shop_Address.sql +++ b/static/MySQL/1106_tbl_Shop_Address.sql @@ -1,5 +1,5 @@ -# Addresses +-- Addresses SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address'; diff --git a/static/MySQL/1106_tbl_Shop_Plant.sql b/static/MySQL/1106_tbl_Shop_Plant.sql index 6c2a668c..5b981a83 100644 --- a/static/MySQL/1106_tbl_Shop_Plant.sql +++ b/static/MySQL/1106_tbl_Shop_Plant.sql @@ -1,5 +1,5 @@ -# Plant +-- Plant SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Plant'; diff --git a/static/MySQL/1107_tbl_Shop_Address_Audit.sql b/static/MySQL/1107_tbl_Shop_Address_Audit.sql index 4364f913..28479c4e 100644 --- a/static/MySQL/1107_tbl_Shop_Address_Audit.sql +++ b/static/MySQL/1107_tbl_Shop_Address_Audit.sql @@ -1,5 +1,5 @@ -# Address Audits +-- Address Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address_Audit'; diff --git a/static/MySQL/1107_tbl_Shop_Plant_Audit.sql b/static/MySQL/1107_tbl_Shop_Plant_Audit.sql index 2b0c7211..d848199d 100644 --- a/static/MySQL/1107_tbl_Shop_Plant_Audit.sql +++ b/static/MySQL/1107_tbl_Shop_Plant_Audit.sql @@ -1,5 +1,5 @@ -# Plant Audits +-- Plant Audits diff --git a/static/MySQL/1108_tbl_Shop_Plant_Temp.sql b/static/MySQL/1108_tbl_Shop_Plant_Temp.sql index 79c9ad90..80c31df0 100644 --- a/static/MySQL/1108_tbl_Shop_Plant_Temp.sql +++ b/static/MySQL/1108_tbl_Shop_Plant_Temp.sql @@ -1,5 +1,5 @@ -# Plant Temp +-- Plant Temp diff --git a/static/MySQL/1109_tbl_Shop_Storage_Location.sql b/static/MySQL/1109_tbl_Shop_Storage_Location.sql index adbab96a..b10726b7 100644 --- a/static/MySQL/1109_tbl_Shop_Storage_Location.sql +++ b/static/MySQL/1109_tbl_Shop_Storage_Location.sql @@ -1,5 +1,5 @@ -# Storage Location +-- Storage Location diff --git a/static/MySQL/1110_tbl_Shop_Storage_Location_Audit.sql b/static/MySQL/1110_tbl_Shop_Storage_Location_Audit.sql index c64e0db7..b9706fe2 100644 --- a/static/MySQL/1110_tbl_Shop_Storage_Location_Audit.sql +++ b/static/MySQL/1110_tbl_Shop_Storage_Location_Audit.sql @@ -1,5 +1,5 @@ -# Storage Location Audits +-- Storage Location Audits diff --git a/static/MySQL/1111_tbl_Shop_Storage_Location_Temp.sql b/static/MySQL/1111_tbl_Shop_Storage_Location_Temp.sql index 2a4ca9a5..5f8af6c9 100644 --- a/static/MySQL/1111_tbl_Shop_Storage_Location_Temp.sql +++ b/static/MySQL/1111_tbl_Shop_Storage_Location_Temp.sql @@ -1,5 +1,5 @@ -# Storage Location Temp +-- Storage Location Temp diff --git a/static/MySQL/1112_tbl_Shop_Storage_Location_Branch.sql b/static/MySQL/1112_tbl_Shop_Storage_Location_Branch.sql index b0d87f5b..6bf4ffc7 100644 --- a/static/MySQL/1112_tbl_Shop_Storage_Location_Branch.sql +++ b/static/MySQL/1112_tbl_Shop_Storage_Location_Branch.sql @@ -1,5 +1,5 @@ -# Storage Location Branch +-- Storage Location Branch diff --git a/static/MySQL/1113_tbl_Shop_Storage_Location_Branch_Audit.sql b/static/MySQL/1113_tbl_Shop_Storage_Location_Branch_Audit.sql index 9db17b94..262e732e 100644 --- a/static/MySQL/1113_tbl_Shop_Storage_Location_Branch_Audit.sql +++ b/static/MySQL/1113_tbl_Shop_Storage_Location_Branch_Audit.sql @@ -1,5 +1,5 @@ -# Storage Location Branch Audits +-- Storage Location Branch Audits diff --git a/static/MySQL/1114_tbl_Shop_Storage_Location_Branch_Temp.sql b/static/MySQL/1114_tbl_Shop_Storage_Location_Branch_Temp.sql index 11cb1775..2919c29e 100644 --- a/static/MySQL/1114_tbl_Shop_Storage_Location_Branch_Temp.sql +++ b/static/MySQL/1114_tbl_Shop_Storage_Location_Branch_Temp.sql @@ -1,5 +1,5 @@ -# Storage Location Branch Temp +-- Storage Location Branch Temp diff --git a/static/MySQL/1115_tbl_Shop_Currency.sql b/static/MySQL/1115_tbl_Shop_Currency.sql index 2ae8aa5f..be3934a8 100644 --- a/static/MySQL/1115_tbl_Shop_Currency.sql +++ b/static/MySQL/1115_tbl_Shop_Currency.sql @@ -1,5 +1,5 @@ -# Currencies +-- Currencies diff --git a/static/MySQL/1116_tbl_Shop_Currency_Audit.sql b/static/MySQL/1116_tbl_Shop_Currency_Audit.sql index d5fe012c..bc910345 100644 --- a/static/MySQL/1116_tbl_Shop_Currency_Audit.sql +++ b/static/MySQL/1116_tbl_Shop_Currency_Audit.sql @@ -1,5 +1,5 @@ -# Currency Audits +-- Currency Audits diff --git a/static/MySQL/1117_tbl_Shop_Currency_Temp.sql b/static/MySQL/1117_tbl_Shop_Currency_Temp.sql index d89b19c1..b9a9df3a 100644 --- a/static/MySQL/1117_tbl_Shop_Currency_Temp.sql +++ b/static/MySQL/1117_tbl_Shop_Currency_Temp.sql @@ -1,5 +1,5 @@ -# Currency Temp +-- Currency Temp diff --git a/static/MySQL/1118_tbl_Shop_Tax_Or_Surcharge.sql b/static/MySQL/1118_tbl_Shop_Tax_Or_Surcharge.sql index 1db28da6..92a5d4e5 100644 --- a/static/MySQL/1118_tbl_Shop_Tax_Or_Surcharge.sql +++ b/static/MySQL/1118_tbl_Shop_Tax_Or_Surcharge.sql @@ -1,5 +1,5 @@ -# Taxes and Surcharges +-- Taxes and Surcharges diff --git a/static/MySQL/1119_tbl_Shop_Tax_Or_Surcharge_Audit.sql b/static/MySQL/1119_tbl_Shop_Tax_Or_Surcharge_Audit.sql index a4e48032..51d3356b 100644 --- a/static/MySQL/1119_tbl_Shop_Tax_Or_Surcharge_Audit.sql +++ b/static/MySQL/1119_tbl_Shop_Tax_Or_Surcharge_Audit.sql @@ -1,5 +1,5 @@ -# Tax Or Surcharge Audits +-- Tax Or Surcharge Audits diff --git a/static/MySQL/1120_tbl_Shop_Tax_Or_Surcharge_Temp.sql b/static/MySQL/1120_tbl_Shop_Tax_Or_Surcharge_Temp.sql index b21d3b9b..fe340585 100644 --- a/static/MySQL/1120_tbl_Shop_Tax_Or_Surcharge_Temp.sql +++ b/static/MySQL/1120_tbl_Shop_Tax_Or_Surcharge_Temp.sql @@ -1,5 +1,5 @@ -# Taxes and Surcharges Temp +-- Taxes and Surcharges Temp diff --git a/static/MySQL/1121_tbl_Shop_Unit_Measurement.sql b/static/MySQL/1121_tbl_Shop_Unit_Measurement.sql index 4082ed2e..b22de910 100644 --- a/static/MySQL/1121_tbl_Shop_Unit_Measurement.sql +++ b/static/MySQL/1121_tbl_Shop_Unit_Measurement.sql @@ -1,5 +1,5 @@ -# Unit of Measurement +-- Unit of Measurement diff --git a/static/MySQL/1122_tbl_Shop_Unit_Measurement_Audit.sql b/static/MySQL/1122_tbl_Shop_Unit_Measurement_Audit.sql index 62957f39..81a0e012 100644 --- a/static/MySQL/1122_tbl_Shop_Unit_Measurement_Audit.sql +++ b/static/MySQL/1122_tbl_Shop_Unit_Measurement_Audit.sql @@ -1,5 +1,5 @@ -# Unit of Measurement Audits +-- Unit of Measurement Audits diff --git a/static/MySQL/1124_tbl_Shop_Unit_Measurement_Conversion.sql b/static/MySQL/1124_tbl_Shop_Unit_Measurement_Conversion.sql index 852eedd3..cbb2da10 100644 --- a/static/MySQL/1124_tbl_Shop_Unit_Measurement_Conversion.sql +++ b/static/MySQL/1124_tbl_Shop_Unit_Measurement_Conversion.sql @@ -1,5 +1,5 @@ -# Unit of Measurement Conversion +-- Unit of Measurement Conversion diff --git a/static/MySQL/1125_tbl_Shop_Unit_Measurement_Conversion_Audit.sql b/static/MySQL/1125_tbl_Shop_Unit_Measurement_Conversion_Audit.sql index f03a314d..3507be32 100644 --- a/static/MySQL/1125_tbl_Shop_Unit_Measurement_Conversion_Audit.sql +++ b/static/MySQL/1125_tbl_Shop_Unit_Measurement_Conversion_Audit.sql @@ -1,5 +1,5 @@ -# Unit of Measurement Conversion Audits +-- Unit of Measurement Conversion Audits diff --git a/static/MySQL/1200_tbl_Shop_Product_Category.sql b/static/MySQL/1200_tbl_Shop_Product_Category.sql index 5ca48963..79553f41 100644 --- a/static/MySQL/1200_tbl_Shop_Product_Category.sql +++ b/static/MySQL/1200_tbl_Shop_Product_Category.sql @@ -1,5 +1,5 @@ -# Categories +-- Categories SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Product_Category'; diff --git a/static/MySQL/1201_tbl_Shop_Product_Category_Audit.sql b/static/MySQL/1201_tbl_Shop_Product_Category_Audit.sql index 0d5a80cc..97beb2e6 100644 --- a/static/MySQL/1201_tbl_Shop_Product_Category_Audit.sql +++ b/static/MySQL/1201_tbl_Shop_Product_Category_Audit.sql @@ -1,5 +1,5 @@ -# Category Audits +-- Category Audits diff --git a/static/MySQL/1202_tbl_Shop_Product_Category_Temp.sql b/static/MySQL/1202_tbl_Shop_Product_Category_Temp.sql index 70e104c2..e9448f0e 100644 --- a/static/MySQL/1202_tbl_Shop_Product_Category_Temp.sql +++ b/static/MySQL/1202_tbl_Shop_Product_Category_Temp.sql @@ -1,5 +1,5 @@ -# Categories Temp +-- Categories Temp -- DROP TABLE Shop_Product_Category_Temp; diff --git a/static/MySQL/1203_tbl_Shop_Product.sql b/static/MySQL/1203_tbl_Shop_Product.sql index 1d243698..8c1c6201 100644 --- a/static/MySQL/1203_tbl_Shop_Product.sql +++ b/static/MySQL/1203_tbl_Shop_Product.sql @@ -1,5 +1,5 @@ -# Products +-- Products @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product ( /* price_GBP_full FLOAT, price_GBP_min FLOAT, - # ratio_discount_overall FLOAT NOT NULL DEFAULT 0, + -- ratio_discount_overall FLOAT NOT NULL DEFAULT 0, CONSTRAINT FK_Shop_Product_id_category FOREIGN KEY (id_category) REFERENCES Shop_Product_Category(id_category) @@ -35,8 +35,8 @@ CREATE TABLE IF NOT EXISTS Shop_Product ( CONSTRAINT FK_Shop_Product_id_access_level_required FOREIGN KEY (id_access_level_required) REFERENCES Shop_Access_Level(id_access_level), - # id_stripe_product VARCHAR(100), - # id_stripe_price VARCHAR(100) NOT NULL, + -- id_stripe_product VARCHAR(100), + -- id_stripe_price VARCHAR(100) NOT NULL, active BIT NOT NULL DEFAULT 1, display_order INT NOT NULL, created_on DATETIME NOT NULL, diff --git a/static/MySQL/1204_tbl_Shop_Product_Audit.sql b/static/MySQL/1204_tbl_Shop_Product_Audit.sql index f4593d2c..761d1df3 100644 --- a/static/MySQL/1204_tbl_Shop_Product_Audit.sql +++ b/static/MySQL/1204_tbl_Shop_Product_Audit.sql @@ -1,5 +1,5 @@ -# Products +-- Products diff --git a/static/MySQL/1205_tbl_Shop_Product_Temp.sql b/static/MySQL/1205_tbl_Shop_Product_Temp.sql index d5f06994..9468a4e4 100644 --- a/static/MySQL/1205_tbl_Shop_Product_Temp.sql +++ b/static/MySQL/1205_tbl_Shop_Product_Temp.sql @@ -1,5 +1,5 @@ -# Products Temp +-- Products Temp -- DROP TABLE IF EXISTS Shop_Product_Temp; diff --git a/static/MySQL/1206_tbl_Shop_Product_Permutation.sql b/static/MySQL/1206_tbl_Shop_Product_Permutation.sql index 13dbcd4b..52abdf8a 100644 --- a/static/MySQL/1206_tbl_Shop_Product_Permutation.sql +++ b/static/MySQL/1206_tbl_Shop_Product_Permutation.sql @@ -1,5 +1,5 @@ -# Product Permutation +-- Product Permutation -- DROP TABLE partsltd_prod.Shop_Product_Permutation; diff --git a/static/MySQL/1207_tbl_Shop_Product_Permutation_Audit.sql b/static/MySQL/1207_tbl_Shop_Product_Permutation_Audit.sql index 7cdaa782..deaa8fe3 100644 --- a/static/MySQL/1207_tbl_Shop_Product_Permutation_Audit.sql +++ b/static/MySQL/1207_tbl_Shop_Product_Permutation_Audit.sql @@ -1,5 +1,5 @@ -# Product Permutation Audits +-- Product Permutation Audits diff --git a/static/MySQL/1208_tbl_Shop_Product_Permutation_Temp.sql b/static/MySQL/1208_tbl_Shop_Product_Permutation_Temp.sql index 6ec4e35a..3e836815 100644 --- a/static/MySQL/1208_tbl_Shop_Product_Permutation_Temp.sql +++ b/static/MySQL/1208_tbl_Shop_Product_Permutation_Temp.sql @@ -1,5 +1,5 @@ -# Product Permutation Temp +-- Product Permutation Temp -- DROP TABLE IF EXISTS Shop_Product_Permutation_Temp; diff --git a/static/MySQL/1209_tbl_Shop_Variation_Type.sql b/static/MySQL/1209_tbl_Shop_Variation_Type.sql index 290f3bc6..e88b30c2 100644 --- a/static/MySQL/1209_tbl_Shop_Variation_Type.sql +++ b/static/MySQL/1209_tbl_Shop_Variation_Type.sql @@ -1,5 +1,5 @@ -# Variation Types +-- Variation Types diff --git a/static/MySQL/1210_tbl_Shop_Variation_Type_Audit.sql b/static/MySQL/1210_tbl_Shop_Variation_Type_Audit.sql index 8b22f7d3..74c99ce3 100644 --- a/static/MySQL/1210_tbl_Shop_Variation_Type_Audit.sql +++ b/static/MySQL/1210_tbl_Shop_Variation_Type_Audit.sql @@ -1,5 +1,5 @@ -# Variation Type Audits +-- Variation Type Audits diff --git a/static/MySQL/1211_tbl_Shop_Variation_Type_Temp.sql b/static/MySQL/1211_tbl_Shop_Variation_Type_Temp.sql index e6d4c4a1..419ef11a 100644 --- a/static/MySQL/1211_tbl_Shop_Variation_Type_Temp.sql +++ b/static/MySQL/1211_tbl_Shop_Variation_Type_Temp.sql @@ -1,5 +1,5 @@ -# Variation Types Temp +-- Variation Types Temp -- DROP TABLE partsltd_prod.Shop_Variation_Type_Temp; diff --git a/static/MySQL/1212_tbl_Shop_Variation.sql b/static/MySQL/1212_tbl_Shop_Variation.sql index f14ebb7e..1b43dba9 100644 --- a/static/MySQL/1212_tbl_Shop_Variation.sql +++ b/static/MySQL/1212_tbl_Shop_Variation.sql @@ -1,5 +1,5 @@ -# Variations +-- Variations diff --git a/static/MySQL/1213_tbl_Shop_Variation_Audit.sql b/static/MySQL/1213_tbl_Shop_Variation_Audit.sql index 3e0890c3..2555eea2 100644 --- a/static/MySQL/1213_tbl_Shop_Variation_Audit.sql +++ b/static/MySQL/1213_tbl_Shop_Variation_Audit.sql @@ -1,5 +1,5 @@ -# Variation Audits +-- Variation Audits diff --git a/static/MySQL/1214_tbl_Shop_Variation_Temp.sql b/static/MySQL/1214_tbl_Shop_Variation_Temp.sql index 61a11bef..8412a815 100644 --- a/static/MySQL/1214_tbl_Shop_Variation_Temp.sql +++ b/static/MySQL/1214_tbl_Shop_Variation_Temp.sql @@ -1,5 +1,5 @@ -# Variations Temp +-- Variations Temp -- DROP TABLE partsltd_prod.Shop_Variation_Temp; diff --git a/static/MySQL/1215_tbl_Shop_Product_Permutation_Variation_Link.sql b/static/MySQL/1215_tbl_Shop_Product_Permutation_Variation_Link.sql index 4f615265..6687ea39 100644 --- a/static/MySQL/1215_tbl_Shop_Product_Permutation_Variation_Link.sql +++ b/static/MySQL/1215_tbl_Shop_Product_Permutation_Variation_Link.sql @@ -1,5 +1,5 @@ -# Product Permutation Variation Link +-- Product Permutation Variation Link diff --git a/static/MySQL/1216_tbl_Shop_Product_Permutation_Variation_Link_Audit.sql b/static/MySQL/1216_tbl_Shop_Product_Permutation_Variation_Link_Audit.sql index e5fa8a29..38f4c915 100644 --- a/static/MySQL/1216_tbl_Shop_Product_Permutation_Variation_Link_Audit.sql +++ b/static/MySQL/1216_tbl_Shop_Product_Permutation_Variation_Link_Audit.sql @@ -1,5 +1,5 @@ -# Product Permutation Variation Link Audits +-- Product Permutation Variation Link Audits diff --git a/static/MySQL/1217_tbl_Shop_Product_Permutation_Variation_Link_Temp.sql b/static/MySQL/1217_tbl_Shop_Product_Permutation_Variation_Link_Temp.sql index c27883de..3c1b4551 100644 --- a/static/MySQL/1217_tbl_Shop_Product_Permutation_Variation_Link_Temp.sql +++ b/static/MySQL/1217_tbl_Shop_Product_Permutation_Variation_Link_Temp.sql @@ -1,5 +1,5 @@ -# Product Permutation Variation Link +-- Product Permutation Variation Link -- DROP TABLE IF EXISTS Shop_Product_Permutation_Variation_Link_Temp; diff --git a/static/MySQL/1221_tbl_Shop_Product_Price.sql b/static/MySQL/1221_tbl_Shop_Product_Price.sql index fa3d8694..ff504c33 100644 --- a/static/MySQL/1221_tbl_Shop_Product_Price.sql +++ b/static/MySQL/1221_tbl_Shop_Product_Price.sql @@ -1,5 +1,5 @@ -# Product Price +-- Product Price diff --git a/static/MySQL/1222_tbl_Shop_Product_Price_Audit.sql b/static/MySQL/1222_tbl_Shop_Product_Price_Audit.sql index 136a8e7d..5ddec22c 100644 --- a/static/MySQL/1222_tbl_Shop_Product_Price_Audit.sql +++ b/static/MySQL/1222_tbl_Shop_Product_Price_Audit.sql @@ -1,5 +1,5 @@ -# Product Price Audits +-- Product Price Audits diff --git a/static/MySQL/1223_tbl_Shop_Product_Price_Temp.sql b/static/MySQL/1223_tbl_Shop_Product_Price_Temp.sql index ec5ec6be..785fce8d 100644 --- a/static/MySQL/1223_tbl_Shop_Product_Price_Temp.sql +++ b/static/MySQL/1223_tbl_Shop_Product_Price_Temp.sql @@ -1,5 +1,5 @@ -# Product Price Temp +-- Product Price Temp diff --git a/static/MySQL/1224_tbl_Shop_Product_Image.sql b/static/MySQL/1224_tbl_Shop_Product_Image.sql index e3488d26..41e447ad 100644 --- a/static/MySQL/1224_tbl_Shop_Product_Image.sql +++ b/static/MySQL/1224_tbl_Shop_Product_Image.sql @@ -1,5 +1,5 @@ -# Product Permutation Images +-- Product Permutation Images diff --git a/static/MySQL/1225_tbl_Shop_Product_Image_Audit.sql b/static/MySQL/1225_tbl_Shop_Product_Image_Audit.sql index 68f355d2..7b58799e 100644 --- a/static/MySQL/1225_tbl_Shop_Product_Image_Audit.sql +++ b/static/MySQL/1225_tbl_Shop_Product_Image_Audit.sql @@ -1,5 +1,5 @@ -# Product Image Audits +-- Product Image Audits diff --git a/static/MySQL/1227_tbl_Shop_Delivery_Option.sql b/static/MySQL/1227_tbl_Shop_Delivery_Option.sql index 263b0a90..98f77105 100644 --- a/static/MySQL/1227_tbl_Shop_Delivery_Option.sql +++ b/static/MySQL/1227_tbl_Shop_Delivery_Option.sql @@ -1,5 +1,5 @@ -# Delivery Options +-- Delivery Options diff --git a/static/MySQL/1228_tbl_Shop_Delivery_Option_Audit.sql b/static/MySQL/1228_tbl_Shop_Delivery_Option_Audit.sql index 53dcc2f0..013ede49 100644 --- a/static/MySQL/1228_tbl_Shop_Delivery_Option_Audit.sql +++ b/static/MySQL/1228_tbl_Shop_Delivery_Option_Audit.sql @@ -1,5 +1,5 @@ -# Delivery Option Audits +-- Delivery Option Audits diff --git a/static/MySQL/1230_tbl_Shop_Product_Permutation_Delivery_Option_Link.sql b/static/MySQL/1230_tbl_Shop_Product_Permutation_Delivery_Option_Link.sql index 3278cdad..d2cc7be3 100644 --- a/static/MySQL/1230_tbl_Shop_Product_Permutation_Delivery_Option_Link.sql +++ b/static/MySQL/1230_tbl_Shop_Product_Permutation_Delivery_Option_Link.sql @@ -1,5 +1,5 @@ -# Delivery Option +-- Delivery Option diff --git a/static/MySQL/1231_tbl_Shop_Product_Permutation_Delivery_Option_Link_Audit.sql b/static/MySQL/1231_tbl_Shop_Product_Permutation_Delivery_Option_Link_Audit.sql index e885d1ed..d81a4068 100644 --- a/static/MySQL/1231_tbl_Shop_Product_Permutation_Delivery_Option_Link_Audit.sql +++ b/static/MySQL/1231_tbl_Shop_Product_Permutation_Delivery_Option_Link_Audit.sql @@ -1,5 +1,5 @@ -# Delivery Option Audits +-- Delivery Option Audits diff --git a/static/MySQL/1233_tbl_Shop_Discount.sql b/static/MySQL/1233_tbl_Shop_Discount.sql index 29643329..551f2581 100644 --- a/static/MySQL/1233_tbl_Shop_Discount.sql +++ b/static/MySQL/1233_tbl_Shop_Discount.sql @@ -1,5 +1,5 @@ -# Discounts +-- Discounts diff --git a/static/MySQL/1234_tbl_Shop_Discount_Audit.sql b/static/MySQL/1234_tbl_Shop_Discount_Audit.sql index ed845439..96ab2d56 100644 --- a/static/MySQL/1234_tbl_Shop_Discount_Audit.sql +++ b/static/MySQL/1234_tbl_Shop_Discount_Audit.sql @@ -1,5 +1,5 @@ -# Discount Audits +-- Discount Audits diff --git a/static/MySQL/1236_tbl_Shop_Discount_Region_Currency_Link.sql b/static/MySQL/1236_tbl_Shop_Discount_Region_Currency_Link.sql index 7d6f4b8a..6cb8d148 100644 --- a/static/MySQL/1236_tbl_Shop_Discount_Region_Currency_Link.sql +++ b/static/MySQL/1236_tbl_Shop_Discount_Region_Currency_Link.sql @@ -1,5 +1,5 @@ -# Discount Region Currency Link +-- Discount Region Currency Link diff --git a/static/MySQL/1237_tbl_Shop_Discount_Region_Currency_Link_Audit.sql b/static/MySQL/1237_tbl_Shop_Discount_Region_Currency_Link_Audit.sql index c75ea6f0..cf346b49 100644 --- a/static/MySQL/1237_tbl_Shop_Discount_Region_Currency_Link_Audit.sql +++ b/static/MySQL/1237_tbl_Shop_Discount_Region_Currency_Link_Audit.sql @@ -1,5 +1,5 @@ -# Discount Region Currency Link Audits +-- Discount Region Currency Link Audits diff --git a/static/MySQL/1300_tbl_Shop_Permission_Group.sql b/static/MySQL/1300_tbl_Shop_Permission_Group.sql index 8de32e14..cf6e1f1b 100644 --- a/static/MySQL/1300_tbl_Shop_Permission_Group.sql +++ b/static/MySQL/1300_tbl_Shop_Permission_Group.sql @@ -1,5 +1,5 @@ -# Permission Groups +-- Permission Groups diff --git a/static/MySQL/1301_tbl_Shop_Permission_Group_Audit.sql b/static/MySQL/1301_tbl_Shop_Permission_Group_Audit.sql index 2cfc4b41..7f3cab75 100644 --- a/static/MySQL/1301_tbl_Shop_Permission_Group_Audit.sql +++ b/static/MySQL/1301_tbl_Shop_Permission_Group_Audit.sql @@ -1,5 +1,5 @@ -# Permission Group Audits +-- Permission Group Audits diff --git a/static/MySQL/1303_tbl_Shop_Permission.sql b/static/MySQL/1303_tbl_Shop_Permission.sql index 9ad88867..93b55389 100644 --- a/static/MySQL/1303_tbl_Shop_Permission.sql +++ b/static/MySQL/1303_tbl_Shop_Permission.sql @@ -1,5 +1,5 @@ -# Permissions +-- Permissions diff --git a/static/MySQL/1304_tbl_Shop_Permission_Audit.sql b/static/MySQL/1304_tbl_Shop_Permission_Audit.sql index cebca0e4..9c889b03 100644 --- a/static/MySQL/1304_tbl_Shop_Permission_Audit.sql +++ b/static/MySQL/1304_tbl_Shop_Permission_Audit.sql @@ -1,5 +1,5 @@ -# Permission Audits +-- Permission Audits diff --git a/static/MySQL/1306_tbl_Shop_Role.sql b/static/MySQL/1306_tbl_Shop_Role.sql index 6fab3546..389547c8 100644 --- a/static/MySQL/1306_tbl_Shop_Role.sql +++ b/static/MySQL/1306_tbl_Shop_Role.sql @@ -1,5 +1,5 @@ -# Roles +-- Roles diff --git a/static/MySQL/1307_tbl_Shop_Role_Audit.sql b/static/MySQL/1307_tbl_Shop_Role_Audit.sql index 1d23d69a..da46da4a 100644 --- a/static/MySQL/1307_tbl_Shop_Role_Audit.sql +++ b/static/MySQL/1307_tbl_Shop_Role_Audit.sql @@ -1,5 +1,5 @@ -# Role Audits +-- Role Audits diff --git a/static/MySQL/1309_tbl_Shop_Role_Permission_Link.sql b/static/MySQL/1309_tbl_Shop_Role_Permission_Link.sql index cd09785d..242aaef5 100644 --- a/static/MySQL/1309_tbl_Shop_Role_Permission_Link.sql +++ b/static/MySQL/1309_tbl_Shop_Role_Permission_Link.sql @@ -1,5 +1,5 @@ -# Role Permission link +-- Role Permission link diff --git a/static/MySQL/1310_tbl_Shop_Role_Permission_Link_Audit.sql b/static/MySQL/1310_tbl_Shop_Role_Permission_Link_Audit.sql index d7bcf347..f1b2e6e0 100644 --- a/static/MySQL/1310_tbl_Shop_Role_Permission_Link_Audit.sql +++ b/static/MySQL/1310_tbl_Shop_Role_Permission_Link_Audit.sql @@ -1,5 +1,5 @@ -# Role Permission link Audits +-- Role Permission link Audits diff --git a/static/MySQL/1312_tbl_Shop_User.sql b/static/MySQL/1312_tbl_Shop_User.sql index 7a10e89a..b567d95f 100644 --- a/static/MySQL/1312_tbl_Shop_User.sql +++ b/static/MySQL/1312_tbl_Shop_User.sql @@ -1,5 +1,5 @@ -# Users +-- Users diff --git a/static/MySQL/1313_tbl_Shop_User_Audit.sql b/static/MySQL/1313_tbl_Shop_User_Audit.sql index 623ac010..da7125b0 100644 --- a/static/MySQL/1313_tbl_Shop_User_Audit.sql +++ b/static/MySQL/1313_tbl_Shop_User_Audit.sql @@ -1,5 +1,5 @@ -# User Audits +-- User Audits diff --git a/static/MySQL/1314_tbl_Shop_User_Temp.sql b/static/MySQL/1314_tbl_Shop_User_Temp.sql index b9728a76..0c692fae 100644 --- a/static/MySQL/1314_tbl_Shop_User_Temp.sql +++ b/static/MySQL/1314_tbl_Shop_User_Temp.sql @@ -1,5 +1,5 @@ -# Users Temp +-- Users Temp -- DROP TABLE IF EXISTS Shop_User_Temp; diff --git a/static/MySQL/1315_tbl_Shop_User_Role_Link.sql b/static/MySQL/1315_tbl_Shop_User_Role_Link.sql index 879ed9bc..07d80f26 100644 --- a/static/MySQL/1315_tbl_Shop_User_Role_Link.sql +++ b/static/MySQL/1315_tbl_Shop_User_Role_Link.sql @@ -1,5 +1,5 @@ -# User Role link +-- User Role link diff --git a/static/MySQL/1316_tbl_Shop_User_Role_Link_Audit.sql b/static/MySQL/1316_tbl_Shop_User_Role_Link_Audit.sql index d8dd8364..461827aa 100644 --- a/static/MySQL/1316_tbl_Shop_User_Role_Link_Audit.sql +++ b/static/MySQL/1316_tbl_Shop_User_Role_Link_Audit.sql @@ -1,5 +1,5 @@ -# User Role Link Audits +-- User Role Link Audits diff --git a/static/MySQL/1318_tbl_Shop_User_Address.sql b/static/MySQL/1318_tbl_Shop_User_Address.sql index d36739ae..2b28b309 100644 --- a/static/MySQL/1318_tbl_Shop_User_Address.sql +++ b/static/MySQL/1318_tbl_Shop_User_Address.sql @@ -1,5 +1,5 @@ -# User Addresses +-- User Addresses SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Address'; diff --git a/static/MySQL/1319_tbl_Shop_User_Address_Audit.sql b/static/MySQL/1319_tbl_Shop_User_Address_Audit.sql index 48ae53fa..822593b8 100644 --- a/static/MySQL/1319_tbl_Shop_User_Address_Audit.sql +++ b/static/MySQL/1319_tbl_Shop_User_Address_Audit.sql @@ -1,5 +1,5 @@ -# Address Audits +-- Address Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Address_Audit'; diff --git a/static/MySQL/1321_tbl_Shop_User_Basket.sql b/static/MySQL/1321_tbl_Shop_User_Basket.sql index 02ada954..233be405 100644 --- a/static/MySQL/1321_tbl_Shop_User_Basket.sql +++ b/static/MySQL/1321_tbl_Shop_User_Basket.sql @@ -1,5 +1,5 @@ -# User Basket (Product Link) +-- User Basket (Product Link) diff --git a/static/MySQL/1322_tbl_Shop_User_Basket_Audit.sql b/static/MySQL/1322_tbl_Shop_User_Basket_Audit.sql index 26b0b801..d9877ae9 100644 --- a/static/MySQL/1322_tbl_Shop_User_Basket_Audit.sql +++ b/static/MySQL/1322_tbl_Shop_User_Basket_Audit.sql @@ -1,5 +1,5 @@ -# Product Basket Audits +-- Product Basket Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Basket_Audit'; diff --git a/static/MySQL/1397_tbl_Shop_Order_Status.sql b/static/MySQL/1397_tbl_Shop_Order_Status.sql index e5ae3f8a..3d8488a1 100644 --- a/static/MySQL/1397_tbl_Shop_Order_Status.sql +++ b/static/MySQL/1397_tbl_Shop_Order_Status.sql @@ -1,5 +1,5 @@ -# User Order Types +-- User Order Types diff --git a/static/MySQL/1398_tbl_Shop_Order_Status_Audit.sql b/static/MySQL/1398_tbl_Shop_Order_Status_Audit.sql index c7e08f45..82acb321 100644 --- a/static/MySQL/1398_tbl_Shop_Order_Status_Audit.sql +++ b/static/MySQL/1398_tbl_Shop_Order_Status_Audit.sql @@ -1,5 +1,5 @@ -# Order Type Audits +-- Order Type Audits diff --git a/static/MySQL/1400_tbl_Shop_Supplier.sql b/static/MySQL/1400_tbl_Shop_Supplier.sql index 55f0cc95..c2d2d9e8 100644 --- a/static/MySQL/1400_tbl_Shop_Supplier.sql +++ b/static/MySQL/1400_tbl_Shop_Supplier.sql @@ -1,5 +1,5 @@ -# Supplier +-- Supplier SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier'; diff --git a/static/MySQL/1401_tbl_Shop_Supplier_Audit.sql b/static/MySQL/1401_tbl_Shop_Supplier_Audit.sql index 657bf834..b04989ff 100644 --- a/static/MySQL/1401_tbl_Shop_Supplier_Audit.sql +++ b/static/MySQL/1401_tbl_Shop_Supplier_Audit.sql @@ -1,5 +1,5 @@ -# Supplier Audits +-- Supplier Audits diff --git a/static/MySQL/1402_tbl_Shop_Supplier_Temp.sql b/static/MySQL/1402_tbl_Shop_Supplier_Temp.sql index a47b4dcf..47c2ae0f 100644 --- a/static/MySQL/1402_tbl_Shop_Supplier_Temp.sql +++ b/static/MySQL/1402_tbl_Shop_Supplier_Temp.sql @@ -1,5 +1,5 @@ -# Supplier Staging +-- Supplier Staging SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier_Temp'; diff --git a/static/MySQL/1403_tbl_Shop_Supplier_Address.sql b/static/MySQL/1403_tbl_Shop_Supplier_Address.sql index 14d1284c..9ae02145 100644 --- a/static/MySQL/1403_tbl_Shop_Supplier_Address.sql +++ b/static/MySQL/1403_tbl_Shop_Supplier_Address.sql @@ -1,5 +1,5 @@ -# Supplier Addresses +-- Supplier Addresses SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier_Address'; diff --git a/static/MySQL/1404_tbl_Shop_Supplier_Address_Audit.sql b/static/MySQL/1404_tbl_Shop_Supplier_Address_Audit.sql index c3af2add..22a1e15a 100644 --- a/static/MySQL/1404_tbl_Shop_Supplier_Address_Audit.sql +++ b/static/MySQL/1404_tbl_Shop_Supplier_Address_Audit.sql @@ -1,5 +1,5 @@ -# Supplier Address Audits +-- Supplier Address Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier_Address_Audit'; diff --git a/static/MySQL/1405_tbl_Shop_Supplier_Address_Temp.sql b/static/MySQL/1405_tbl_Shop_Supplier_Address_Temp.sql index 0f5019e5..0f45f75d 100644 --- a/static/MySQL/1405_tbl_Shop_Supplier_Address_Temp.sql +++ b/static/MySQL/1405_tbl_Shop_Supplier_Address_Temp.sql @@ -1,5 +1,5 @@ -# Supplier Addresses Staging +-- Supplier Addresses Staging SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Supplier_Address_Temp'; diff --git a/static/MySQL/1409_tbl_Shop_Supplier_Purchase_Order.sql b/static/MySQL/1409_tbl_Shop_Supplier_Purchase_Order.sql index a34314cb..d53ad4a0 100644 --- a/static/MySQL/1409_tbl_Shop_Supplier_Purchase_Order.sql +++ b/static/MySQL/1409_tbl_Shop_Supplier_Purchase_Order.sql @@ -1,5 +1,5 @@ -# Supplier Purchase Order +-- Supplier Purchase Order diff --git a/static/MySQL/1410_tbl_Shop_Supplier_Purchase_Order_Audit.sql b/static/MySQL/1410_tbl_Shop_Supplier_Purchase_Order_Audit.sql index fada6f66..7dab3780 100644 --- a/static/MySQL/1410_tbl_Shop_Supplier_Purchase_Order_Audit.sql +++ b/static/MySQL/1410_tbl_Shop_Supplier_Purchase_Order_Audit.sql @@ -1,5 +1,5 @@ -# Supplier Purchase Order Audits +-- Supplier Purchase Order Audits diff --git a/static/MySQL/1411_tbl_Shop_Supplier_Purchase_Order_Temp.sql b/static/MySQL/1411_tbl_Shop_Supplier_Purchase_Order_Temp.sql index 3a3aa29d..604933bb 100644 --- a/static/MySQL/1411_tbl_Shop_Supplier_Purchase_Order_Temp.sql +++ b/static/MySQL/1411_tbl_Shop_Supplier_Purchase_Order_Temp.sql @@ -1,5 +1,5 @@ -# Supplier Purchase Order Staging +-- Supplier Purchase Order Staging DROP TABLE IF EXISTS Shop_Supplier_Purchase_Order_Temp; diff --git a/static/MySQL/1412_tbl_Shop_Manufacturing_Purchase_Order.sql b/static/MySQL/1412_tbl_Shop_Manufacturing_Purchase_Order.sql index f7e5f186..8f7912b5 100644 --- a/static/MySQL/1412_tbl_Shop_Manufacturing_Purchase_Order.sql +++ b/static/MySQL/1412_tbl_Shop_Manufacturing_Purchase_Order.sql @@ -1,5 +1,5 @@ -# Manufacturing Purchase Order +-- Manufacturing Purchase Order SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Manufacturing_Purchase_Order'; diff --git a/static/MySQL/1413_tbl_Shop_Manufacturing_Purchase_Order_Audit.sql b/static/MySQL/1413_tbl_Shop_Manufacturing_Purchase_Order_Audit.sql index f420064a..c5692f41 100644 --- a/static/MySQL/1413_tbl_Shop_Manufacturing_Purchase_Order_Audit.sql +++ b/static/MySQL/1413_tbl_Shop_Manufacturing_Purchase_Order_Audit.sql @@ -1,5 +1,5 @@ -# Manufacturing Purchase Order Audits +-- Manufacturing Purchase Order Audits diff --git a/static/MySQL/1414_tbl_Shop_Manufacturing_Purchase_Order_Temp.sql b/static/MySQL/1414_tbl_Shop_Manufacturing_Purchase_Order_Temp.sql index 625243f4..db97fcd8 100644 --- a/static/MySQL/1414_tbl_Shop_Manufacturing_Purchase_Order_Temp.sql +++ b/static/MySQL/1414_tbl_Shop_Manufacturing_Purchase_Order_Temp.sql @@ -1,5 +1,5 @@ -# Manufacturing Purchase Order Temp +-- Manufacturing Purchase Order Temp -- DROP TABLE Shop_Manufacturing_Purchase_Order_Temp diff --git a/static/MySQL/1415_tbl_Shop_Customer.sql b/static/MySQL/1415_tbl_Shop_Customer.sql index 0443b81b..d64e901c 100644 --- a/static/MySQL/1415_tbl_Shop_Customer.sql +++ b/static/MySQL/1415_tbl_Shop_Customer.sql @@ -1,4 +1,4 @@ -# Customer +-- Customer diff --git a/static/MySQL/1416_tbl_Shop_Customer_Audit.sql b/static/MySQL/1416_tbl_Shop_Customer_Audit.sql index a9838cd7..018437b0 100644 --- a/static/MySQL/1416_tbl_Shop_Customer_Audit.sql +++ b/static/MySQL/1416_tbl_Shop_Customer_Audit.sql @@ -1,5 +1,5 @@ -# Customer Audits +-- Customer Audits diff --git a/static/MySQL/1418_tbl_Shop_Customer_Sales_Order.sql b/static/MySQL/1418_tbl_Shop_Customer_Sales_Order.sql index 1d22b588..e71a4b21 100644 --- a/static/MySQL/1418_tbl_Shop_Customer_Sales_Order.sql +++ b/static/MySQL/1418_tbl_Shop_Customer_Sales_Order.sql @@ -1,5 +1,5 @@ -# Customer Sales Purchase Order +-- Customer Sales Purchase Order diff --git a/static/MySQL/1419_tbl_Shop_Customer_Sales_Order_Audit.sql b/static/MySQL/1419_tbl_Shop_Customer_Sales_Order_Audit.sql index 82165326..8af149c2 100644 --- a/static/MySQL/1419_tbl_Shop_Customer_Sales_Order_Audit.sql +++ b/static/MySQL/1419_tbl_Shop_Customer_Sales_Order_Audit.sql @@ -1,5 +1,5 @@ -# Customer Sales Order Audits +-- Customer Sales Order Audits diff --git a/static/MySQL/1421_tbl_Shop_Stock_Item.sql b/static/MySQL/1421_tbl_Shop_Stock_Item.sql index 3bebfe90..57693684 100644 --- a/static/MySQL/1421_tbl_Shop_Stock_Item.sql +++ b/static/MySQL/1421_tbl_Shop_Stock_Item.sql @@ -1,5 +1,5 @@ -# Stock Stock Item +-- Stock Stock Item -- DROP TABLE IF EXISTS Shop_Stock_Item_Audit; -- DROP TABLE IF EXISTS Shop_Stock_Item; diff --git a/static/MySQL/1422_tbl_Shop_Stock_Item_Audit.sql b/static/MySQL/1422_tbl_Shop_Stock_Item_Audit.sql index 8e283a35..6c0fa456 100644 --- a/static/MySQL/1422_tbl_Shop_Stock_Item_Audit.sql +++ b/static/MySQL/1422_tbl_Shop_Stock_Item_Audit.sql @@ -1,5 +1,5 @@ -# Stock Item Audits +-- Stock Item Audits diff --git a/static/MySQL/1423_tbl_Shop_Stock_Item_Temp.sql b/static/MySQL/1423_tbl_Shop_Stock_Item_Temp.sql index 8393de95..182c0523 100644 --- a/static/MySQL/1423_tbl_Shop_Stock_Item_Temp.sql +++ b/static/MySQL/1423_tbl_Shop_Stock_Item_Temp.sql @@ -1,5 +1,5 @@ -# Stock Stock Item Temp +-- Stock Stock Item Temp DROP TABLE IF EXISTS Shop_Stock_Item_Temp; diff --git a/static/MySQL/1424_tbl_Shop_Supplier_Purchase_Order_Product_Link.sql b/static/MySQL/1424_tbl_Shop_Supplier_Purchase_Order_Product_Link.sql index 9d16cf04..71f96542 100644 --- a/static/MySQL/1424_tbl_Shop_Supplier_Purchase_Order_Product_Link.sql +++ b/static/MySQL/1424_tbl_Shop_Supplier_Purchase_Order_Product_Link.sql @@ -1,5 +1,5 @@ -# Supplier Purchase Order Product Link +-- Supplier Purchase Order Product Link diff --git a/static/MySQL/1425_tbl_Shop_Supplier_Purchase_Order_Product_Link_Audit.sql b/static/MySQL/1425_tbl_Shop_Supplier_Purchase_Order_Product_Link_Audit.sql index 5f23865c..6e1b2c23 100644 --- a/static/MySQL/1425_tbl_Shop_Supplier_Purchase_Order_Product_Link_Audit.sql +++ b/static/MySQL/1425_tbl_Shop_Supplier_Purchase_Order_Product_Link_Audit.sql @@ -1,5 +1,5 @@ -# Supplier Purchase Order Product Link Audits +-- Supplier Purchase Order Product Link Audits diff --git a/static/MySQL/1426_tbl_Shop_Supplier_Purchase_Order_Product_Link_Temp.sql b/static/MySQL/1426_tbl_Shop_Supplier_Purchase_Order_Product_Link_Temp.sql index d0765079..7e7478a4 100644 --- a/static/MySQL/1426_tbl_Shop_Supplier_Purchase_Order_Product_Link_Temp.sql +++ b/static/MySQL/1426_tbl_Shop_Supplier_Purchase_Order_Product_Link_Temp.sql @@ -1,5 +1,5 @@ -# Supplier Purchase Order Product Link Temp +-- Supplier Purchase Order Product Link Temp diff --git a/static/MySQL/1427_tbl_Shop_Manufacturing_Purchase_Order_Product_Link.sql b/static/MySQL/1427_tbl_Shop_Manufacturing_Purchase_Order_Product_Link.sql index fc45c92a..496319e1 100644 --- a/static/MySQL/1427_tbl_Shop_Manufacturing_Purchase_Order_Product_Link.sql +++ b/static/MySQL/1427_tbl_Shop_Manufacturing_Purchase_Order_Product_Link.sql @@ -1,5 +1,5 @@ -# Manufacturing Purchase Order Product Link +-- Manufacturing Purchase Order Product Link -- DROP TABLE partsltd_prod.Shop_Manufacturing_Purchase_Order_Product_Link_Audit -- DROP TABLE partsltd_prod.Shop_Manufacturing_Purchase_Order_Product_Link diff --git a/static/MySQL/1428_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Audit.sql b/static/MySQL/1428_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Audit.sql index b0e2d84e..1bca18b5 100644 --- a/static/MySQL/1428_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Audit.sql +++ b/static/MySQL/1428_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Audit.sql @@ -1,5 +1,5 @@ -# Manufacturing Purchase Order Product Link Audits +-- Manufacturing Purchase Order Product Link Audits diff --git a/static/MySQL/1429_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Temp.sql b/static/MySQL/1429_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Temp.sql index 14480489..31b6510b 100644 --- a/static/MySQL/1429_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Temp.sql +++ b/static/MySQL/1429_tbl_Shop_Manufacturing_Purchase_Order_Product_Link_Temp.sql @@ -1,5 +1,5 @@ -# Manufacturing Purchase Order Product Link Temp +-- Manufacturing Purchase Order Product Link Temp -- DROP TABLE Shop_Manufacturing_Purchase_Order_Product_Link_Temp; -- SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp; diff --git a/static/MySQL/1430_tbl_Shop_Customer_Sales_Order_Product_Link.sql b/static/MySQL/1430_tbl_Shop_Customer_Sales_Order_Product_Link.sql index 46814584..84fd5599 100644 --- a/static/MySQL/1430_tbl_Shop_Customer_Sales_Order_Product_Link.sql +++ b/static/MySQL/1430_tbl_Shop_Customer_Sales_Order_Product_Link.sql @@ -1,5 +1,5 @@ -# Customer Sales Order Product Link +-- Customer Sales Order Product Link diff --git a/static/MySQL/1431_tbl_Shop_Customer_Sales_Order_Product_Link_Audit.sql b/static/MySQL/1431_tbl_Shop_Customer_Sales_Order_Product_Link_Audit.sql index 30fb446d..fece3a29 100644 --- a/static/MySQL/1431_tbl_Shop_Customer_Sales_Order_Product_Link_Audit.sql +++ b/static/MySQL/1431_tbl_Shop_Customer_Sales_Order_Product_Link_Audit.sql @@ -1,5 +1,5 @@ -# Customer Sales Order Product Link Audits +-- Customer Sales Order Product Link Audits diff --git a/static/MySQL/1432_tbl_Shop_Customer_Sales_Order_Product_Link_Temp.sql b/static/MySQL/1432_tbl_Shop_Customer_Sales_Order_Product_Link_Temp.sql index ad095205..310e1090 100644 --- a/static/MySQL/1432_tbl_Shop_Customer_Sales_Order_Product_Link_Temp.sql +++ b/static/MySQL/1432_tbl_Shop_Customer_Sales_Order_Product_Link_Temp.sql @@ -1,5 +1,5 @@ -# Customer Sales Order Product Link Temp +-- Customer Sales Order Product Link Temp diff --git a/static/MySQL/1500_tbl_Shop_Calc_User_Temp.sql b/static/MySQL/1500_tbl_Shop_Calc_User_Temp.sql index d5db1528..f6ee85d2 100644 --- a/static/MySQL/1500_tbl_Shop_Calc_User_Temp.sql +++ b/static/MySQL/1500_tbl_Shop_Calc_User_Temp.sql @@ -1,5 +1,5 @@ -# Calc User Staging +-- Calc User Staging -- USE partsltd_prod; -- DROP TABLE IF EXISTS Shop_Calc_User_Temp; diff --git a/static/MySQL/3000_tri_Shop_Access_Level.sql b/static/MySQL/3000_tri_Shop_Access_Level.sql index 4ffd740f..c3b231ac 100644 --- a/static/MySQL/3000_tri_Shop_Access_Level.sql +++ b/static/MySQL/3000_tri_Shop_Access_Level.sql @@ -1,5 +1,5 @@ -# Shop Access Level +-- Shop Access Level @@ -35,23 +35,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_access_level, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT (OLD.code <=> NEW.code) UNION - # Changed name + -- Changed name SELECT NEW.id_access_level, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION - # Changed priority + -- Changed priority SELECT NEW.id_access_level, 'priority', CONVERT(OLD.priority, CHAR), CONVERT(NEW.priority, CHAR), NEW.id_change_set WHERE NOT (OLD.priority <=> NEW.priority) UNION - # Changed active + -- Changed active SELECT NEW.id_access_level, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_access_level, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; diff --git a/static/MySQL/3000_tri_Shop_Product_Change_Set.sql b/static/MySQL/3000_tri_Shop_Product_Change_Set.sql index bc6ebc0b..bf110ef5 100644 --- a/static/MySQL/3000_tri_Shop_Product_Change_Set.sql +++ b/static/MySQL/3000_tri_Shop_Product_Change_Set.sql @@ -1,5 +1,5 @@ -# Product Change Set +-- Product Change Set diff --git a/static/MySQL/3001_tri_Shop_User_Change_Set.sql b/static/MySQL/3001_tri_Shop_User_Change_Set.sql index 8e20859f..8d9af572 100644 --- a/static/MySQL/3001_tri_Shop_User_Change_Set.sql +++ b/static/MySQL/3001_tri_Shop_User_Change_Set.sql @@ -1,5 +1,5 @@ -# Shop User Change Set +-- Shop User Change Set 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 60f1abda..94dd7637 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 @@ -1,5 +1,5 @@ -# Product Change Set +-- Product Change Set diff --git a/static/MySQL/3010_tri_File_Type.sql b/static/MySQL/3010_tri_File_Type.sql index 529c4def..613e1cd4 100644 --- a/static/MySQL/3010_tri_File_Type.sql +++ b/static/MySQL/3010_tri_File_Type.sql @@ -1,5 +1,5 @@ -# File Type +-- File Type @@ -27,15 +27,15 @@ BEGIN value_prev, value_new ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name WHERE NOT OLD.name <=> NEW.name UNION - # Changed extension + -- Changed extension SELECT NEW.id_type, 'extension', CONVERT(OLD.extension, CHAR), CONVERT(NEW.extension, CHAR) WHERE NOT OLD.extension <=> NEW.extension ; diff --git a/static/MySQL/3011_tri_File_Type_Audit.sql b/static/MySQL/3011_tri_File_Type_Audit.sql index 4a198890..529df018 100644 --- a/static/MySQL/3011_tri_File_Type_Audit.sql +++ b/static/MySQL/3011_tri_File_Type_Audit.sql @@ -1,5 +1,5 @@ -# File Type Audits +-- File Type Audits diff --git a/static/MySQL/3012_tri_Shop_General.sql b/static/MySQL/3012_tri_Shop_General.sql index aa8f4036..1b1a7e76 100644 --- a/static/MySQL/3012_tri_Shop_General.sql +++ b/static/MySQL/3012_tri_Shop_General.sql @@ -1,5 +1,5 @@ -# Shop General +-- Shop General @@ -33,7 +33,7 @@ BEGIN value_new, id_change_set ) - # Changed quantity max + -- Changed quantity max SELECT NEW.id_general, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; diff --git a/static/MySQL/3014_tri_Shop_Image_Type.sql b/static/MySQL/3014_tri_Shop_Image_Type.sql index fac5eeab..62968b00 100644 --- a/static/MySQL/3014_tri_Shop_Image_Type.sql +++ b/static/MySQL/3014_tri_Shop_Image_Type.sql @@ -1,5 +1,5 @@ -# Shop Image Type +-- Shop Image Type @@ -36,28 +36,28 @@ BEGIN id_change_set ) /* - # Changed id_type_file + -- Changed id_type_file SELECT NEW.id_type, 'id_type_file', OLD.id_type_file, NEW.id_type_file, NEW.id_change_set WHERE NOT OLD.id_type_file <=> NEW.id_type_file UNION */ - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; diff --git a/static/MySQL/3100_tri_Shop_Region.sql b/static/MySQL/3100_tri_Shop_Region.sql index cb759121..8e677a42 100644 --- a/static/MySQL/3100_tri_Shop_Region.sql +++ b/static/MySQL/3100_tri_Shop_Region.sql @@ -1,5 +1,5 @@ -# Shop Delivery Region +-- Shop Delivery Region @@ -35,19 +35,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_region, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_region, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_region, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_region, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; diff --git a/static/MySQL/3103_tri_Shop_Region_Branch.sql b/static/MySQL/3103_tri_Shop_Region_Branch.sql index 56dc6316..fc0c3081 100644 --- a/static/MySQL/3103_tri_Shop_Region_Branch.sql +++ b/static/MySQL/3103_tri_Shop_Region_Branch.sql @@ -1,5 +1,5 @@ -# Shop Region Branch +-- Shop Region Branch @@ -36,16 +36,16 @@ BEGIN id_change_set ) /* - # Changed depth + -- Changed depth SELECT NEW.id_branch, 'depth', CONVERT(OLD.depth, CHAR), CONVERT(NEW.depth, CHAR), NEW.id_change_set WHERE NOT OLD.depth <=> NEW.depth UNION */ - # Changed active + -- Changed active SELECT NEW.id_branch, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_branch, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; diff --git a/static/MySQL/3106_tri_Shop_Address.sql b/static/MySQL/3106_tri_Shop_Address.sql index 2203be87..cde656e8 100644 --- a/static/MySQL/3106_tri_Shop_Address.sql +++ b/static/MySQL/3106_tri_Shop_Address.sql @@ -1,5 +1,5 @@ -# Shop Address +-- Shop Address @@ -35,31 +35,31 @@ BEGIN value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3109_tri_Shop_Storage_Location.sql b/static/MySQL/3109_tri_Shop_Storage_Location.sql index 17d0a810..8231de32 100644 --- a/static/MySQL/3109_tri_Shop_Storage_Location.sql +++ b/static/MySQL/3109_tri_Shop_Storage_Location.sql @@ -1,5 +1,5 @@ -# Shop Storage Location +-- Shop Storage Location @@ -35,19 +35,19 @@ BEGIN value_new, id_change_set ) - # Changed id_plant + -- Changed id_plant SELECT NEW.id_location, 'id_plant', OLD.id_plant, NEW.id_plant, NEW.id_change_set WHERE NOT OLD.id_plant <=> NEW.id_plant UNION - # Changed code + -- Changed code SELECT NEW.id_location, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_location, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_location, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; diff --git a/static/MySQL/3115_tri_Shop_Currency.sql b/static/MySQL/3115_tri_Shop_Currency.sql index c16d0f3c..93abf6c3 100644 --- a/static/MySQL/3115_tri_Shop_Currency.sql +++ b/static/MySQL/3115_tri_Shop_Currency.sql @@ -1,5 +1,5 @@ -# Shop Currency +-- Shop Currency @@ -35,27 +35,27 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_currency, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_currency, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed symbol + -- Changed symbol SELECT NEW.id_currency, 'symbol', OLD.symbol, NEW.symbol, NEW.id_change_set WHERE NOT OLD.symbol <=> NEW.symbol UNION - # Changed ratio_2_GBP + -- Changed ratio_2_GBP SELECT NEW.id_currency, 'factor_from_GBP', OLD.factor_from_GBP, NEW.factor_from_GBP, NEW.id_change_set WHERE NOT OLD.factor_from_GBP <=> NEW.factor_from_GBP UNION - # Changed active + -- Changed active SELECT NEW.id_currency, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_currency, 'display_order', CONVERT(display_order, CHAR), CONVERT(display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; diff --git a/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql b/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql index cf56d456..f166fe75 100644 --- a/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql +++ b/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql @@ -1,5 +1,5 @@ -# Shop Tax_Or_Surcharge +-- Shop Tax_Or_Surcharge @@ -34,39 +34,39 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_tax, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_tax, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed fixed_fee + -- Changed fixed_fee SELECT NEW.id_tax, 'fixed_fee', OLD.fixed_fee, NEW.fixed_fee, NEW.id_change_set WHERE NOT OLD.fixed_fee <=> NEW.fixed_fee UNION - # Changed multiplier + -- Changed multiplier SELECT NEW.id_tax, 'multiplier', OLD.multiplier, NEW.multiplier, NEW.id_change_set WHERE NOT OLD.multiplier <=> NEW.multiplier UNION - # Changed apply_fixed_fee_before_multiplier + -- Changed apply_fixed_fee_before_multiplier SELECT NEW.id_tax, 'apply_fixed_fee_before_multiplier', CONVERT(CONVERT(OLD.apply_fixed_fee_before_multiplier, SIGNED), CHAR), CONVERT(CONVERT(NEW.apply_fixed_fee_before_multiplier, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.apply_fixed_fee_before_multiplier <=> NEW.apply_fixed_fee_before_multiplier UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_tax, 'quantity_min', OLD.quantity_min, NEW.quantity_min, NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_tax, 'quantity_max', OLD.quantity_max, NEW.quantity_max, NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_tax, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_tax, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; diff --git a/static/MySQL/3200_tri_Shop_Category.sql b/static/MySQL/3200_tri_Shop_Category.sql index 3ae73e92..f3100247 100644 --- a/static/MySQL/3200_tri_Shop_Category.sql +++ b/static/MySQL/3200_tri_Shop_Category.sql @@ -1,5 +1,5 @@ -# Shop Category +-- Shop Category @@ -33,27 +33,27 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_category, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_category, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed description + -- Changed description SELECT NEW.id_category, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed active + -- Changed active SELECT NEW.id_category, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_category, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed id_access_level_required + -- Changed id_access_level_required SELECT NEW.id_category, 'id_access_level_required', CONVERT(OLD.id_access_level_required, CHAR), CONVERT(NEW.id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required ; diff --git a/static/MySQL/3203_tri_Shop_Product.sql b/static/MySQL/3203_tri_Shop_Product.sql index 596e1c60..b55c041a 100644 --- a/static/MySQL/3203_tri_Shop_Product.sql +++ b/static/MySQL/3203_tri_Shop_Product.sql @@ -1,5 +1,5 @@ -# Shop Product +-- Shop Product @@ -80,89 +80,89 @@ BEGIN value_new, id_change_set ) - # Changed name + -- Changed name SELECT NEW.id_product, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name /* UNION - # Changed description + -- Changed description SELECT NEW.id_product, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed price_GBP_full + -- Changed price_GBP_full SELECT NEW.id_product, 'price_GBP_full', CONVERT(OLD.price_GBP_full, CHAR), CONVERT(NEW.price_GBP_full, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP_full <=> NEW.price_GBP_full UNION - # Changed price_GBP_min + -- Changed price_GBP_min SELECT NEW.id_product, 'price_GBP_min', CONVERT(OLD.price_GBP_min, CHAR), CONVERT(NEW.price_GBP_min, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP_min <=> NEW.price_GBP_min UNION /* - # Changed discount + -- Changed discount SELECT NEW.id_product, 'discount', CONVERT(OLD.discount, CHAR), CONVERT(NEW.discount, CHAR), NEW.id_change_set WHERE NOT OLD.discount <=> NEW.discount */ UNION - # Changed id_category + -- Changed id_category SELECT NEW.id_product, 'id_category', CONVERT(OLD.id_category, CHAR), CONVERT(NEW.id_category, CHAR), NEW.id_change_set WHERE NOT OLD.id_category <=> NEW.id_category UNION - # Changed has_variations + -- Changed has_variations SELECT NEW.id_product, 'has_variations', CONVERT(CONVERT(NEW.has_variations, SIGNED), CHAR), CONVERT(CONVERT(NEW.has_variations, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.has_variations <=> NEW.has_variations /* UNION - # Changed latency_manuf + -- Changed latency_manuf SELECT NEW.id_product, 'latency_manuf', CONVERT(OLD.latency_manuf, CHAR), CONVERT(NEW.latency_manuf, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manuf <=> NEW.latency_manuf UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_product, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_product, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_step + -- Changed quantity_step SELECT NEW.id_product, 'quantity_step', CONVERT(OLD.quantity_step, CHAR), CONVERT(NEW.quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_step <=> NEW.quantity_step UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_product, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_product, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_product, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_product, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_product, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT OLD.id_stripe_product <=> NEW.id_stripe_product /* UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_product, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price */ UNION - # Changed id_access_level_required + -- Changed id_access_level_required SELECT NEW.id_product, 'id_access_level_required', CONVERT(OLD.id_access_level_required, CHAR), CONVERT(NEW.id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required UNION - # Changed active + -- Changed active SELECT NEW.id_product, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_product, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; diff --git a/static/MySQL/3206_tri_Shop_Product_Permutation.sql b/static/MySQL/3206_tri_Shop_Product_Permutation.sql index c2bcbe9d..c19ad38a 100644 --- a/static/MySQL/3206_tri_Shop_Product_Permutation.sql +++ b/static/MySQL/3206_tri_Shop_Product_Permutation.sql @@ -1,5 +1,5 @@ -# Shop Product Permutation +-- Shop Product Permutation @@ -56,109 +56,109 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_permutation, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_permutation, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION - # Changed name + -- Changed name SELECT NEW.id_permutation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION */ - # Changed description + -- Changed description SELECT NEW.id_permutation, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT (OLD.description <=> NEW.description) UNION - # Changed cost_local_VAT_excl + -- Changed cost_local_VAT_excl SELECT NEW.id_permutation, 'cost_local_VAT_excl', CONVERT(OLD.cost_local_VAT_excl, CHAR), CONVERT(NEW.cost_local_VAT_excl, CHAR), NEW.id_change_set WHERE NOT (OLD.cost_local_VAT_excl <=> NEW.cost_local_VAT_excl) UNION - # Changed cost_local_VAT_incl + -- Changed cost_local_VAT_incl SELECT NEW.id_permutation, 'cost_local_VAT_incl', CONVERT(OLD.cost_local_VAT_incl, CHAR), CONVERT(NEW.cost_local_VAT_incl, CHAR), NEW.id_change_set WHERE NOT (OLD.cost_local_VAT_incl <=> NEW.cost_local_VAT_incl) UNION - # Changed id_currency_cost + -- Changed id_currency_cost SELECT NEW.id_permutation, 'id_currency_cost', CONVERT(OLD.id_currency_cost, CHAR), CONVERT(NEW.id_currency_cost, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_cost <=> NEW.id_currency_cost) UNION /* - # Changed profit_local_min + -- Changed profit_local_min SELECT NEW.id_permutation, 'profit_local_min', CONVERT(OLD.profit_local_min, CHAR), CONVERT(NEW.profit_local_min, CHAR), NEW.id_change_set WHERE NOT (OLD.profit_local_min <=> NEW.profit_local_min) UNION - # Changed id_currency_profit_min + -- Changed id_currency_profit_min SELECT NEW.id_permutation, 'id_currency_profit_min', CONVERT(OLD.id_currency_profit_min, CHAR), CONVERT(NEW.id_currency_profit_min, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_profit_min <=> NEW.id_currency_profit_min) UNION */ /* - # Changed price_GBP_min + -- Changed price_GBP_min SELECT NEW.id_permutation, 'price_GBP_min', CONVERT(OLD.price_GBP_min, CHAR), CONVERT(NEW.price_GBP_min, CHAR), NEW.id_change_set WHERE NOT (OLD.price_GBP_min <=> NEW.price_GBP_min) UNION */ - # Changed latency_manufacture + -- Changed latency_manufacture SELECT NEW.id_permutation, 'latency_manufacture', CONVERT(OLD.latency_manufacture, CHAR), CONVERT(NEW.latency_manufacture, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manufacture <=> NEW.latency_manufacture UNION - # Changed id_unit_measurement_quantity + -- Changed id_unit_measurement_quantity SELECT NEW.id_permutation, 'id_unit_measurement_quantity', CONVERT(OLD.id_unit_measurement_quantity, CHAR), CONVERT(NEW.id_unit_measurement_quantity, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_quantity <=> NEW.id_unit_measurement_quantity UNION - # Changed count_unit_measurement_per_quantity_step + -- Changed count_unit_measurement_per_quantity_step SELECT NEW.id_permutation, 'count_unit_measurement_per_quantity_step', CONVERT(OLD.count_unit_measurement_per_quantity_step, CHAR), CONVERT(NEW.count_unit_measurement_per_quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.count_unit_measurement_per_quantity_step <=> NEW.count_unit_measurement_per_quantity_step UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_permutation, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_permutation, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_permutation, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_permutation, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_permutation, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_permutation, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_permutation, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT (OLD.id_stripe_product <=> NEW.id_stripe_product) UNION - # Changed does_expire_faster_once_unsealed + -- Changed does_expire_faster_once_unsealed SELECT NEW.id_permutation, 'does_expire_faster_once_unsealed', CONVERT(OLD.does_expire_faster_once_unsealed, CHAR), CONVERT(NEW.does_expire_faster_once_unsealed, CHAR), NEW.id_change_set WHERE NOT OLD.does_expire_faster_once_unsealed <=> NEW.does_expire_faster_once_unsealed UNION - # Changed id_unit_measurement_interval_expiration_unsealed + -- Changed id_unit_measurement_interval_expiration_unsealed SELECT NEW.id_permutation, 'id_unit_measurement_interval_expiration_unsealed', CONVERT(OLD.id_unit_measurement_interval_expiration_unsealed, CHAR), CONVERT(NEW.id_unit_measurement_interval_expiration_unsealed, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_expiration_unsealed <=> NEW.id_unit_measurement_interval_expiration_unsealed UNION - # Changed count_interval_expiration_unsealed + -- Changed count_interval_expiration_unsealed SELECT NEW.id_permutation, 'count_interval_expiration_unsealed', CONVERT(OLD.count_interval_expiration_unsealed, CHAR), CONVERT(NEW.count_interval_expiration_unsealed, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_expiration_unsealed <=> NEW.count_interval_expiration_unsealed UNION - # Changed active + -- Changed active SELECT NEW.id_permutation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) /* UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_permutation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) */ diff --git a/static/MySQL/3209_tri_Shop_Variation_Type.sql b/static/MySQL/3209_tri_Shop_Variation_Type.sql index 8a642c49..b7f75613 100644 --- a/static/MySQL/3209_tri_Shop_Variation_Type.sql +++ b/static/MySQL/3209_tri_Shop_Variation_Type.sql @@ -1,5 +1,5 @@ -# Shop Variation Type +-- Shop Variation Type @@ -36,23 +36,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; diff --git a/static/MySQL/3212_tri_Shop_Variation.sql b/static/MySQL/3212_tri_Shop_Variation.sql index 729a3858..20b90194 100644 --- a/static/MySQL/3212_tri_Shop_Variation.sql +++ b/static/MySQL/3212_tri_Shop_Variation.sql @@ -1,5 +1,5 @@ -# Shop Variation +-- Shop Variation @@ -35,27 +35,27 @@ BEGIN value_new, id_change_set ) - # Changed id_unit_measurement + -- Changed id_unit_measurement SELECT NEW.id_variation, 'id_unit_measurement', OLD.id_unit_measurement, NEW.id_unit_measurement, NEW.id_change_set WHERE NOT OLD.id_unit_measurement <=> NEW.id_unit_measurement UNION - # Changed count_unit_measurement + -- Changed count_unit_measurement SELECT NEW.id_variation, 'count_unit_measurement', OLD.count_unit_measurement, NEW.count_unit_measurement, NEW.id_change_set WHERE NOT OLD.count_unit_measurement <=> NEW.count_unit_measurement UNION - # Changed code + -- Changed code SELECT NEW.id_variation, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_variation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_variation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_variation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; 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 f33a1448..8ca2dcfe 100644 --- a/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql +++ b/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql @@ -1,5 +1,5 @@ -# Shop Product Permutation Variation Link +-- Shop Product Permutation Variation Link @@ -36,20 +36,20 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_link, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; diff --git a/static/MySQL/3218_tri_Shop_Stock_Item.sql b/static/MySQL/3218_tri_Shop_Stock_Item.sql index d5be86d9..fe993efe 100644 --- a/static/MySQL/3218_tri_Shop_Stock_Item.sql +++ b/static/MySQL/3218_tri_Shop_Stock_Item.sql @@ -1,5 +1,5 @@ -# Shop Product Permutation +-- Shop Product Permutation @@ -35,55 +35,55 @@ BEGIN value_new, id_change_set ) - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_stock, 'id_permutation', OLD.id_permutation, NEW.id_permutation, NEW.id_change_set WHERE NOT (OLD.id_permutation <=> NEW.id_permutation) UNION - # Changed date_purchased + -- Changed date_purchased SELECT NEW.id_stock, 'date_purchased', OLD.date_purchased, NEW.date_purchased, NEW.id_change_set WHERE NOT (OLD.date_purchased <=> NEW.date_purchased) UNION - # Changed date_received + -- Changed date_received SELECT NEW.id_stock, 'date_received', OLD.date_received, NEW.date_received, NEW.id_change_set WHERE NOT (OLD.date_received <=> NEW.date_received) UNION - # Changed id_location_storage + -- Changed id_location_storage SELECT NEW.id_stock, 'id_location_storage', OLD.id_location_storage, NEW.id_location_storage, NEW.id_change_set WHERE NOT (OLD.id_location_storage <=> NEW.id_location_storage) UNION - # Changed id_currency_cost + -- Changed id_currency_cost SELECT NEW.id_stock, 'id_currency_cost', OLD.id_currency_cost, NEW.id_currency_cost, NEW.id_change_set WHERE NOT (OLD.id_currency_cost <=> NEW.id_currency_cost) UNION - # Changed cost_local_VAT_incl + -- Changed cost_local_VAT_incl SELECT NEW.id_stock, 'cost_local_VAT_incl', OLD.cost_local_VAT_incl, NEW.cost_local_VAT_incl, NEW.id_change_set WHERE NOT (OLD.cost_local_VAT_incl <=> NEW.cost_local_VAT_incl) UNION - # Changed cost_local_VAT_excl + -- Changed cost_local_VAT_excl SELECT NEW.id_stock, 'cost_local_VAT_excl', OLD.cost_local_VAT_excl, NEW.cost_local_VAT_excl, NEW.id_change_set WHERE NOT (OLD.cost_local_VAT_excl <=> NEW.cost_local_VAT_excl) UNION - # Changed is_sealed + -- Changed is_sealed SELECT NEW.id_stock, 'is_sealed', OLD.is_sealed, NEW.is_sealed, NEW.id_change_set WHERE NOT (OLD.is_sealed <=> NEW.is_sealed) UNION - # Changed date_unsealed + -- Changed date_unsealed SELECT NEW.id_stock, 'date_unsealed', OLD.date_unsealed, NEW.date_unsealed, NEW.id_change_set WHERE NOT (OLD.date_unsealed <=> NEW.date_unsealed) UNION - # Changed date_expiration + -- Changed date_expiration SELECT NEW.id_stock, 'date_expiration', OLD.date_expiration, NEW.date_expiration, NEW.id_change_set WHERE NOT (OLD.date_expiration <=> NEW.date_expiration) UNION - # Changed is_consumed + -- Changed is_consumed SELECT NEW.id_stock, 'is_consumed', OLD.is_consumed, NEW.is_consumed, NEW.id_change_set WHERE NOT (OLD.is_consumed <=> NEW.is_consumed) UNION - # Changed date_consumed + -- Changed date_consumed SELECT NEW.id_stock, 'date_consumed', OLD.date_consumed, NEW.date_consumed, NEW.id_change_set WHERE NOT (OLD.date_consumed <=> NEW.date_consumed) UNION - # Changed active + -- Changed active SELECT NEW.id_stock, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3221_tri_Shop_Product_Price.sql b/static/MySQL/3221_tri_Shop_Product_Price.sql index 8dff41d5..2abe60dc 100644 --- a/static/MySQL/3221_tri_Shop_Product_Price.sql +++ b/static/MySQL/3221_tri_Shop_Product_Price.sql @@ -1,5 +1,5 @@ -# Shop Product Currency Link +-- Shop Product Currency Link @@ -55,31 +55,31 @@ BEGIN value_new, id_change_set ) - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_price, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_price, 'id_currency', CONVERT(OLD.id_currency, CHAR), CONVERT(NEW.id_currency, CHAR), NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed id_region_purchase + -- Changed id_region_purchase SELECT NEW.id_price, 'id_region_purchase', CONVERT(OLD.id_region_purchase, CHAR), CONVERT(NEW.id_region_purchase, CHAR), NEW.id_change_set WHERE NOT OLD.id_region_purchase <=> NEW.id_region_purchase UNION - # Changed price_local_VAT_incl + -- Changed price_local_VAT_incl SELECT NEW.id_price, 'price_local_VAT_incl', OLD.price_local_VAT_incl, NEW.price_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_incl <=> NEW.price_local_VAT_incl UNION - # Changed price_local_VAT_excl + -- Changed price_local_VAT_excl SELECT NEW.id_price, 'price_local_VAT_excl', OLD.price_local_VAT_excl, NEW.price_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_excl <=> NEW.price_local_VAT_excl UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_price, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price UNION - # Changed active + -- Changed active SELECT NEW.id_price, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3224_tri_Shop_Product_Image.sql b/static/MySQL/3224_tri_Shop_Product_Image.sql index 09e437c2..6b53a70f 100644 --- a/static/MySQL/3224_tri_Shop_Product_Image.sql +++ b/static/MySQL/3224_tri_Shop_Product_Image.sql @@ -1,5 +1,5 @@ -# Shop Image +-- Shop Image @@ -39,33 +39,33 @@ BEGIN value_new, id_change_set ) - # Changed id_type_image + -- Changed id_type_image SELECT NEW.id_image, 'id_type_image', CONVERT(OLD.id_type_image, CHAR), CONVERT(NEW.id_type_image, CHAR), NEW.id_change_set WHERE NOT OLD.id_type_image <=> NEW.id_type_image UNION /* - # Changed id_type_file + -- Changed id_type_file SELECT NEW.id_image, 'id_type_file', CONVERT(OLD.id_type_file, CHAR), CONVERT(NEW.id_type_file, CHAR), NEW.id_change_set WHERE NOT OLD.id_type_file <=> NEW.id_type_file UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_image, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION */ - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_image, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed url + -- Changed url SELECT NEW.id_image, 'url', OLD.url, NEW.url, NEW.id_change_set WHERE NOT OLD.url <=> NEW.url UNION - # Changed active + -- Changed active SELECT NEW.id_image, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_image, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; diff --git a/static/MySQL/3227_tri_Shop_Delivery_Option.sql b/static/MySQL/3227_tri_Shop_Delivery_Option.sql index 9876ac42..736c0cb4 100644 --- a/static/MySQL/3227_tri_Shop_Delivery_Option.sql +++ b/static/MySQL/3227_tri_Shop_Delivery_Option.sql @@ -1,5 +1,5 @@ -# Shop Delivery Option Type +-- Shop Delivery Option Type @@ -35,37 +35,37 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_option, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_option, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed latency_delivery_min + -- Changed latency_delivery_min SELECT NEW.id_option, 'latency_delivery_min', CONVERT(OLD.latency_delivery_min, CHAR), CONVERT(NEW.latency_delivery_min, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_min <=> NEW.latency_delivery_min UNION - # Changed latency_delivery_max + -- Changed latency_delivery_max SELECT NEW.id_option, 'latency_delivery_max', CONVERT(OLD.latency_delivery_max, CHAR), CONVERT(NEW.latency_delivery_max, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_max <=> NEW.latency_delivery_max /* UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_option, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_option, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max */ UNION - # Changed active + -- Changed active SELECT NEW.id_option, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_option, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; 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 ef098ba6..8f650ca2 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 @@ -1,5 +1,5 @@ -# Shop Product Delivery Option Link +-- Shop Product Delivery Option Link @@ -36,42 +36,42 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed id_option + -- Changed id_option SELECT NEW.id_link, 'id_option', CONVERT(OLD.id_option, CHAR), CONVERT(NEW.id_option, CHAR), NEW.id_change_set WHERE NOT OLD.id_option <=> NEW.id_option UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', CONVERT(OLD.price_local, CHAR), CONVERT(NEW.price_local, CHAR), NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local /* UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_link, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_link, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max */ UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; diff --git a/static/MySQL/3233_tri_Shop_Discount.sql b/static/MySQL/3233_tri_Shop_Discount.sql index b0fdaa6f..ae5da9aa 100644 --- a/static/MySQL/3233_tri_Shop_Discount.sql +++ b/static/MySQL/3233_tri_Shop_Discount.sql @@ -1,5 +1,5 @@ -# Shop Discount +-- Shop Discount @@ -34,47 +34,47 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_discount, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_discount, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed multiplier + -- Changed multiplier SELECT NEW.id_discount, 'multiplier', OLD.multiplier, NEW.multiplier, NEW.id_change_set WHERE NOT OLD.multiplier <=> NEW.multiplier UNION - # Changed subtractor + -- Changed subtractor SELECT NEW.id_discount, 'subtractor', OLD.subtractor, NEW.subtractor, NEW.id_change_set WHERE NOT OLD.subtractor <=> NEW.subtractor UNION - # Changed apply_multiplier_first + -- Changed apply_multiplier_first SELECT NEW.id_discount, 'apply_multiplier_first', CONVERT(CONVERT(OLD.apply_multiplier_first, SIGNED), CHAR), CONVERT(CONVERT(NEW.apply_multiplier_first, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.apply_multiplier_first <=> NEW.apply_multiplier_first UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_discount, 'quantity_min', OLD.quantity_min, NEW.quantity_min, NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_discount, 'quantity_max', OLD.quantity_max, NEW.quantity_max, NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed date_start + -- Changed date_start SELECT NEW.id_discount, 'date_start', OLD.date_start, NEW.date_start, NEW.id_change_set WHERE NOT OLD.date_start <=> NEW.date_start UNION - # Changed date_end + -- Changed date_end SELECT NEW.id_discount, 'date_end', OLD.date_end, NEW.date_end, NEW.id_change_set WHERE NOT OLD.date_end <=> NEW.date_end UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_discount, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_discount, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; 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 b32e6a91..6a4d8b14 100644 --- a/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql +++ b/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql @@ -1,5 +1,5 @@ -# Shop Discount Region Currency Link +-- Shop Discount Region Currency Link @@ -36,16 +36,16 @@ BEGIN id_change_set ) /* - # Changed id_discount + -- Changed id_discount SELECT NEW.id_link, 'id_discount', CONVERT(OLD.id_discount, CHAR), CONVERT(NEW.id_discount, CHAR), NEW.id_change_set WHERE NOT OLD.id_discount <=> NEW.id_discount UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3300_tri_Shop_Permission_Group.sql b/static/MySQL/3300_tri_Shop_Permission_Group.sql index b62b526b..6084157a 100644 --- a/static/MySQL/3300_tri_Shop_Permission_Group.sql +++ b/static/MySQL/3300_tri_Shop_Permission_Group.sql @@ -1,5 +1,5 @@ -# Shop Permission Group +-- Shop Permission Group @@ -35,19 +35,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_group, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_group, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_group, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_group, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; diff --git a/static/MySQL/3303_tri_Shop_Permission.sql b/static/MySQL/3303_tri_Shop_Permission.sql index 2aee47bc..8fdcd006 100644 --- a/static/MySQL/3303_tri_Shop_Permission.sql +++ b/static/MySQL/3303_tri_Shop_Permission.sql @@ -1,5 +1,5 @@ -# Shop Permission +-- Shop Permission @@ -35,27 +35,27 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_permission, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_permission, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed id_permission_group + -- Changed id_permission_group SELECT NEW.id_permission, 'id_permission_group', CONVERT(OLD.id_permission_group, CHAR), CONVERT(NEW.id_permission_group, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission_group <=> NEW.id_permission_group UNION - # Changed Id_access_level_required + -- Changed Id_access_level_required SELECT NEW.id_permission, 'Id_access_level_required', CONVERT(OLD.Id_access_level_required, CHAR), CONVERT(NEW.Id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.Id_access_level_required <=> NEW.Id_access_level_required UNION - # Changed active + -- Changed active SELECT NEW.id_permission, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_permission, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; diff --git a/static/MySQL/3306_tri_Shop_Role.sql b/static/MySQL/3306_tri_Shop_Role.sql index 15b5b37c..b7c24832 100644 --- a/static/MySQL/3306_tri_Shop_Role.sql +++ b/static/MySQL/3306_tri_Shop_Role.sql @@ -1,5 +1,5 @@ -# Shop Role +-- Shop Role @@ -35,19 +35,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_role, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_role, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_role, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_role, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; diff --git a/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql b/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql index 88462337..cfb647dd 100644 --- a/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql +++ b/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql @@ -1,5 +1,5 @@ -# Shop Role Permission Link +-- Shop Role Permission Link @@ -36,20 +36,20 @@ BEGIN id_change_set ) /* - # Changed id_role + -- Changed id_role SELECT NEW.id_link, 'id_role', CONVERT(OLD.id_role, CHAR), CONVERT(NEW.id_role, CHAR), NEW.id_change_set WHERE NOT OLD.id_role <=> NEW.id_role UNION - # Changed id_permission + -- Changed id_permission SELECT NEW.id_link, 'id_permission', CONVERT(OLD.id_permission, CHAR), CONVERT(NEW.id_permission, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission <=> NEW.id_permission UNION */ - # Changed id_access_level + -- Changed id_access_level SELECT NEW.id_link, 'id_access_level', CONVERT(OLD.id_access_level, CHAR), CONVERT(NEW.id_access_level, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level <=> NEW.id_access_level UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3312_tri_Shop_User.sql b/static/MySQL/3312_tri_Shop_User.sql index f177d575..0567d692 100644 --- a/static/MySQL/3312_tri_Shop_User.sql +++ b/static/MySQL/3312_tri_Shop_User.sql @@ -1,5 +1,5 @@ -# Shop User +-- Shop User @@ -35,43 +35,43 @@ BEGIN value_new, id_change_set ) - # Changed id_user_auth0 + -- Changed id_user_auth0 SELECT NEW.id_user, 'id_user_auth0', OLD.id_user_auth0, NEW.id_user_auth0, NEW.id_change_set WHERE NOT (OLD.id_user_auth0 <=> NEW.id_user_auth0) UNION - # Changed firstname + -- Changed firstname SELECT NEW.id_user, 'firstname', OLD.firstname, NEW.firstname, NEW.id_change_set WHERE NOT (OLD.firstname <=> NEW.firstname) UNION - # Changed surname + -- Changed surname SELECT NEW.id_user, 'surname', OLD.surname, NEW.surname, NEW.id_change_set WHERE NOT (OLD.surname <=> NEW.surname) UNION - # Changed email + -- Changed email SELECT NEW.id_user, 'email', OLD.email, NEW.email, NEW.id_change_set WHERE NOT (OLD.email <=> NEW.email) UNION - # Changed is_email_verified + -- Changed is_email_verified SELECT NEW.id_user, 'is_email_verified', CONVERT(CONVERT(OLD.is_email_verified, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_email_verified, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_email_verified <=> NEW.is_email_verified) UNION - # Changed is_super_user + -- Changed is_super_user SELECT NEW.id_user, 'is_super_user', CONVERT(CONVERT(OLD.is_super_user, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_super_user, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_super_user <=> NEW.is_super_user) UNION - # Changed active + -- Changed active SELECT NEW.id_user, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed id_currency_default + -- Changed id_currency_default SELECT NEW.id_user, 'id_currency_default', CONVERT(OLD.id_currency_default, CHAR), CONVERT(NEW.id_currency_default, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_default <=> NEW.id_currency_default) UNION - # Changed id_region_default + -- Changed id_region_default SELECT NEW.id_user, 'id_region_default', CONVERT(OLD.id_region_default, CHAR), CONVERT(NEW.id_region_default, CHAR), NEW.id_change_set WHERE NOT (OLD.id_region_default <=> NEW.id_region_default) UNION - # Changed is_included_VAT_default + -- Changed is_included_VAT_default SELECT NEW.id_user, 'is_included_VAT_default', CONVERT(CONVERT(OLD.is_included_VAT_default, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_included_VAT_default, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_included_VAT_default <=> NEW.is_included_VAT_default) ; diff --git a/static/MySQL/3315_tri_Shop_User_Role_Link.sql b/static/MySQL/3315_tri_Shop_User_Role_Link.sql index 8dba1966..1d5f9f69 100644 --- a/static/MySQL/3315_tri_Shop_User_Role_Link.sql +++ b/static/MySQL/3315_tri_Shop_User_Role_Link.sql @@ -1,5 +1,5 @@ -# Shop User Role Link +-- Shop User Role Link @@ -35,7 +35,7 @@ BEGIN value_new, id_change_set ) - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3318_tri_Shop_User_Address.sql b/static/MySQL/3318_tri_Shop_User_Address.sql index 0399c237..75464a8a 100644 --- a/static/MySQL/3318_tri_Shop_User_Address.sql +++ b/static/MySQL/3318_tri_Shop_User_Address.sql @@ -1,5 +1,5 @@ -# Shop Address +-- Shop Address @@ -35,39 +35,39 @@ BEGIN value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_user_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed name_full + -- Changed name_full SELECT NEW.id_user_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set WHERE NOT OLD.name_full <=> NEW.name_full UNION - # Changed phone_number + -- Changed phone_number SELECT NEW.id_user_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_user_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_user_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_user_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_user_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_user_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_user_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3321_tri_Shop_User_Basket.sql b/static/MySQL/3321_tri_Shop_User_Basket.sql index b7806eab..5957474d 100644 --- a/static/MySQL/3321_tri_Shop_User_Basket.sql +++ b/static/MySQL/3321_tri_Shop_User_Basket.sql @@ -1,5 +1,5 @@ -# Shop Product Variation Link +-- Shop Product Variation Link @@ -35,19 +35,19 @@ BEGIN value_new, id_change_set_user ) - # Changed id_user + -- Changed id_user SELECT NEW.id_item, 'id_user', OLD.id_user, NEW.id_user, NEW.id_change_set_user WHERE NOT OLD.id_user <=> NEW.id_user UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_item, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set_user WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed quantity + -- Changed quantity SELECT NEW.id_item, 'quantity', CONVERT(OLD.quantity, CHAR), CONVERT(NEW.quantity, CHAR), NEW.id_change_set_user WHERE NOT (OLD.quantity <=> NEW.quantity) UNION - # Changed active + -- Changed active SELECT NEW.id_item, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set_user WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3324_tri_Shop_User_Order_Status.sql b/static/MySQL/3324_tri_Shop_User_Order_Status.sql index f27d1a09..706c1fab 100644 --- a/static/MySQL/3324_tri_Shop_User_Order_Status.sql +++ b/static/MySQL/3324_tri_Shop_User_Order_Status.sql @@ -1,5 +1,5 @@ -# Shop User Order Type +-- Shop User Order Type @@ -35,23 +35,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_Status, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_Status, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_Status, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_Status, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_Status, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; diff --git a/static/MySQL/3400_tri_Shop_Supplier.sql b/static/MySQL/3400_tri_Shop_Supplier.sql index da319922..daa019e8 100644 --- a/static/MySQL/3400_tri_Shop_Supplier.sql +++ b/static/MySQL/3400_tri_Shop_Supplier.sql @@ -1,5 +1,5 @@ -# Shop Supplier +-- Shop Supplier @@ -35,45 +35,45 @@ BEGIN value_new, id_change_set ) - # Changed name_company + -- Changed name_company SELECT NEW.id_supplier, 'name_company', OLD.name_company, NEW.name_company, NEW.id_change_set WHERE NOT OLD.name_company <=> NEW.name_company UNION - # Changed name_contact + -- Changed name_contact SELECT NEW.id_supplier, 'name_contact', OLD.name_contact, NEW.name_contact, NEW.id_change_set WHERE NOT OLD.name_contact <=> NEW.name_contact UNION - # Changed department_contact + -- Changed department_contact SELECT NEW.id_supplier, 'department_contact', OLD.department_contact, NEW.department_contact, NEW.id_change_set WHERE NOT OLD.department_contact <=> NEW.department_contact UNION /* - # Changed id_address + -- Changed id_address SELECT NEW.id_supplier, 'id_address', OLD.id_address, NEW.id_address, NEW.id_change_set WHERE NOT OLD.id_address <=> NEW.id_address UNION */ - # Changed phone_number + -- Changed phone_number SELECT NEW.id_supplier, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed fax + -- Changed fax SELECT NEW.id_supplier, 'fax', OLD.fax, NEW.fax, NEW.id_change_set WHERE NOT OLD.fax <=> NEW.fax UNION - # Changed email + -- Changed email SELECT NEW.id_supplier, 'email', OLD.email, NEW.email, NEW.id_change_set WHERE NOT OLD.email <=> NEW.email UNION - # Changed website + -- Changed website SELECT NEW.id_supplier, 'website', OLD.website, NEW.website, NEW.id_change_set WHERE NOT OLD.website <=> NEW.website UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_supplier, 'id_currency', OLD.id_currency, NEW.id_currency, NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed id_supplier_temp + -- Changed id_supplier_temp SELECT NEW.id_supplier, 'id_supplier_temp', OLD.id_supplier_temp, NEW.id_supplier_temp, NEW.id_change_set WHERE NOT OLD.id_supplier_temp <=> NEW.id_supplier_temp ; diff --git a/static/MySQL/3403_tri_Shop_Supplier_Address.sql b/static/MySQL/3403_tri_Shop_Supplier_Address.sql index 7c36b930..f22a1e75 100644 --- a/static/MySQL/3403_tri_Shop_Supplier_Address.sql +++ b/static/MySQL/3403_tri_Shop_Supplier_Address.sql @@ -1,5 +1,5 @@ -# Shop Supplier Address +-- Shop Supplier Address DROP TRIGGER IF EXISTS before_insert_Shop_Supplier_Address; DROP TRIGGER IF EXISTS before_update_Shop_Supplier_Address; @@ -33,31 +33,31 @@ BEGIN value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/3403_tri_Shop_Unit_Measurement.sql b/static/MySQL/3403_tri_Shop_Unit_Measurement.sql index b25da068..34279869 100644 --- a/static/MySQL/3403_tri_Shop_Unit_Measurement.sql +++ b/static/MySQL/3403_tri_Shop_Unit_Measurement.sql @@ -1,5 +1,5 @@ -# Shop Unit of Measurement +-- Shop Unit of Measurement @@ -35,39 +35,39 @@ BEGIN value_new, id_change_set ) - # Changed name_singular + -- Changed name_singular SELECT NEW.id_unit_measurement, 'name_singular', OLD.name_singular, NEW.name_singular, NEW.id_change_set WHERE NOT OLD.name_singular <=> NEW.name_singular UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_unit_measurement, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed symbol + -- Changed symbol SELECT NEW.id_unit_measurement, 'symbol', OLD.symbol, NEW.symbol, NEW.id_change_set WHERE NOT OLD.symbol <=> NEW.symbol UNION - # Changed is_base_unit + -- Changed is_base_unit SELECT NEW.id_unit_measurement, 'is_base_unit', OLD.is_base_unit, NEW.is_base_unit, NEW.id_change_set WHERE NOT OLD.is_base_unit <=> NEW.is_base_unit UNION - # Changed is_unit_of_distance + -- Changed is_unit_of_distance SELECT NEW.id_unit_measurement, 'is_unit_of_distance', OLD.is_unit_of_distance, NEW.is_unit_of_distance, NEW.id_change_set WHERE NOT OLD.is_unit_of_distance <=> NEW.is_unit_of_distance UNION - # Changed is_unit_of_mass + -- Changed is_unit_of_mass SELECT NEW.id_unit_measurement, 'is_unit_of_mass', OLD.is_unit_of_mass, NEW.is_unit_of_mass, NEW.id_change_set WHERE NOT OLD.is_unit_of_mass <=> NEW.is_unit_of_mass UNION - # Changed is_unit_of_time + -- Changed is_unit_of_time SELECT NEW.id_unit_measurement, 'is_unit_of_time', OLD.is_unit_of_time, NEW.is_unit_of_time, NEW.id_change_set WHERE NOT OLD.is_unit_of_time <=> NEW.is_unit_of_time UNION - # Changed is_unit_of_volume + -- Changed is_unit_of_volume SELECT NEW.id_unit_measurement, 'is_unit_of_volume', OLD.is_unit_of_volume, NEW.is_unit_of_volume, NEW.id_change_set WHERE NOT OLD.is_unit_of_volume <=> NEW.is_unit_of_volume UNION - # Changed active + -- Changed active SELECT NEW.id_unit_measurement, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; 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 7116aab2..fa4263c0 100644 --- a/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql +++ b/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql @@ -1,5 +1,5 @@ -# Shop Unit of Measurement Conversion +-- Shop Unit of Measurement Conversion @@ -35,27 +35,27 @@ BEGIN value_new, id_change_set ) - # Changed id_unit_derived + -- Changed id_unit_derived SELECT NEW.id_conversion, 'id_unit_derived', OLD.id_unit_derived, NEW.id_unit_derived, NEW.id_change_set WHERE NOT OLD.id_unit_derived <=> NEW.id_unit_derived UNION - # Changed id_unit_base + -- Changed id_unit_base SELECT NEW.id_conversion, 'id_unit_base', OLD.id_unit_base, NEW.id_unit_base, NEW.id_change_set WHERE NOT OLD.id_unit_base <=> NEW.id_unit_base UNION - # Changed multiplier_unit_base + -- Changed multiplier_unit_base SELECT NEW.id_conversion, 'multiplier_unit_base', OLD.multiplier_unit_base, NEW.multiplier_unit_base, NEW.id_change_set WHERE NOT OLD.multiplier_unit_base <=> NEW.multiplier_unit_base UNION - # Changed increment_unit_base + -- Changed increment_unit_base SELECT NEW.id_conversion, 'active', OLD.increment_unit_base, NEW.increment_unit_base, NEW.id_change_set WHERE NOT OLD.increment_unit_base <=> NEW.increment_unit_base UNION - # Changed apply_multiplier_before_increment + -- Changed apply_multiplier_before_increment SELECT NEW.id_conversion, 'apply_multiplier_before_increment', OLD.apply_multiplier_before_increment, NEW.apply_multiplier_before_increment, NEW.id_change_set WHERE NOT OLD.apply_multiplier_before_increment <=> NEW.apply_multiplier_before_increment UNION - # Changed active + -- Changed active SELECT NEW.id_conversion, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; diff --git a/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql b/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql index 697a0d1c..b4b9df3c 100644 --- a/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql +++ b/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql @@ -1,5 +1,5 @@ -# Shop Supplier Purchase Order +-- Shop Supplier Purchase Order @@ -35,40 +35,40 @@ BEGIN value_new, id_change_set ) - # Changed id_order_temp + -- Changed id_order_temp SELECT NEW.id_order, 'id_order_temp', OLD.id_order_temp, NEW.id_order_temp, NEW.id_change_set WHERE NOT OLD.id_order_temp <=> NEW.id_order_temp UNION - # Changed id_supplier_ordered + -- Changed id_supplier_ordered SELECT NEW.id_order, 'id_supplier_ordered', OLD.id_supplier_ordered, NEW.id_supplier_ordered, NEW.id_change_set WHERE NOT OLD.id_supplier_ordered <=> NEW.id_supplier_ordered UNION - # Changed id_currency_cost + -- Changed id_currency_cost SELECT NEW.id_order, 'id_currency_cost', OLD.id_currency_cost, NEW.id_currency_cost, NEW.id_change_set WHERE NOT OLD.id_currency_cost <=> NEW.id_currency_cost UNION - # Changed cost_total_local_VAT_excl + -- Changed cost_total_local_VAT_excl SELECT NEW.id_order, 'cost_total_local_VAT_excl', OLD.cost_total_local_VAT_excl, NEW.cost_total_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_excl <=> NEW.cost_total_local_VAT_excl UNION - # Changed cost_total_local_VAT_incl + -- Changed cost_total_local_VAT_incl SELECT NEW.id_order, 'cost_total_local_VAT_incl', OLD.cost_total_local_VAT_incl, NEW.cost_total_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_incl <=> NEW.cost_total_local_VAT_incl /* UNION - # Changed latency_delivery + -- Changed latency_delivery SELECT NEW.id_order, 'latency_delivery', OLD.latency_delivery, NEW.latency_delivery, NEW.id_change_set WHERE NOT OLD.latency_delivery <=> NEW.latency_delivery UNION - # Changed quantity_ordered + -- Changed quantity_ordered SELECT NEW.id_order, 'quantity_ordered', OLD.quantity_ordered, NEW.quantity_ordered, NEW.id_change_set WHERE NOT OLD.quantity_ordered <=> NEW.quantity_ordered UNION - # Changed id_unit_quantity + -- Changed id_unit_quantity SELECT NEW.id_order, 'id_unit_quantity', OLD.id_unit_quantity, NEW.id_unit_quantity, NEW.id_change_set WHERE NOT OLD.id_unit_quantity <=> NEW.id_unit_quantity UNION - # Changed quantity_received + -- Changed quantity_received SELECT NEW.id_order, 'quantity_received', OLD.quantity_received, NEW.quantity_received, NEW.id_change_set WHERE NOT OLD.quantity_received <=> NEW.quantity_received */ 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 65cea58d..b1a08c70 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 @@ -1,5 +1,5 @@ -# Shop Supplier Purchase Order Product Link +-- Shop Supplier Purchase Order Product Link @@ -35,57 +35,57 @@ BEGIN value_new, id_change_set ) - # Changed id_order + -- Changed id_order SELECT NEW.id_link, 'id_order', OLD.id_order, NEW.id_order, NEW.id_change_set WHERE NOT OLD.id_order <=> NEW.id_order UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', OLD.id_permutation, NEW.id_permutation, NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION /* - # Changed id_currency_cost + -- Changed id_currency_cost SELECT NEW.id_link, 'id_currency_cost', OLD.id_currency_cost, NEW.id_currency_cost, NEW.id_change_set WHERE NOT OLD.id_currency_cost <=> NEW.id_currency_cost UNION */ - # Changed quantity_ordered + -- Changed quantity_ordered SELECT NEW.id_link, 'quantity_ordered', OLD.quantity_ordered, NEW.quantity_ordered, NEW.id_change_set WHERE NOT OLD.quantity_ordered <=> NEW.quantity_ordered UNION - # Changed id_unit_quantity + -- Changed id_unit_quantity SELECT NEW.id_link, 'id_unit_quantity', OLD.id_unit_quantity, NEW.id_unit_quantity, NEW.id_change_set WHERE NOT OLD.id_unit_quantity <=> NEW.id_unit_quantity UNION - # Changed quantity_received + -- Changed quantity_received SELECT NEW.id_link, 'quantity_received', OLD.quantity_received, NEW.quantity_received, NEW.id_change_set WHERE NOT OLD.quantity_received <=> NEW.quantity_received UNION - # Changed latency_delivery_days + -- Changed latency_delivery_days SELECT NEW.id_link, 'latency_delivery_days', OLD.latency_delivery_days, NEW.latency_delivery_days, NEW.id_change_set WHERE NOT OLD.latency_delivery_days <=> NEW.latency_delivery_days UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', OLD.display_order, NEW.display_order, NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed cost_total_local_VAT_excl + -- Changed cost_total_local_VAT_excl SELECT NEW.id_link, 'cost_total_local_VAT_excl', OLD.cost_total_local_VAT_excl, NEW.cost_total_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_excl <=> NEW.cost_total_local_VAT_excl UNION - # Changed cost_total_local_VAT_incl + -- Changed cost_total_local_VAT_incl SELECT NEW.id_link, 'cost_total_local_VAT_incl', OLD.cost_total_local_VAT_incl, NEW.cost_total_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_incl <=> NEW.cost_total_local_VAT_incl UNION - # Changed cost_unit_local_VAT_excl + -- Changed cost_unit_local_VAT_excl SELECT NEW.id_link, 'cost_unit_local_VAT_excl', OLD.cost_unit_local_VAT_excl, NEW.cost_unit_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_unit_local_VAT_excl <=> NEW.cost_unit_local_VAT_excl UNION - # Changed cost_unit_local_VAT_incl + -- Changed cost_unit_local_VAT_incl SELECT NEW.id_link, 'cost_unit_local_VAT_incl', OLD.cost_unit_local_VAT_incl, NEW.cost_unit_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_unit_local_VAT_incl <=> NEW.cost_unit_local_VAT_incl ; diff --git a/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql b/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql index 96035278..7fd5e9f4 100644 --- a/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql +++ b/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql @@ -1,5 +1,5 @@ -# Shop Manufacturing Purchase Order +-- Shop Manufacturing Purchase Order @@ -39,31 +39,31 @@ BEGIN value_new, id_change_set ) - # Changed id_order_temp + -- Changed id_order_temp SELECT NEW.id_order, 'id_order_temp', OLD.id_order_temp, NEW.id_order_temp, NEW.id_change_set WHERE NOT OLD.id_order_temp <=> NEW.id_order_temp UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_order, 'id_currency', OLD.id_currency, NEW.id_currency, NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed cost_total_local_VAT_excl + -- Changed cost_total_local_VAT_excl SELECT NEW.id_order, 'cost_total_local_VAT_excl', OLD.cost_total_local_VAT_excl, NEW.cost_total_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_excl <=> NEW.cost_total_local_VAT_excl UNION - # Changed cost_total_local_VAT_incl + -- Changed cost_total_local_VAT_incl SELECT NEW.id_order, 'cost_total_local_VAT_incl', OLD.cost_total_local_VAT_incl, NEW.cost_total_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_total_local_VAT_incl <=> NEW.cost_total_local_VAT_incl UNION - # Changed price_total_local_VAT_excl + -- Changed price_total_local_VAT_excl SELECT NEW.id_order, 'price_total_local_VAT_excl', OLD.price_total_local_VAT_excl, NEW.price_total_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_total_local_VAT_excl <=> NEW.price_total_local_VAT_excl UNION - # Changed price_total_local_VAT_incl + -- Changed price_total_local_VAT_incl SELECT NEW.id_order, 'price_total_local_VAT_incl', OLD.price_total_local_VAT_incl, NEW.price_total_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_total_local_VAT_incl <=> NEW.price_total_local_VAT_incl UNION - # Changed active + -- Changed active SELECT NEW.id_order, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; 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 f3ee5a5f..9d90aafd 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 @@ -1,5 +1,5 @@ -# Shop Manufacturing Purchase Order Product Link +-- Shop Manufacturing Purchase Order Product Link @@ -35,55 +35,55 @@ BEGIN value_new, id_change_set ) - # Changed id_order + -- Changed id_order SELECT NEW.id_link, 'id_order', OLD.id_order, NEW.id_order, NEW.id_change_set WHERE NOT OLD.id_order <=> NEW.id_order UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', OLD.id_permutation, NEW.id_permutation, NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed id_unit_quantity + -- Changed id_unit_quantity SELECT NEW.id_link, 'id_unit_quantity', OLD.id_unit_quantity, NEW.id_unit_quantity, NEW.id_change_set WHERE NOT OLD.id_unit_quantity <=> NEW.id_unit_quantity UNION - # Changed quantity_used + -- Changed quantity_used SELECT NEW.id_link, 'quantity_used', OLD.quantity_used, NEW.quantity_used, NEW.id_change_set WHERE NOT OLD.quantity_used <=> NEW.quantity_used UNION - # Changed quantity_produced + -- Changed quantity_produced SELECT NEW.id_link, 'quantity_produced', OLD.quantity_produced, NEW.quantity_produced, NEW.id_change_set WHERE NOT OLD.quantity_produced <=> NEW.quantity_produced UNION - # Changed cost_unit_local_VAT_excl + -- Changed cost_unit_local_VAT_excl SELECT NEW.id_order, 'cost_unit_local_VAT_excl', OLD.cost_unit_local_VAT_excl, NEW.cost_unit_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.cost_unit_local_VAT_excl <=> NEW.cost_unit_local_VAT_excl UNION - # Changed cost_unit_local_VAT_incl + -- Changed cost_unit_local_VAT_incl SELECT NEW.id_order, 'cost_unit_local_VAT_incl', OLD.cost_unit_local_VAT_incl, NEW.cost_unit_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.cost_unit_local_VAT_incl <=> NEW.cost_unit_local_VAT_incl UNION - # Changed price_unit_local_VAT_excl + -- Changed price_unit_local_VAT_excl SELECT NEW.id_order, 'price_unit_local_VAT_excl', OLD.price_unit_local_VAT_excl, NEW.price_unit_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_unit_local_VAT_excl <=> NEW.price_unit_local_VAT_excl UNION - # Changed price_unit_local_VAT_incl + -- Changed price_unit_local_VAT_incl SELECT NEW.id_order, 'price_unit_local_VAT_incl', OLD.price_unit_local_VAT_incl, NEW.price_unit_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_unit_local_VAT_incl <=> NEW.price_unit_local_VAT_incl UNION - # Changed id_unit_latency_manufacture + -- Changed id_unit_latency_manufacture SELECT NEW.id_link, 'id_unit_latency_manufacture', OLD.id_unit_latency_manufacture, NEW.id_unit_latency_manufacture, NEW.id_change_set WHERE NOT OLD.id_unit_latency_manufacture <=> NEW.id_unit_latency_manufacture UNION - # Changed latency_manufacture + -- Changed latency_manufacture SELECT NEW.id_link, 'latency_manufacture', OLD.latency_manufacture, NEW.latency_manufacture, NEW.id_change_set WHERE NOT OLD.latency_manufacture <=> NEW.latency_manufacture UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', OLD.display_order, NEW.display_order, NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; diff --git a/static/MySQL/3421_tri_Shop_Customer.sql b/static/MySQL/3421_tri_Shop_Customer.sql index 92d9a2ec..425b0062 100644 --- a/static/MySQL/3421_tri_Shop_Customer.sql +++ b/static/MySQL/3421_tri_Shop_Customer.sql @@ -1,5 +1,5 @@ -# Shop Customer +-- Shop Customer @@ -35,35 +35,35 @@ BEGIN value_new, id_change_set ) - # Changed name_company + -- Changed name_company SELECT NEW.id_customer, 'name_company', OLD.name_company, NEW.name_company, NEW.id_change_set WHERE NOT OLD.name_company <=> NEW.name_company UNION - # Changed name_contact + -- Changed name_contact SELECT NEW.id_customer, 'name_contact', OLD.name_contact, NEW.name_contact, NEW.id_change_set WHERE NOT OLD.name_contact <=> NEW.name_contact UNION - # Changed department_contact + -- Changed department_contact SELECT NEW.id_customer, 'department_contact', OLD.department_contact, NEW.department_contact, NEW.id_change_set WHERE NOT OLD.department_contact <=> NEW.department_contact UNION - # Changed id_address + -- Changed id_address SELECT NEW.id_customer, 'id_address', OLD.id_address, NEW.id_address, NEW.id_change_set WHERE NOT OLD.id_address <=> NEW.id_address UNION - # Changed phone_number + -- Changed phone_number SELECT NEW.id_customer, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed email + -- Changed email SELECT NEW.id_customer, 'email', OLD.email, NEW.email, NEW.id_change_set WHERE NOT OLD.email <=> NEW.email UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_customer, 'id_currency', OLD.id_currency, NEW.id_currency, NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed active + -- Changed active SELECT NEW.id_customer, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; diff --git a/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql b/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql index 9c4f83bd..f0f00dba 100644 --- a/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql +++ b/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql @@ -1,5 +1,5 @@ -# Shop Customer Sales Order +-- Shop Customer Sales Order @@ -35,19 +35,19 @@ BEGIN value_new, id_change_set ) - # Changed id_customer + -- Changed id_customer SELECT NEW.id_order, 'id_customer', OLD.id_customer, NEW.id_customer, NEW.id_change_set WHERE NOT OLD.id_customer <=> NEW.id_customer UNION - # Changed price_total_local + -- Changed price_total_local SELECT NEW.id_order, 'price_total_local', OLD.price_total_local, NEW.price_total_local, NEW.id_change_set WHERE NOT OLD.price_total_local <=> NEW.price_total_local UNION - # Changed id_currency_price + -- Changed id_currency_price SELECT NEW.id_order, 'id_currency_price', OLD.id_currency_price, NEW.id_currency_price, NEW.id_change_set WHERE NOT OLD.id_currency_price <=> NEW.id_currency_price UNION - # Changed active + -- Changed active SELECT NEW.id_order, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; 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 f9de8566..5545eefb 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 @@ -1,5 +1,5 @@ -# Shop Customer Sales Order Product Link +-- Shop Customer Sales Order Product Link @@ -35,43 +35,43 @@ BEGIN value_new, id_change_set ) - # Changed id_order + -- Changed id_order SELECT NEW.id_link, 'id_order', OLD.id_order, NEW.id_order, NEW.id_change_set WHERE NOT OLD.id_order <=> NEW.id_order UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', OLD.id_permutation, NEW.id_permutation, NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed price_total_local + -- Changed price_total_local SELECT NEW.id_link, 'price_total_local', OLD.price_total_local, NEW.price_total_local, NEW.id_change_set WHERE NOT OLD.price_total_local <=> NEW.price_total_local UNION - # Changed id_currency_price + -- Changed id_currency_price SELECT NEW.id_link, 'id_currency_price', OLD.id_currency_price, NEW.id_currency_price, NEW.id_change_set WHERE NOT OLD.id_currency_price <=> NEW.id_currency_price UNION - # Changed quantity_ordered + -- Changed quantity_ordered SELECT NEW.id_link, 'quantity_ordered', OLD.quantity_ordered, NEW.quantity_ordered, NEW.id_change_set WHERE NOT OLD.quantity_ordered <=> NEW.quantity_ordered UNION - # Changed id_unit_quantity + -- Changed id_unit_quantity SELECT NEW.id_link, 'id_unit_quantity', OLD.id_unit_quantity, NEW.id_unit_quantity, NEW.id_change_set WHERE NOT OLD.id_unit_quantity <=> NEW.id_unit_quantity UNION - # Changed quantity_delivered + -- Changed quantity_delivered SELECT NEW.id_link, 'quantity_delivered', OLD.quantity_delivered, NEW.quantity_delivered, NEW.id_change_set WHERE NOT OLD.quantity_delivered <=> NEW.quantity_delivered UNION - # Changed latency_delivery_days + -- Changed latency_delivery_days SELECT NEW.id_link, 'latency_delivery_days', OLD.latency_delivery_days, NEW.latency_delivery_days, NEW.id_change_set WHERE NOT OLD.latency_delivery_days <=> NEW.latency_delivery_days UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', OLD.display_order, NEW.display_order, NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; diff --git a/static/MySQL/6000_p_split.sql b/static/MySQL/6000_p_split.sql index 6df8e674..3b951846 100644 --- a/static/MySQL/6000_p_split.sql +++ b/static/MySQL/6000_p_split.sql @@ -90,9 +90,9 @@ DELIMITER ; /* CALL p_split ( 'nips' - , 'noods, cheese ' # a_string - , ',' # a_separator - # '0', # a_allow_empty + , 'noods, cheese ' -- a_string + , ',' -- a_separator + -- '0', -- a_allow_empty , 1 ); 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 4699e311..90140b14 100644 --- a/static/MySQL/6003_p_split_key_value_pair_csv.sql +++ b/static/MySQL/6003_p_split_key_value_pair_csv.sql @@ -96,7 +96,7 @@ DELIMITER ; /* CALL p_split_key_value_pair_csv ( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' - , '1:100,2:200,3:300,4:400' # a_string + , '1:100,2:200,3:300,4:400' -- a_string , 1 ); 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 bbf6cd10..427f0014 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 @@ -209,7 +209,7 @@ DELIMITER ; /* CALL p_shop_get_id_product_permutation_from_variation_csv_list ( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' - , '1:100,2:200,3:300,4:400' # a_string + , '1:100,2:200,3:300,4:400' -- a_string , 1 ); diff --git a/static/MySQL/6500_p_shop_calc_user.sql b/static/MySQL/6500_p_shop_calc_user.sql index 261df4f3..918497ff 100644 --- a/static/MySQL/6500_p_shop_calc_user.sql +++ b/static/MySQL/6500_p_shop_calc_user.sql @@ -24,7 +24,7 @@ BEGIN DECLARE v_id_permission INT; -- DECLARE v_ids_product VARCHAR(500); DECLARE v_id_access_level_view INT; - # DECLARE v_id_access_level_product_required INT; + -- DECLARE v_id_access_level_product_required INT; DECLARE v_priority_access_level_view INT; DECLARE v_priority_access_level_edit INT; DECLARE v_priority_access_level_admin INT; @@ -137,7 +137,7 @@ BEGIN ; END IF; - # Access levels + -- Access levels IF v_has_filter_access_level THEN CALL partsltd_prod.p_split(a_guid, a_ids_access_level, ',', a_debug); @@ -157,7 +157,7 @@ BEGIN CALL partsltd_prod.p_clear_split_temp( a_guid ); - # Invalid IDs + -- Invalid IDs IF EXISTS ( SELECT t_S.substring FROM tmp_Split t_S @@ -224,7 +224,7 @@ BEGIN CALL partsltd_prod.p_clear_split_temp( a_guid ); - # Invalid or inactive + -- Invalid or inactive IF EXISTS (SELECT PERM.id_permission FROM tmp_Split t_S LEFT JOIN partsltd_prod.Shop_Permission PERM ON t_S.as_int = PERM.id_permission WHERE ISNULL(t_S.as_int) OR ISNULL(PERM.id_permission) OR PERM.active = 0) THEN INSERT INTO tmp_Msg_Error ( -- guid, @@ -256,7 +256,7 @@ BEGIN END IF; DELETE FROM tmp_Split; - # Users + -- Users CALL partsltd_prod.p_split(a_guid, a_ids_user, ',', a_debug); INSERT INTO tmp_Split ( @@ -275,7 +275,7 @@ BEGIN CALL partsltd_prod.p_clear_split_temp( a_guid ); - # Invalid or inactive + -- Invalid or inactive IF EXISTS (SELECT U.id_user FROM tmp_Split t_S LEFT JOIN partsltd_prod.Shop_User U ON t_S.as_int = U.id_user WHERE ISNULL(t_S.as_int) OR ISNULL(U.id_user) OR (a_get_inactive_user = 0 AND U.active = 0)) THEN INSERT INTO tmp_Msg_Error ( -- guid, @@ -399,11 +399,11 @@ BEGIN ; */ - # SET v_has_filter_user = EXISTS ( SELECT * FROM tmp_User_Calc_User LIMIT 1 ); + -- SET v_has_filter_user = EXISTS ( SELECT * FROM tmp_User_Calc_User LIMIT 1 ); END IF; DELETE FROM tmp_Split; - # Products + -- Products IF v_has_filter_product = 1 THEN CALL partsltd_prod.p_split(a_guid, a_ids_product, ',', a_debug); @@ -423,7 +423,7 @@ BEGIN CALL partsltd_prod.p_clear_split_temp( a_guid ); - # Invalid product IDs + -- Invalid product IDs IF EXISTS (SELECT * FROM tmp_Split t_S LEFT JOIN partsltd_prod.Shop_Product P ON t_S.as_int = P.id_product WHERE ISNULL(t_S.as_int) OR ISNULL(P.id_product)) THEN INSERT INTO tmp_Msg_Error ( -- guid, @@ -457,7 +457,7 @@ BEGIN CASE WHEN AL_P.priority < AL_C.priority THEN AL_P.id_access_level ELSE AL_C.id_access_level END AS id_access_level_required, CASE WHEN AL_P.priority < AL_C.priority THEN AL_P.priority ELSE AL_C.priority END AS priority_access_level_required FROM tmp_Split t_S - INNER JOIN partsltd_prod.Shop_Product P ON t_S.as_int = P.id_product # Shop_Product_Permutation PP + INNER JOIN partsltd_prod.Shop_Product P ON t_S.as_int = P.id_product -- Shop_Product_Permutation PP INNER JOIN partsltd_prod.Shop_Access_Level AL_P ON P.id_access_level_required = AL_P.id_access_level AND AL_P.active @@ -566,7 +566,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Calc_User; DROP TABLE IF EXISTS tmp_User_Calc_User; DROP TABLE IF EXISTS tmp_Product_Calc_User; - # Don't destroy common tables in nested Stored Procedures! + -- Don't destroy common tables in nested Stored Procedures! -- DROP TABLE IF EXISTS tmp_Split; DELETE FROM tmp_Split; diff --git a/static/MySQL/6501_p_shop_clear_calc_user.sql b/static/MySQL/6501_p_shop_clear_calc_user.sql index 3326cd8a..f4c07005 100644 --- a/static/MySQL/6501_p_shop_clear_calc_user.sql +++ b/static/MySQL/6501_p_shop_clear_calc_user.sql @@ -33,7 +33,7 @@ DELIMITER ; /* CALL p_shop_clear_calc_user ( - 'noods, cheese ' # a_guid + 'noods, cheese ' -- a_guid , 1 -- debug ); 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 7a4534dd..7c8fe7f1 100644 --- a/static/MySQL/7003_p_shop_get_many_access_level.sql +++ b/static/MySQL/7003_p_shop_get_many_access_level.sql @@ -4,7 +4,7 @@ /* CALL p_shop_get_many_access_level ( - 0 # a_get_inactive_access_level + 0 -- a_get_inactive_access_level ) */ @@ -40,6 +40,6 @@ DELIMITER ; /* CALL p_shop_get_many_access_level ( - 0 # a_get_inactive_access_level + 0 -- a_get_inactive_access_level ); */ diff --git a/static/MySQL/7101_p_shop_get_many_region.sql b/static/MySQL/7101_p_shop_get_many_region.sql index fc9f6f2c..32f066fe 100644 --- a/static/MySQL/7101_p_shop_get_many_region.sql +++ b/static/MySQL/7101_p_shop_get_many_region.sql @@ -4,7 +4,7 @@ /* CALL p_shop_get_many_region ( - 0 # a_get_inactive_region + 0 -- a_get_inactive_region ) */ @@ -40,6 +40,6 @@ DELIMITER ; /* CALL p_shop_get_many_region ( - 0 # a_get_inactive_region + 0 -- a_get_inactive_region ); */ diff --git a/static/MySQL/7106_p_shop_get_many_plant.sql b/static/MySQL/7106_p_shop_get_many_plant.sql index 55a7a012..5046e7dd 100644 --- a/static/MySQL/7106_p_shop_get_many_plant.sql +++ b/static/MySQL/7106_p_shop_get_many_plant.sql @@ -31,6 +31,6 @@ DELIMITER ; /* CALL p_shop_get_many_plant ( - 0 # a_get_inactive_plant + 0 -- a_get_inactive_plant ); */ 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 8c0b38b1..96a736a6 100644 --- a/static/MySQL/7109_p_shop_get_many_storage_location.sql +++ b/static/MySQL/7109_p_shop_get_many_storage_location.sql @@ -32,6 +32,6 @@ DELIMITER ; /* CALL p_shop_get_many_storage_location ( - 0 # a_get_inactive_storage_location + 0 -- a_get_inactive_storage_location ); */ diff --git a/static/MySQL/7116_p_shop_get_many_currency.sql b/static/MySQL/7116_p_shop_get_many_currency.sql index 677d7d71..6284a488 100644 --- a/static/MySQL/7116_p_shop_get_many_currency.sql +++ b/static/MySQL/7116_p_shop_get_many_currency.sql @@ -4,7 +4,7 @@ /* CALL p_shop_get_many_currency ( - 0 # a_get_inactive_currency + 0 -- a_get_inactive_currency ) */ @@ -42,6 +42,6 @@ DELIMITER ; /* CALL p_shop_get_many_currency ( - 0 # a_get_inactive_currency + 0 -- a_get_inactive_currency ); */ 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 07506a45..87144429 100644 --- a/static/MySQL/7122_p_shop_get_many_unit_measurement.sql +++ b/static/MySQL/7122_p_shop_get_many_unit_measurement.sql @@ -33,7 +33,7 @@ DELIMITER ; /* CALL p_shop_get_many_unit_measurement ( - 0 # a_get_inactive_unit_measurement + 0 -- a_get_inactive_unit_measurement ); select * diff --git a/static/MySQL/7200_p_shop_save_product_category.sql b/static/MySQL/7200_p_shop_save_product_category.sql index 3dbe034b..0827f535 100644 --- a/static/MySQL/7200_p_shop_save_product_category.sql +++ b/static/MySQL/7200_p_shop_save_product_category.sql @@ -306,7 +306,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type 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 8c04906e..400c8c1f 100644 --- a/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql +++ b/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql @@ -36,7 +36,7 @@ DELIMITER ; /* CALL p_shop_clear_calc_product_permutation ( - 'noods, cheese ' # a_guid + 'noods, cheese ' -- a_guid ); SELECT * FROM Shop_Product_Category_Temp diff --git a/static/MySQL/7204_p_shop_calc_product_permutation.sql b/static/MySQL/7204_p_shop_calc_product_permutation.sql index 9c00413c..eb0fefe7 100644 --- a/static/MySQL/7204_p_shop_calc_product_permutation.sql +++ b/static/MySQL/7204_p_shop_calc_product_permutation.sql @@ -479,7 +479,7 @@ BEGIN */ START TRANSACTION; - # Categories + -- Categories INSERT INTO Shop_Product_Category_Temp ( id_category , code @@ -511,7 +511,7 @@ BEGIN GROUP BY PC.id_category ; - # Products + -- Products INSERT INTO Shop_Product_Temp ( id_product , id_category @@ -544,7 +544,7 @@ BEGIN GROUP BY P.id_product, t_P.can_view, t_P.can_edit, t_P.can_admin ; - # Product Permutations + -- Product Permutations INSERT INTO Shop_Product_Permutation_Temp ( id_permutation , id_product @@ -615,7 +615,7 @@ BEGIN END IF; /* - # Errors + -- Errors SELECT t_ME.display_order, t_ME.guid, @@ -668,19 +668,19 @@ DELIMITER ; /* CALL partsltd_prod.p_shop_calc_product_permutation ( - 1 #'auth0|6582b95c895d09a70ba10fef', # a_id_user - , 1 # a_get_all_product_category - , 0 # a_get_inactive_product_category - , '' # a_ids_product_category - , 1 # a_get_all_product - , 0 # a_get_inactive_product - , '' # a_ids_product - , 1 # a_get_all_product_permutation - , 0 # a_get_inactive_permutation - , '' # a_ids_permutation - , 0 # a_get_products_quantity_stock_below_minimum - , 'NIPS ' # a_guid - , 0 # a_debug + 1 --'auth0|6582b95c895d09a70ba10fef', -- a_id_user + , 1 -- a_get_all_product_category + , 0 -- a_get_inactive_product_category + , '' -- a_ids_product_category + , 1 -- a_get_all_product + , 0 -- a_get_inactive_product + , '' -- a_ids_product + , 1 -- a_get_all_product_permutation + , 0 -- a_get_inactive_permutation + , '' -- a_ids_permutation + , 0 -- a_get_products_quantity_stock_below_minimum + , 'NIPS ' -- a_guid + , 0 -- a_debug ); diff --git a/static/MySQL/7204_p_shop_get_many_product.sql b/static/MySQL/7204_p_shop_get_many_product.sql index a4ec9d05..7b1a6a4b 100644 --- a/static/MySQL/7204_p_shop_get_many_product.sql +++ b/static/MySQL/7204_p_shop_get_many_product.sql @@ -26,12 +26,12 @@ BEGIN -- Argument redeclaration -- Variable declaration - # DECLARE v_has_filter_product_category BIT; - # DECLARE v_has_filter_product BIT; - # DECLARE v_has_filter_permutation BIT; + -- DECLARE v_has_filter_product_category BIT; + -- DECLARE v_has_filter_product BIT; + -- DECLARE v_has_filter_permutation BIT; DECLARE v_has_filter_image BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); -- DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_product INT; DECLARE v_ids_product_permission VARCHAR(4000); @@ -213,7 +213,7 @@ BEGIN INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PP_T.id_permutation = PP.id_permutation ; - # Product Images + -- Product Images IF (v_has_filter_image = 1 AND NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1)) THEN CALL partsltd_prod.p_split(v_guid, a_ids_image, ',', a_debug); @@ -288,7 +288,7 @@ BEGIN DELETE FROM tmp_Split; -- Outputs - # Categories + -- Categories SELECT -- DISTINCT t_C.id_category @@ -310,7 +310,7 @@ BEGIN ORDER BY PC.display_order ; - # Products + -- Products SELECT t_P.id_product, P.id_category, @@ -331,7 +331,7 @@ BEGIN ORDER BY t_C.display_order, P.display_order ; - # Product Permutations + -- Product Permutations SELECT t_PP.id_permutation, PP.id_product, @@ -364,7 +364,7 @@ BEGIN PP.does_expire_faster_once_unsealed, PP.id_unit_measurement_interval_expiration_unsealed, UM_X.symbol AS symbol_unit_measurement_interval_expiration_unsealed, - UM_X.symbol_is_suffix_not_prefix AS symbol_is_suffix_not_prefix_unit_measurement_interval_expiration_unsealed, + UM_X.symbol_is_suffix_not_prefix AS symbol_is_suffix_not_prefix_unit_interval_expiration_unsealed, UM_X.name_singular AS name_singular_unit_measurement_interval_expiration_unsealed, UM_X.name_plural AS name_plural_unit_measurement_interval_expiration_unsealed, PP.count_interval_expiration_unsealed, @@ -388,7 +388,7 @@ BEGIN ORDER BY PC.display_order, P.display_order -- , t_PP.display_order ; - # Variations + -- Variations SELECT V.id_variation , V.id_type @@ -415,7 +415,7 @@ BEGIN AND PPVL.active ; - # Images + -- Images SELECT t_I.id_image, t_PP.id_product, @@ -432,7 +432,7 @@ BEGIN ORDER BY t_C.display_order, t_P.display_order, I.display_order ; - # Errors + -- Errors SELECT * /* t_ME.display_order, @@ -473,21 +473,21 @@ DELIMITER ; /* CALL partsltd_prod.p_shop_get_many_product ( - 1 #'auth0|6582b95c895d09a70ba10fef', # a_id_user - , 1 # a_get_all_product_category - , 0 # a_get_inactive_product_category - , '' # a_ids_product_category - , 1 # a_get_all_product - , 0 # a_get_inactive_product - , '' # a_ids_product - , 1 # a_get_all_product_permutation - , 0 # a_get_inactive_permutation - , '' # a_ids_permutation - , 1 # a_get_all_image - , 0 # a_get_inactive_image - , '' # a_ids_image - , 0 # a_get_products_quantity_stock_below_minimum - , 0 # a_debug + 1 --'auth0|6582b95c895d09a70ba10fef', -- a_id_user + , 1 -- a_get_all_product_category + , 0 -- a_get_inactive_product_category + , '' -- a_ids_product_category + , 1 -- a_get_all_product + , 0 -- a_get_inactive_product + , '' -- a_ids_product + , 1 -- a_get_all_product_permutation + , 0 -- a_get_inactive_permutation + , '' -- a_ids_permutation + , 1 -- a_get_all_image + , 0 -- a_get_inactive_image + , '' -- a_ids_image + , 0 -- a_get_products_quantity_stock_below_minimum + , 0 -- a_debug ); select * FROM partsltd_prod.Shop_Calc_User_Temp; 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 ce89033d..f03e0780 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 @@ -65,11 +65,11 @@ BEGIN description VARCHAR(4000) NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), /* id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type @@ -190,13 +190,13 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN CALL p_shop_calc_user ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), # a_ids_access_level - (SELECT GROUP_CONCAT(id_product SEPARATOR ',') From tmp_Shop_Product), # a_ids_product - (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') From tmp_Shop_Product) # a_ids_permutation -- WHERE NOT ISNULL(id_permutation) + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), -- a_ids_access_level + (SELECT GROUP_CONCAT(id_product SEPARATOR ',') From tmp_Shop_Product), -- a_ids_product + (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') From tmp_Shop_Product) -- a_ids_permutation -- WHERE NOT ISNULL(id_permutation) ); IF EXISTS (SELECT can_admin FROM Shop_Calc_User_Temp WHERE guid = v_guid AND NOT can_admin) THEN @@ -259,7 +259,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -267,7 +267,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user ; @@ -295,13 +295,13 @@ select * from shop_product; select * from shop_product_permutation_variation_link; CALL p_shop_calc_user ( - 'ead789a1-c7ac-11ee-a256-b42e9986184a', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 0, # a_get_inactive_users - '4', # a_ids_permission - '3', # a_ids_access_level - '1', # a_ids_product - '1' # a_ids_permutation -- WHERE NOT ISNULL(id_permutation) + 'ead789a1-c7ac-11ee-a256-b42e9986184a', -- a_guid + 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 0, -- a_get_inactive_users + '4', -- a_ids_permission + '3', -- a_ids_access_level + '1', -- a_ids_product + '1' -- a_ids_permutation -- WHERE NOT ISNULL(id_permutation) ); */ diff --git a/static/MySQL/7206_p_shop_save_product_permutation.sql b/static/MySQL/7206_p_shop_save_product_permutation.sql index 720006ae..eec29d5e 100644 --- a/static/MySQL/7206_p_shop_save_product_permutation.sql +++ b/static/MySQL/7206_p_shop_save_product_permutation.sql @@ -638,7 +638,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -722,9 +722,9 @@ SELECT 'Shop_Product_Permutation before call' AS result_name; select * FROM Shop_Product_Permutation; CALL p_shop_save_product_permutation ( - 1, -- 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 'Initial data', # a_comment - 'NIPS' # a_guid + 1, -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 'Initial data', -- a_comment + 'NIPS' -- a_guid ); SELECT 'Shop_Product_Permutation_Temp after call' AS result_name; 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 572e434c..ff56896a 100644 --- a/static/MySQL/7210_p_shop_get_many_product_variation.sql +++ b/static/MySQL/7210_p_shop_get_many_product_variation.sql @@ -18,11 +18,11 @@ BEGIN DECLARE v_has_filter_variation BIT; DECLARE v_has_filter_variation_type BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); - # DECLARE v_ids_permutation_unavailable VARCHAR(4000); + -- DECLARE v_id_user VARCHAR(100); + -- DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_variation INT; - # DECLARE v_ids_product_permission VARCHAR(4000); - # DECLARE v_ids_permutation_permission VARCHAR(4000); + -- DECLARE v_ids_product_permission VARCHAR(4000); + -- DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_id_access_level_view INT; DECLARE v_time_start TIMESTAMP(6); DECLARE v_id_minimum INT; @@ -243,7 +243,7 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_variation := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); IF a_debug = 1 THEN @@ -298,7 +298,7 @@ BEGIN END IF; -- Returns - # Variation Types + -- Variation Types SELECT t_VT.id_type , VT.code @@ -310,7 +310,7 @@ BEGIN INNER JOIN Shop_Variation_Type VT ON t_VT.id_type = VT.id_type ; - # Variations + -- Variations SELECT t_V.id_variation , t_V.id_type @@ -332,7 +332,7 @@ BEGIN ORDER BY VT.display_order, V.display_order ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME @@ -356,14 +356,14 @@ DELIMITER ; /* CALL p_shop_get_many_product_variation ( - 1 # 'auth0|6582b95c895d09a70ba10fef', # a_id_user - , 1 # a_get_all_variation_type - , 1 # a_get_inactive_variation_type - , '' # a_ids_variation_type - , 1 # a_get_all_variation - , 1 # a_get_inactive_variation - , '' # a_ids_variation - , 0 # a_debug + 1 -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + , 1 -- a_get_all_variation_type + , 1 -- a_get_inactive_variation_type + , '' -- a_ids_variation_type + , 1 -- a_get_all_variation + , 1 -- a_get_inactive_variation + , '' -- a_ids_variation + , 0 -- a_debug ); diff --git a/static/MySQL/7212_p_shop_save_product_variation.sql b/static/MySQL/7212_p_shop_save_product_variation.sql index 0d7523c9..d77c6dc4 100644 --- a/static/MySQL/7212_p_shop_save_product_variation.sql +++ b/static/MySQL/7212_p_shop_save_product_variation.sql @@ -258,7 +258,7 @@ BEGIN -- Validation -- Variation Type - # id_type + -- id_type IF EXISTS ( SELECT * FROM tmp_Variation_Type t_VT @@ -288,7 +288,7 @@ BEGIN ; END IF; -- Variation - # id_variation + -- id_variation IF EXISTS ( SELECT * FROM tmp_Variation t_V @@ -317,7 +317,7 @@ BEGIN AND ISNULL(V.id_variation) ; END IF; - # id_type + -- id_type IF EXISTS ( SELECT * FROM tmp_Variation t_V WHERE t_V.has_type = 0 LIMIT 1 ) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -527,7 +527,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type 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 6006fbd0..42551b5d 100644 --- a/static/MySQL/7219_p_shop_get_many_stock_item.sql +++ b/static/MySQL/7219_p_shop_get_many_stock_item.sql @@ -232,7 +232,7 @@ BEGIN INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PP_T.id_permutation = PP.id_permutation ; - # Stock Items + -- Stock Items CALL partsltd_prod.p_split(v_guid, a_ids_stock_item, ',', a_debug); DELETE FROM tmp_Split; @@ -594,7 +594,7 @@ BEGIN FIND_IN_SET(t_SI.id_product, ( SELECT GROUP_CONCAT(UET.id_product SEPARATOR ',') FROM partsltd_prod.Shop_Calc_User_Temp UET) - ) = 0 # id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM partsltd_prod.Shop_Calc_User_Temp), '%'); + ) = 0 -- id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM partsltd_prod.Shop_Calc_User_Temp), '%'); * / / * ISNULL(UE_T.id_product) @@ -609,8 +609,8 @@ BEGIN ) ; - # CALL p_shop_clear_calc_user(v_guid); - # DROP TABLE IF EXISTS Shop_Calc_User_Temp; + -- CALL p_shop_clear_calc_user(v_guid); + -- DROP TABLE IF EXISTS Shop_Calc_User_Temp; DELETE FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid ; @@ -629,7 +629,7 @@ BEGIN -- Returns -- SET v_now := NOW(); - # Stock Items + -- Stock Items SELECT t_SI.id_stock, t_SI.id_permutation, @@ -679,7 +679,7 @@ BEGIN IFNULL(t_PP.can_view, 0) = 1 ; - # Errors + -- Errors SELECT t_ME.display_order, -- t_ME.guid, @@ -695,7 +695,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_category, @@ -730,31 +730,31 @@ DELIMITER ; /* CALL p_shop_get_many_stock_item ( - 1, # a_id_user - 1, # a_get_all_product_permutation - -- 'nips', # a_guid_permutations - 0, # a_get_inactive_product_permutation - '', # a_ids_product_permutation - 1, # a_get_all_stock_item - 0, # a_get_inactive_stock_item - '', # a_ids_stock_item - 1, # a_get_all_region_storage - 0, # a_get_inactive_delivery_region - '', # a_ids_region_storage - 1, # a_get_all_plant_storage - 0, # a_get_inactive_plant_storage - '', # a_ids_plant_storage - 1, # a_get_all_location_storage - 0, # a_get_inactive_location_storage - '', # a_ids_location_storage - NULL, # a_date_received_to - 0, # a_get_sealed_stock_item_only - 0, # a_get_unsealed_stock_item_only - 0, # a_get_expired_stock_item_only - 0, # a_get_nonexpired_stock_item_only - 0, # a_get_consumed_stock_item_only - 0 # a_get_nonconsumed_stock_item_only - , 0 # a_debug + 1, -- a_id_user + 1, -- a_get_all_product_permutation + -- 'nips', -- a_guid_permutations + 0, -- a_get_inactive_product_permutation + '', -- a_ids_product_permutation + 1, -- a_get_all_stock_item + 0, -- a_get_inactive_stock_item + '', -- a_ids_stock_item + 1, -- a_get_all_region_storage + 0, -- a_get_inactive_delivery_region + '', -- a_ids_region_storage + 1, -- a_get_all_plant_storage + 0, -- a_get_inactive_plant_storage + '', -- a_ids_plant_storage + 1, -- a_get_all_location_storage + 0, -- a_get_inactive_location_storage + '', -- a_ids_location_storage + NULL, -- a_date_received_to + 0, -- a_get_sealed_stock_item_only + 0, -- a_get_unsealed_stock_item_only + 0, -- a_get_expired_stock_item_only + 0, -- a_get_nonexpired_stock_item_only + 0, -- a_get_consumed_stock_item_only + 0 -- a_get_nonconsumed_stock_item_only + , 0 -- a_debug ); diff --git a/static/MySQL/7220_p_shop_save_stock_item.sql b/static/MySQL/7220_p_shop_save_stock_item.sql index c62bdbb0..8c490953 100644 --- a/static/MySQL/7220_p_shop_save_stock_item.sql +++ b/static/MySQL/7220_p_shop_save_stock_item.sql @@ -122,7 +122,7 @@ BEGIN , is_consumed , date_consumed , active - # , name_error + -- , name_error , is_new ) SELECT @@ -144,7 +144,7 @@ BEGIN , IFNULL(IFNULL(SI_T.is_consumed, SI.is_consumed), 0) AS is_consumed , IFNULL(SI_T.date_consumed, SI.date_consumed) AS date_consumed , IFNULL(IFNULL(SI_T.active, SI.active), 1) AS active - # , fn_shop_get_product_permutation_name(SI_T.id_permutation) + -- , fn_shop_get_product_permutation_name(SI_T.id_permutation) , CASE WHEN IFNULL(SI_T.id_stock, 0) < 1 THEN 1 ELSE 0 END AS is_new FROM partsltd_prod.Shop_Stock_Item_Temp SI_T LEFT JOIN partsltd_prod.Shop_Stock_Item SI ON SI_T.id_stock = SI.id_stock @@ -600,7 +600,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -682,9 +682,9 @@ SELECT 'Shop_Product_Permutation before call' AS result_name; select * FROM Shop_Product_Permutation; CALL p_shop_save_product_permutation ( - 1, -- 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 'Initial data', # a_comment - 'NIPS' # a_guid + 1, -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 'Initial data', -- a_comment + 'NIPS' -- a_guid ); SELECT 'Shop_Product_Permutation_Temp after call' AS result_name; 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 cf12c6b5..fb342ab4 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 @@ -38,7 +38,7 @@ BEGIN DECLARE v_has_filter_delivery_option BIT; DECLARE v_has_filter_delivery_region BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_product INT; DECLARE v_ids_product_permission VARCHAR(4000); @@ -246,7 +246,7 @@ BEGIN INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PP_T.id_permutation = PP.id_permutation ; - # Product Prices + -- Product Prices CALL partsltd_prod.p_split(v_guid, a_ids_product_price, ',', a_debug); DELETE FROM tmp_Split; @@ -339,7 +339,7 @@ BEGIN INNER JOIN Shop_Product_Category C ON P.id_category = C.id_category WHERE - # permutations + -- permutations ( a_get_all_product_permutation OR ( @@ -357,7 +357,7 @@ BEGIN ) ; - # Delivery Regions + -- Delivery Regions INSERT INTO tmp_Delivery_Region ( id_region, active, @@ -484,7 +484,7 @@ BEGIN -- select * from tmp_Shop_Product; - # Currencies + -- Currencies IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN INSERT INTO tmp_Currency ( id_currency, @@ -574,7 +574,7 @@ BEGIN END IF; END IF; - # Discounts + -- Discounts IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN INSERT INTO tmp_Discount ( id_discount, @@ -600,12 +600,12 @@ BEGIN ) ; END IF; - # select 'pre-permission results'; - # select * from tmp_Shop_Product; + -- select 'pre-permission results'; + -- select * from tmp_Shop_Product; -- Permissions IF EXISTS (SELECT * FROM tmp_Shop_Product_Category LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_product := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); SET v_ids_product_permission := (SELECT GROUP_CONCAT(id_product SEPARATOR ',') FROM tmp_Shop_Product WHERE NOT ISNULL(id_product)); -- SET v_ids_permutation_permission := (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') FROM tmp_Shop_Product WHERE NOT ISNULL(id_permutation)); @@ -631,7 +631,7 @@ BEGIN DELETE t_P FROM tmp_Shop_Product t_P WHERE - FIND_IN_SET(t_P.id_product, (SELECT GROUP_CONCAT(UET.id_product SEPARATOR ',') FROM Shop_Calc_User_Temp UET)) = 0 # id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_Calc_User_Temp), '%'); + FIND_IN_SET(t_P.id_product, (SELECT GROUP_CONCAT(UET.id_product SEPARATOR ',') FROM Shop_Calc_User_Temp UET)) = 0 -- id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_Calc_User_Temp), '%'); OR ( ISNULL(t_P.can_view) AND ( @@ -650,7 +650,7 @@ BEGIN ; CALL p_shop_clear_calc_user(v_guid); - # DROP TABLE IF EXISTS Shop_Calc_User_Temp; + -- DROP TABLE IF EXISTS Shop_Calc_User_Temp; /* DELETE FROM Shop_Calc_User_Temp UE_T WHERE UE_T.GUID = v_guid @@ -664,7 +664,7 @@ BEGIN -- Returns -- SET v_now := NOW(); - # Categories + -- Categories SELECT DISTINCT t_C.id_category, C.name, @@ -678,7 +678,7 @@ BEGIN ORDER BY C.display_order ; - # Products + -- Products SELECT t_P.id_product, t_P.id_permutation, @@ -716,7 +716,7 @@ BEGIN ORDER BY t_P.rank_permutation ; - # Variations + -- Variations SELECT V.id_variation , V.code AS code_variation @@ -741,7 +741,7 @@ BEGIN ; /* - # Permutation variations output + -- Permutation variations output SELECT t_P.id_permutation, t_P.id_product, t_P.id_category, @@ -760,7 +760,7 @@ BEGIN select * from tmp_shop_product; */ - # Product Price + -- Product Price SELECT PCRL.id_link AS id_price, t_P.id_permutation, @@ -793,7 +793,7 @@ BEGIN ; /* - # Currency + -- Currency SELECT DISTINCT C.id_currency, C.code, @@ -807,7 +807,7 @@ BEGIN ; */ - # Images + -- Images SELECT t_I.id_image, t_I.id_product, @@ -825,7 +825,7 @@ BEGIN ORDER BY t_P.rank_permutation, I.display_order ; - # Delivery options + -- Delivery options SELECT _DO.id_option, PDOL.id_product, @@ -861,7 +861,7 @@ BEGIN ORDER BY t_P.rank_permutation, PDOL.display_order ; - # Discounts + -- Discounts SELECT D.id_discount, P.id_category, @@ -900,7 +900,7 @@ BEGIN ; /* - # Delivery Regions + -- Delivery Regions SELECT t_DR.id_region, t_P.id_category, @@ -924,7 +924,7 @@ BEGIN ; */ - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME 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 d5b6b9c6..c73efdfd 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 @@ -70,11 +70,11 @@ BEGIN active BIT NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), /* id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type @@ -144,17 +144,17 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # SELECT * FROM tmp_Msg_Error LIMIT 1; + -- SELECT * FROM tmp_Msg_Error LIMIT 1; CALL p_shop_calc_user ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), # a_ids_access_level - (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link), # (SELECT DISTINCT id_product FROM tmp_Shop_Product_Currency_Link) calc_PCL) # a_ids_product - (SELECT GROUP_CONCAT(DISTINCT id_permutation SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link) # a_ids_permutation + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), -- a_ids_access_level + (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link), -- (SELECT DISTINCT id_product FROM tmp_Shop_Product_Currency_Link) calc_PCL) -- a_ids_product + (SELECT GROUP_CONCAT(DISTINCT id_permutation SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link) -- a_ids_permutation ); - # SELECT * FROM tmp_Msg_Error LIMIT 1; + -- SELECT * FROM tmp_Msg_Error LIMIT 1; IF EXISTS (SELECT can_admin FROM Shop_Calc_User_Temp WHERE guid = v_guid AND NOT can_admin LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( @@ -210,7 +210,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -218,7 +218,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user ; diff --git a/static/MySQL/7312_p_shop_save_user.sql b/static/MySQL/7312_p_shop_save_user.sql index cff747c6..223a6472 100644 --- a/static/MySQL/7312_p_shop_save_user.sql +++ b/static/MySQL/7312_p_shop_save_user.sql @@ -258,7 +258,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type diff --git a/static/MySQL/7313_p_get_many_user.sql b/static/MySQL/7313_p_get_many_user.sql index 62708fa5..6c20d153 100644 --- a/static/MySQL/7313_p_get_many_user.sql +++ b/static/MySQL/7313_p_get_many_user.sql @@ -463,7 +463,7 @@ BEGIN INNER JOIN partsltd_prod.Shop_User U ON t_U.id_user = U.id_user ; - # Errors + -- Errors SELECT t_ME.display_order, MET.code, @@ -508,13 +508,13 @@ CALL p_get_many_user ( , 'google-oauth2|109567376920138999933' , 0 ); - NULL # a_id_user - , 'auth0|6582b95c895d09a70ba10fef' # a_id_user_auth0 - , 0 # a_get_all_user - , 0 # a_get_inactive_user - -- , 0 # a_get_first_user_only - , NULL # a_ids_user - , 'auth0|6582b95c895d09a70ba10fef' # a_ids_user_auth0 + NULL -- a_id_user + , 'auth0|6582b95c895d09a70ba10fef' -- a_id_user_auth0 + , 0 -- a_get_all_user + , 0 -- a_get_inactive_user + -- , 0 -- a_get_first_user_only + , NULL -- a_ids_user + , 'auth0|6582b95c895d09a70ba10fef' -- a_ids_user_auth0 , 0 -- a_debug );*/ diff --git a/static/MySQL/7321_p_shop_save_user_basket.sql b/static/MySQL/7321_p_shop_save_user_basket.sql index 0b1d91f5..7ce38f21 100644 --- a/static/MySQL/7321_p_shop_save_user_basket.sql +++ b/static/MySQL/7321_p_shop_save_user_basket.sql @@ -4,14 +4,14 @@ /* CALL p_shop_edit_user_basket ( - '', # a_id_user - '', # a_ids_permutation_basket - '', # a_quantities_permutation_basket - 1, # a_id_permutation_edit - NULL, # a_quantity_permutation_edit - 1, # a_sum_not_edit - 1, # a_id_currency_edit - 1 # a_id_region_purchase + '', -- a_id_user + '', -- a_ids_permutation_basket + '', -- a_quantities_permutation_basket + 1, -- a_id_permutation_edit + NULL, -- a_quantity_permutation_edit + 1, -- a_sum_not_edit + 1, -- a_id_currency_edit + 1 -- a_id_region_purchase ) */ @@ -44,11 +44,11 @@ BEGIN DECLARE v_n_quantity_permutation_basket INT; DECLARE v_row_number INT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_id_permission_product INT; DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_now DATETIME; - # DECLARE v_quantity_new INT; + -- DECLARE v_quantity_new INT; DECLARE v_change_set_used BIT; DECLARE v_id_change_set INT; @@ -141,8 +141,8 @@ BEGIN display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, id_type INT NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) REFERENCES Shop_Msg_Error_Type(id_type), @@ -156,7 +156,7 @@ BEGIN SET v_has_filter_permutation_edit = NOT ISNULL(a_id_permutation_edit); SET v_has_filter_currency = NOT ISNULL(a_id_currency); SET v_has_filter_region = NOT ISNULL(a_id_region_purchase); - # SET v_quantity_new = CASE WHEN a_sum_not_edit THEN quantity + a_quantity_product_edit ELSE a_quantity_product_edit END; + -- SET v_quantity_new = CASE WHEN a_sum_not_edit THEN quantity + a_quantity_product_edit ELSE a_quantity_product_edit END; /* SELECT v_has_filter_user, v_has_filter_basket ; @@ -378,7 +378,7 @@ BEGIN -- String product id, permutation id, quantity list IF NOT EXISTS (SELECT * FROM tmp_Shop_Basket WHERE active LIMIT 1) AND NOT EXISTS (SELECT msg FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN -- NOT v_has_filter_user AND - # Get product ids + -- Get product ids CALL p_split(v_guid, a_ids_permutation_basket, ','); INSERT INTO tmp_Shop_Product ( id_product, id_permutation, display_order @@ -396,7 +396,7 @@ BEGIN */ DROP TABLE Split_Temp; - # Get product quantities + -- Get product quantities CALL p_split(v_guid, a_quantities_permutation_basket, ','); INSERT INTO tmp_Shop_Quantity ( quantity, display_order @@ -411,7 +411,7 @@ BEGIN */ DROP TABLE Split_Temp; - # Compare number of product ids to number of quantities + -- Compare number of product ids to number of quantities SET v_n_id_permutation_basket := (SELECT display_order FROM tmp_Shop_Product ORDER BY display_order DESC LIMIT 1); SET v_n_quantity_permutation_basket := (SELECT display_order FROM tmp_Shop_Quantity ORDER BY display_order DESC LIMIT 1); IF NOT v_n_id_permutation_basket = v_n_quantity_permutation_basket THEN @@ -491,7 +491,7 @@ BEGIN */ - # Edit basket product + -- Edit basket product IF v_has_filter_permutation_edit AND NOT EXISTS (SELECT msg FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN IF EXISTS ( SELECT * @@ -662,44 +662,44 @@ BEGIN */ -- Returns CALL p_shop_get_many_product ( - a_id_user, # a_id_user - 1, # a_get_all_categories - '', # a_ids_category - 0, # a_get_inactive_categories - 0, # a_get_all_products + a_id_user, -- a_id_user + 1, -- a_get_all_categories + '', -- a_ids_category + 0, -- a_get_inactive_categories + 0, -- a_get_all_products ( SELECT GROUP_CONCAT(t_B.id_product SEPARATOR ',') FROM tmp_Shop_Basket t_B WHERE active = 1 - ), # a_ids_product - 0, # a_get_inactive_products - 0, # a_get_first_product_only - 0, # a_get_all_product_permutations + ), -- a_ids_product + 0, -- a_get_inactive_products + 0, -- a_get_first_product_only + 0, -- a_get_all_product_permutations ( SELECT GROUP_CONCAT(t_B.id_permutation SEPARATOR ',') FROM tmp_Shop_Basket t_B WHERE NOT ISNULL(t_B.id_permutation) AND active = 1 - ), # a_ids_permutation - 0, # a_get_inactive_permutations - 0, # a_get_all_images - '', # a_ids_image - 0, # a_get_inactive_images - 1, # a_get_first_image_only - 0, # a_get_all_delivery_region - a_id_region_purchase, # a_ids_delivery_region - 0, # a_get_inactive_delivery_region - 0, # a_get_all_currency - a_id_currency, # a_ids_currency - 0, # a_get_inactive_currency - 1, # a_get_all_discount - '', # a_ids_discount - 0 # a_get_inactive_discount + ), -- a_ids_permutation + 0, -- a_get_inactive_permutations + 0, -- a_get_all_images + '', -- a_ids_image + 0, -- a_get_inactive_images + 1, -- a_get_first_image_only + 0, -- a_get_all_delivery_region + a_id_region_purchase, -- a_ids_delivery_region + 0, -- a_get_inactive_delivery_region + 0, -- a_get_all_currency + a_id_currency, -- a_ids_currency + 0, -- a_get_inactive_currency + 1, -- a_get_all_discount + '', -- a_ids_discount + 0 -- a_get_inactive_discount ); - # Basket + -- Basket SELECT t_UB.id_category, t_UB.id_product, t_UB.id_permutation, @@ -723,7 +723,7 @@ BEGIN ORDER BY C.display_order, P.display_order ; - # Errors + -- Errors /* Completed by product get many */ SELECT t_ME.display_order, @@ -740,7 +740,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_categories, @@ -762,7 +762,7 @@ BEGIN ; END IF; - # DROP TABLE IF EXISTS tmp_Msg_Error; + -- DROP TABLE IF EXISTS tmp_Msg_Error; DELETE FROM tmp_Msg_Error WHERE guid = v_guid; IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN DROP TABLE tmp_Msg_Error; @@ -778,41 +778,41 @@ DELIMITER ; /* CALL p_shop_edit_user_basket ( - '', # a_id_user - '', # a_ids_permutation_basket - '', # a_quantities_permutation_basket - 2, # a_id_permutation_edit - 1, # a_quantity_permutation_edit - 1, # a_sum_not_edit - 2, # a_id_currency_edit - 1 # a_id_region_purchase + '', -- a_id_user + '', -- a_ids_permutation_basket + '', -- a_quantities_permutation_basket + 2, -- a_id_permutation_edit + 1, -- a_quantity_permutation_edit + 1, -- a_sum_not_edit + 2, -- a_id_currency_edit + 1 -- a_id_region_purchase ); CALL p_shop_edit_user_basket ( - '', # a_id_user - '1', # a_ids_permutation_basket - '9', # a_quantities_permutation_basket - 1, # a_id_permutation_edit - 69, # a_quantity_permutation_edit - 1, # a_sum_not_edit - 1, # a_id_currency_edit - 1 # a_id_region_purchase + '', -- a_id_user + '1', -- a_ids_permutation_basket + '9', -- a_quantities_permutation_basket + 1, -- a_id_permutation_edit + 69, -- a_quantity_permutation_edit + 1, -- a_sum_not_edit + 1, -- a_id_currency_edit + 1 -- a_id_region_purchase ); CALL p_shop_edit_user_basket ( - 'auth0|6582b95c895d09a70ba10feF', # a_id_user - '2', # a_ids_permutation_basket - '7', # a_quantities_permutation_basket - 2, # a_id_permutation_edit - NULL, # a_quantity_permutation_edit - 1, # a_sum_not_edit - 1, # a_id_currency_edit - 1 # a_id_region_purchase + 'auth0|6582b95c895d09a70ba10feF', -- a_id_user + '2', -- a_ids_permutation_basket + '7', -- a_quantities_permutation_basket + 2, -- a_id_permutation_edit + NULL, -- a_quantity_permutation_edit + 1, -- a_sum_not_edit + 1, -- a_id_currency_edit + 1 -- a_id_region_purchase ); {'a_id_user': 'auth0|6582b95c895d09a70ba10fef', 'a_ids_permutation_basket': '1', - '7', # a_quantities_permutation_basket + '7', -- a_quantities_permutation_basket 'a_id_permutation_edit': 1, 'a_quantity_permutation_edit': 1, 'a_sum_not_edit': 1} diff --git a/static/MySQL/7400_p_shop_save_supplier.sql b/static/MySQL/7400_p_shop_save_supplier.sql index 6b1c0038..8a3a4dd1 100644 --- a/static/MySQL/7400_p_shop_save_supplier.sql +++ b/static/MySQL/7400_p_shop_save_supplier.sql @@ -174,7 +174,7 @@ BEGIN -- Validation -- Suppliers /* - # id_address + -- id_address IF EXISTS ( SELECT * FROM tmp_Supplier t_S @@ -208,7 +208,7 @@ BEGIN ; END IF; */ - # id_currency + -- id_currency IF EXISTS ( SELECT * FROM tmp_Supplier t_S @@ -241,7 +241,7 @@ BEGIN ) ; END IF; - # name_company + -- name_company IF EXISTS (SELECT * FROM tmp_Supplier t_S WHERE ISNULL(t_S.name_company) LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -256,7 +256,7 @@ BEGIN WHERE ISNULL(t_S.name_company) ; END IF; - # email + -- email IF EXISTS (SELECT * FROM tmp_Supplier t_S WHERE ISNULL(t_S.email) LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -271,7 +271,7 @@ BEGIN WHERE ISNULL(t_S.email) ; END IF; - # duplicate + -- duplicate IF EXISTS (SELECT COUNT(*) FROM tmp_Supplier t_S GROUP BY t_S.id_supplier HAVING COUNT(*) > 1) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -289,7 +289,7 @@ BEGIN END IF; -- Addresses - # id_supplier + -- id_supplier IF EXISTS ( SELECT * FROM tmp_Supplier_Address t_SA @@ -322,7 +322,7 @@ BEGIN ) ; END IF; - # id_region + -- id_region IF EXISTS ( SELECT * FROM tmp_Supplier_Address t_SA @@ -355,7 +355,7 @@ BEGIN ) ; END IF; - # duplicate + -- duplicate IF EXISTS (SELECT COUNT(*) FROM tmp_Supplier_Address t_SA GROUP BY t_SA.id_address HAVING COUNT(*) > 1) THEN INSERT INTO tmp_Msg_Error ( id_type @@ -565,7 +565,7 @@ BEGIN WHERE GUID = a_guid; COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type diff --git a/static/MySQL/7401_p_shop_get_many_supplier.sql b/static/MySQL/7401_p_shop_get_many_supplier.sql index 490de0df..6103080e 100644 --- a/static/MySQL/7401_p_shop_get_many_supplier.sql +++ b/static/MySQL/7401_p_shop_get_many_supplier.sql @@ -192,7 +192,7 @@ BEGIN END IF; -- Returns - # Suppliers + -- Suppliers SELECT t_S.id_supplier, S.id_currency, @@ -211,7 +211,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Currency C ON S.id_currency = C.id_currency ; - # Supplier Addresses + -- Supplier Addresses SELECT t_S.id_supplier , SA.id_address @@ -229,7 +229,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Region R ON SA.id_region = R.id_region ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -253,11 +253,11 @@ DELIMITER ; /* CALL p_shop_get_many_supplier ( - 1 -- 'auth0|6582b95c895d09a70ba10fef' # a_id_user - , 1 # a_get_all_supplier - , 0 # a_get_inactive_supplier - , '' # a_ids_supplier - , 0 # a_debug + 1 -- 'auth0|6582b95c895d09a70ba10fef' -- a_id_user + , 1 -- a_get_all_supplier + , 0 -- a_get_inactive_supplier + , '' -- a_ids_supplier + , 0 -- a_debug ); */ \ No newline at end of file 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 888f75a6..cec3c8dd 100644 --- a/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql +++ b/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql @@ -276,7 +276,7 @@ BEGIN -- Validation -- Supplier Purchase Order - # id_order + -- id_order IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order t_SPO @@ -305,7 +305,7 @@ BEGIN AND ISNULL(SPO.id_stock) ; END IF; - # id_supplier_ordered + -- id_supplier_ordered IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order t_SPO @@ -338,7 +338,7 @@ BEGIN ) ; END IF; - # id_currency_cost + -- id_currency_cost IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order t_SPO @@ -371,7 +371,7 @@ BEGIN ) ; END IF; - # id_unit_quantity + -- id_unit_quantity IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order_Product_Link t_SPOPL @@ -404,7 +404,7 @@ BEGIN ) ; END IF; - # Invalid quantity ordered + -- Invalid quantity ordered IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order_Product_Link t_SPOPL @@ -428,7 +428,7 @@ BEGIN OR t_SPOPL.quantity_ordered <= 0 ; END IF; - # Invalid quantity received + -- Invalid quantity received IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order_Product_Link t_SPOPL @@ -448,7 +448,7 @@ BEGIN WHERE t_SPOPL.quantity_received < 0 ; END IF; - # Invalid delivery latency + -- Invalid delivery latency IF EXISTS ( SELECT * FROM tmp_Supplier_Purchase_Order_Product_Link t_SPOPL @@ -816,7 +816,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -862,29 +862,29 @@ INSERT INTO Shop_Supplier_Purchase_Order_Product_Link_Temp ( ) VALUES ( - 'NIPS', # guid - -1, # id_link, - -1, # id_order, - 1, # id_permutation, - 100, # cost_total_local, - 1, # id_currency_cost, - 1, # quantity_ordered, - 1, # id_unit_quantity, - 1, # quantity_received, - 14, # latency_delivery_days , - 1, # display_order - 1 # active + 'NIPS', -- guid + -1, -- id_link, + -1, -- id_order, + 1, -- id_permutation, + 100, -- cost_total_local, + 1, -- id_currency_cost, + 1, -- quantity_ordered, + 1, -- id_unit_quantity, + 1, -- quantity_received, + 14, -- latency_delivery_days , + 1, -- display_order + 1 -- active ) ; SELECT * FROM Shop_Supplier_Purchase_Order_Product_Link_Temp; CALL p_shop_save_supplier_purchase_order ( - 'NIPS', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - -1, # a_id_order - 1, # a_id_supplier_ordered - 1 # a_id_currency_cost + 'NIPS', -- a_guid + 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + -1, -- a_id_order + 1, -- a_id_supplier_ordered + 1 -- a_id_currency_cost ); SELECT * FROM Shop_Supplier_Purchase_Order_Product_Link_Temp; 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 a1091306..cbe68ae6 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 @@ -391,7 +391,7 @@ BEGIN -- Returns /* - # Suppliers + -- Suppliers SELECT t_S.id_supplier, S.name_company, @@ -410,7 +410,7 @@ BEGIN ; */ - # Supplier Purchase Order + -- Supplier Purchase Order SELECT t_SPO.id_order , SPO.id_supplier_ordered @@ -433,7 +433,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Currency C ON SPO.id_currency_cost = C.id_currency ; - # Supplier Purchase Order Product Link + -- Supplier Purchase Order Product Link SELECT SPOPL.id_link , SPOPL.id_order @@ -459,7 +459,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Product P ON PP.id_product = P.id_product ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -488,17 +488,17 @@ DELIMITER ; /* CALL p_shop_get_many_supplier_purchase_order ( - 1, # a_id_user - 1, # a_get_all_supplier - 0, # a_get_inactive_supplier - '', # a_ids_supplier - 1, # a_get_all_order - 0, # a_get_inactive_order - '', # a_ids_order - '', # a_ids_permutation - NULL, # a_date_from - NULL # a_date_to - , 0 # a_debug + 1, -- a_id_user + 1, -- a_get_all_supplier + 0, -- a_get_inactive_supplier + '', -- a_ids_supplier + 1, -- a_get_all_order + 0, -- a_get_inactive_order + '', -- a_ids_order + '', -- a_ids_permutation + NULL, -- a_date_from + NULL -- a_date_to + , 0 -- a_debug ); */ 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 a196775e..49de0f05 100644 --- a/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql +++ b/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql @@ -287,7 +287,7 @@ BEGIN -- Validation -- Manufacturing Purchase Order - # id_order + -- id_order IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order t_MPO @@ -316,7 +316,7 @@ BEGIN AND ISNULL(MPO.id_order) ; END IF; - # id_currency + -- id_currency IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order t_MPO @@ -349,7 +349,7 @@ BEGIN ) ; END IF; - # id_unit_quantity + -- id_unit_quantity IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -382,7 +382,7 @@ BEGIN ) ; END IF; - # Invalid quantity used + -- Invalid quantity used IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -406,7 +406,7 @@ BEGIN AND t_MPOPL.quantity_used <= 0 ; END IF; - # Invalid quantity produced + -- Invalid quantity produced IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -430,7 +430,7 @@ BEGIN AND t_MPOPL.quantity_produced < 0 ; END IF; - # id_unit_latency_manufacture + -- id_unit_latency_manufacture IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -461,7 +461,7 @@ BEGIN OR UM.active = 0 ; END IF; - # Invalid manufacture latency + -- Invalid manufacture latency IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -482,7 +482,7 @@ BEGIN ; END IF; - # Invalid costs excl VAT + -- Invalid costs excl VAT IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -506,7 +506,7 @@ BEGIN AND t_MPOPL.cost_unit_local_VAT_excl < 0 ; END IF; - # Invalid costs incl VAT + -- Invalid costs incl VAT IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -531,7 +531,7 @@ BEGIN ; END IF; - # Invalid prices excl VAT + -- Invalid prices excl VAT IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -555,7 +555,7 @@ BEGIN AND t_MPOPL.price_unit_local_VAT_excl < 0 ; END IF; - # Invalid prices incl VAT + -- Invalid prices incl VAT IF EXISTS ( SELECT * FROM tmp_Manufacturing_Purchase_Order_Product_Link t_MPOPL @@ -937,7 +937,7 @@ BEGIN COMMIT; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -983,18 +983,18 @@ INSERT INTO Shop_Manufacturing_Purchase_Order_Product_Link_Temp ( ) VALUES ( - 'NIPS', # guid - -1, # id_link, - -1, # id_order, - 1, # id_permutation, - 100, # cost_total_local, - 1, # id_currency, - 1, # quantity_used, - 1, # id_unit_quantity, - 1, # quantity_produced, - 14, # latency_manufacture , - 1, # display_order - 1 # active + 'NIPS', -- guid + -1, -- id_link, + -1, -- id_order, + 1, -- id_permutation, + 100, -- cost_total_local, + 1, -- id_currency, + 1, -- quantity_used, + 1, -- id_unit_quantity, + 1, -- quantity_produced, + 14, -- latency_manufacture , + 1, -- display_order + 1 -- active ) ; @@ -1002,8 +1002,8 @@ SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp; CALL p_shop_save_manufacturing_purchase_order ( 'TEST SAVE' - , 'NIPS' # a_guid - , 1 -- 'auth0|6582b95c895d09a70ba10fef', # a_id_user + , 'NIPS' -- a_guid + , 1 -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user , 1 -- a_debug ); 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 25051169..12c1b86a 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 @@ -294,7 +294,7 @@ BEGIN -- Returns /* - # Manufacturings + -- Manufacturings SELECT t_S.id_manufacturing, S.name_company, @@ -313,7 +313,7 @@ BEGIN ; */ - # Manufacturing Purchase Order + -- Manufacturing Purchase Order SELECT t_MPO.id_order , MPO.id_currency @@ -335,7 +335,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Currency C ON MPO.id_currency = C.id_currency ; - # Manufacturing Purchase Order Product Link + -- Manufacturing Purchase Order Product Link SELECT MPOPL.id_link , MPOPL.id_order @@ -361,7 +361,7 @@ BEGIN LEFT JOIN partsltd_prod.Shop_Product P ON PP.id_product = P.id_product ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error t_ME INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type @@ -388,14 +388,14 @@ DELIMITER ; /* CALL p_shop_get_many_manufacturing_purchase_order ( - 0 # a_id_user - , 1 # a_get_all_order - , 1 # a_get_inactive_order - , '' # a_ids_order - , '' # a_ids_permutation - , NULL # a_date_from - , NULL # a_date_to - , 0 # a_debug + 0 -- a_id_user + , 1 -- a_get_all_order + , 1 -- a_get_inactive_order + , '' -- a_ids_order + , '' -- a_ids_permutation + , NULL -- a_date_from + , NULL -- a_date_to + , 0 -- a_debug ); diff --git a/static/MySQL/7421_p_shop_save_customer.sql b/static/MySQL/7421_p_shop_save_customer.sql index cc93f1f7..400ea59e 100644 --- a/static/MySQL/7421_p_shop_save_customer.sql +++ b/static/MySQL/7421_p_shop_save_customer.sql @@ -263,7 +263,7 @@ BEGIN -- Returns -- SET v_now = NOW(); - # Errors + -- Errors SELECT * FROM tmp_Msg_Error ; @@ -277,18 +277,18 @@ DELIMITER ; /* CALL p_shop_save_customer ( - 'NIPS', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 'Initial Customer', # a_comment - '-1', # a_id_customer - 'good co', # a_name_company - 'teddy', # a_name_contact - 'manufacturing', # a_department_contact - 1, # a_id_address - 'BRING BRING', # a_phone_number - 'e@mail.com', # a_email - 1, # a_id_currency_cost - 1 # a_active + 'NIPS', -- a_guid + 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 'Initial Customer', -- a_comment + '-1', -- a_id_customer + 'good co', -- a_name_company + 'teddy', -- a_name_contact + 'manufacturing', -- a_department_contact + 1, -- a_id_address + 'BRING BRING', -- a_phone_number + 'e@mail.com', -- a_email + 1, -- a_id_currency_cost + 1 -- a_active ); SELECT * FROM Shop_Customer diff --git a/static/MySQL/7422_p_shop_get_many_customer.sql b/static/MySQL/7422_p_shop_get_many_customer.sql index 17611391..f26db581 100644 --- a/static/MySQL/7422_p_shop_get_many_customer.sql +++ b/static/MySQL/7422_p_shop_get_many_customer.sql @@ -4,11 +4,11 @@ /* CALL p_shop_get_many_customer ( - '', # a_id_user - 1, # a_get_all_customer - 0, # a_get_inactive_customer - 0, # a_get_first_customer_only - '', # a_ids_customer + '', -- a_id_user + 1, -- a_get_all_customer + 0, -- a_get_inactive_customer + 0, -- a_get_first_customer_only + '', -- a_ids_customer ); */ @@ -33,11 +33,11 @@ BEGIN DECLARE v_code_error_type_bad_data VARCHAR(50); DECLARE v_has_filter_customer BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); - # DECLARE v_ids_permutation_unavailable VARCHAR(4000); + -- DECLARE v_id_user VARCHAR(100); + -- DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_customer INT; - # DECLARE v_ids_product_permission VARCHAR(4000); - # DECLARE v_ids_permutation_permission VARCHAR(4000); + -- DECLARE v_ids_product_permission VARCHAR(4000); + -- DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_id_access_level_view INT; DECLARE v_now DATETIME; DECLARE v_id_minimum INT; @@ -161,7 +161,7 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_customer := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_CUSTOMER' LIMIT 1); -- SELECT v_guid, a_id_user, false, v_id_permission_product, v_id_access_level_view, v_ids_permutation_permission; @@ -194,7 +194,7 @@ BEGIN -- Returns -- SET v_now := NOW(); - # customers + -- customers SELECT t_C.id_customer, C.name_company, @@ -209,7 +209,7 @@ BEGIN INNER JOIN Shop_Customer C ON t_C.id_customer = C.id_customer ; - # Errors + -- Errors SELECT /* t_ME.display_order, @@ -228,7 +228,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_category, @@ -243,8 +243,8 @@ BEGIN ; */ - # select 'other outputs'; - # select * from tmp_Shop_Product; + -- select 'other outputs'; + -- select * from tmp_Shop_Product; -- Clean up DROP TABLE IF EXISTS tmp_Shop_Customer; @@ -258,11 +258,11 @@ DELIMITER ; /* CALL p_shop_get_many_customer ( - '', # a_id_user - 1, # a_get_all_customer - 0, # a_get_inactive_customer - 0, # a_get_first_customer_only - '' # a_ids_customer + '', -- a_id_user + 1, -- a_get_all_customer + 0, -- a_get_inactive_customer + 0, -- a_get_first_customer_only + '' -- a_ids_customer ); SELECT * 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 dce5883c..dbf03770 100644 --- a/static/MySQL/7424_p_shop_save_customer_sales_order.sql +++ b/static/MySQL/7424_p_shop_save_customer_sales_order.sql @@ -104,7 +104,7 @@ BEGIN -- Argument validation - # User ID + -- User ID IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_id_user) OR NOT EXISTS (SELECT * FROM Shop_User WHERE id_user = a_id_user) THEN INSERT INTO tmp_Msg_Error ( @@ -116,7 +116,7 @@ BEGIN END IF; END IF; - # Order ID + -- Order ID IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_id_order) OR ((a_id_order > 0) AND NOT EXISTS (SELECT * FROM Shop_Customer_Sales_Order WHERE id_order = a_id_order)) THEN INSERT INTO tmp_Msg_Error ( @@ -128,7 +128,7 @@ BEGIN END IF; END IF; - # Customer ID + -- Customer ID IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_id_customer) OR NOT EXISTS (SELECT * FROM Shop_Customer WHERE id_customer = a_id_customer) THEN INSERT INTO tmp_Msg_Error ( @@ -140,7 +140,7 @@ BEGIN END IF; END IF; - # Currency ID + -- Currency ID IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_id_currency_price) OR NOT EXISTS (SELECT * FROM Shop_Currency WHERE id_currency = a_id_currency_price) THEN INSERT INTO tmp_Msg_Error ( @@ -152,7 +152,7 @@ BEGIN END IF; END IF; - # Comment + -- Comment IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN IF ISNULL(a_comment) OR TRIM(a_comment) = '' THEN INSERT INTO tmp_Msg_Error ( @@ -467,26 +467,26 @@ BEGIN END IF; -- Returns - # SET v_now = NOW(); + -- SET v_now = NOW(); - # Supplier Purchase Orders + -- Supplier Purchase Orders SELECT * FROM Shop_Customer_Sales_Order WHERE id_order = a_id_order ; - # Supplier Purchase Order Product Links + -- Supplier Purchase Order Product Links SELECT * FROM Shop_Customer_Sales_Order_Product_Link WHERE id_order = a_id_order ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error ; - # DROP TABLE tmp_Shop_Customer_Sales_Order; + -- DROP TABLE tmp_Shop_Customer_Sales_Order; DROP TABLE tmp_Shop_Customer_Sales_Order_Product_Link; DROP TABLE tmp_Msg_Error; END // @@ -517,31 +517,31 @@ INSERT INTO Shop_Customer_Sales_Order_Product_Link_Temp ( ) VALUES ( - 'NIPS', # guid - -1, # id_link, - -1, # id_order, - 1, # id_permutation, - 100, # price_total_local, - 1, # id_currency_price, - 1, # quantity_ordered, - 1, # id_unit_quantity, - 1, # quantity_delivered, - 14, # latency_delivery_days , - 1, # display_order - 1 # active + 'NIPS', -- guid + -1, -- id_link, + -1, -- id_order, + 1, -- id_permutation, + 100, -- price_total_local, + 1, -- id_currency_price, + 1, -- quantity_ordered, + 1, -- id_unit_quantity, + 1, -- quantity_delivered, + 14, -- latency_delivery_days , + 1, -- display_order + 1 -- active ) ; SELECT * FROM Shop_Customer_Sales_Order_Product_Link_Temp; CALL p_shop_save_customer_sales_order ( - 'NIPS', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - 'Initial customer', # a_comment - -1, # a_id_order - 4, # a_id_customer - 1, # a_id_currency_price - 1 # a_active + 'NIPS', -- a_guid + 'auth0|6582b95c895d09a70ba10fef', -- a_id_user + 'Initial customer', -- a_comment + -1, -- a_id_order + 4, -- a_id_customer + 1, -- a_id_currency_price + 1 -- a_active ); SELECT * FROM Shop_Customer_Sales_Order_Product_Link_Temp; 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 4c55eb7e..d5ce1ca9 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 @@ -37,11 +37,11 @@ BEGIN DECLARE v_has_filter_date_from BIT; DECLARE v_has_filter_date_to BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); - # DECLARE v_ids_permutation_unavailable VARCHAR(4000); + -- DECLARE v_id_user VARCHAR(100); + -- DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_ids_permission_customer_purchase_order VARCHAR(4000); DECLARE v_ids_product_permission VARCHAR(4000); - # DECLARE v_ids_permutation_permission VARCHAR(4000); + -- DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_id_access_level_view INT; -- DECLARE v_now DATETIME; -- DECLARE v_id_minimum INT; @@ -195,7 +195,7 @@ BEGIN display_order_category INT NOT NULL, display_order_product INT NOT NULL, display_order_permutation INT NULL, - rank_permutation INT NOT NULL, # _in_category + rank_permutation INT NOT NULL, -- _in_category -- name VARCHAR(255) NOT NULL, -- description VARCHAR(4000) NOT NULL, /* @@ -421,7 +421,7 @@ BEGIN C.display_order AS display_order_category, P.display_order AS display_order_product, PP.display_order AS display_order_permutation - -- RANK() OVER (ORDER BY C.display_order, P.display_order, PP.display_order) AS rank_permutation, #PARTITION BY P.id_category # _in_category + -- RANK() OVER (ORDER BY C.display_order, P.display_order, PP.display_order) AS rank_permutation, --PARTITION BY P.id_category -- _in_category /* P.name, PP.description, @@ -447,7 +447,7 @@ BEGIN INNER JOIN Shop_Product_Category C ON P.id_category = C.id_category WHERE - # permutations + -- permutations ( ( NOT v_has_filter_permutation @@ -458,7 +458,7 @@ BEGIN OR PP.active = 1 ) ) - # categories + -- categories AND ( ( NOT v_has_filter_category @@ -469,7 +469,7 @@ BEGIN OR C.active = 1 ) ) - # products + -- products AND ( ( NOT v_has_filter_product @@ -526,7 +526,7 @@ BEGIN LEFT JOIN tmp_Shop_Product t_P ON CSOPL.id_permutation = t_P.id_permutation LEFT JOIN tmp_Shop_Customer t_S ON CSO.id_customer = t_S.id_customer WHERE - # customer + -- customer /* ( a_get_all_customer = 1 @@ -534,15 +534,15 @@ BEGIN ) */ NOT ISNULL(t_S.id_customer) - # order + -- order AND ( ( a_get_all_order = 1 OR ( - # ID + -- ID -- FIND_IN_SET(CSO.id_order, a_ids_order) > 0 NOT ISNULL(S_T.substring) - # date + -- date AND ( ( v_has_filter_date_from = 0 @@ -555,13 +555,13 @@ BEGIN ) ) ) - # active + -- active AND ( a_get_inactive_order OR CSO.active = 1 ) ) - # permutations + -- permutations AND ( ( v_has_filter_category = 0 @@ -588,7 +588,7 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_ids_permission_customer_purchase_order := (SELECT GROUP_CONCAT(id_permission SEPARATOR ',') FROM Shop_Permission WHERE code IN ('STORE_customer', 'STORE_customer_PURCHASE_ORDER')); -- SET v_ids_permutation_permission := (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') FROM tmp_Shop_Product WHERE NOT ISNULL(id_permutation)); SET v_ids_product_permission := (SELECT GROUP_CONCAT(P.id_product SEPARATOR ',') FROM (SELECT DISTINCT id_product FROM tmp_Shop_Product WHERE NOT ISNULL(id_product)) P); @@ -627,8 +627,8 @@ BEGIN t_P.can_admin = UE_T.can_admin ; - # CALL p_shop_clear_calc_user(v_guid); - # DROP TABLE IF EXISTS Shop_Calc_User_Temp; + -- CALL p_shop_clear_calc_user(v_guid); + -- DROP TABLE IF EXISTS Shop_Calc_User_Temp; DELETE FROM Shop_Calc_User_Temp WHERE GUID = v_guid ; @@ -641,7 +641,7 @@ BEGIN -- Returns -- SET v_now := NOW(); - # customers + -- customers SELECT t_S.id_customer, S.name_company, @@ -657,8 +657,8 @@ BEGIN ON t_S.id_customer = S.id_customer ; - # Customer Sales Order - SELECT # * + -- Customer Sales Order + SELECT -- * t_CSO.id_order, CSO.id_customer, CSO.price_total_local, @@ -668,7 +668,7 @@ BEGIN INNER JOIN tmp_Shop_Customer_Sales_Order t_CSO ON CSO.id_order = t_CSO.id_order ; - # Customer Sales Order Product Link + -- Customer Sales Order Product Link SELECT CSOPL.id_link, CSOPL.id_order, @@ -690,7 +690,7 @@ BEGIN ORDER BY CSOPL.id_order, C.display_order, P.display_order, PP.display_order ; - # Errors + -- Errors SELECT /* t_ME.display_order, @@ -709,7 +709,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_category, @@ -724,8 +724,8 @@ BEGIN ; */ - # select 'other outputs'; - # select * from tmp_Shop_Product; + -- select 'other outputs'; + -- select * from tmp_Shop_Product; -- Clean up DROP TABLE IF EXISTS tmp_Shop_Customer_Sales_Order_Product_Link; @@ -743,23 +743,23 @@ DELIMITER ; /* CALL p_shop_get_many_customer_sales_order ( - '', # a_id_user - 1, # a_get_all_customer - 0, # a_get_inactive_customer - 0, # a_get_first_customer_only - '', # a_ids_customer - 1, # a_get_all_order - 0, # a_get_inactive_order - 0, # a_get_first_order_only - '', # a_ids_order - 0, # a_get_inactive_category - '', # a_ids_category - 0, # a_get_inactive_product - '', # a_ids_product - 0, # a_get_inactive_permutation - '', # a_ids_permutation - NULL, # a_date_from - NULL # a_date_to + '', -- a_id_user + 1, -- a_get_all_customer + 0, -- a_get_inactive_customer + 0, -- a_get_first_customer_only + '', -- a_ids_customer + 1, -- a_get_all_order + 0, -- a_get_inactive_order + 0, -- a_get_first_order_only + '', -- a_ids_order + 0, -- a_get_inactive_category + '', -- a_ids_category + 0, -- a_get_inactive_product + '', -- a_ids_product + 0, -- a_get_inactive_permutation + '', -- a_ids_permutation + NULL, -- a_date_from + NULL -- a_date_to ); select * from shop_image; diff --git a/static/MySQL/9000_populate.sql b/static/MySQL/9000_populate.sql index 60e05e1b..bf38ef57 100644 --- a/static/MySQL/9000_populate.sql +++ b/static/MySQL/9000_populate.sql @@ -18,7 +18,7 @@ BEGIN */ -# Access Levels +-- Access Levels INSERT INTO Shop_Access_Level ( display_order, code, name, priority ) @@ -28,7 +28,7 @@ VALUES (3, 'ADMIN', 'Admin', 1) ; -# Error Message Types +-- Error Message Types INSERT INTO Shop_Msg_Error_Type ( code, name, description ) @@ -40,7 +40,7 @@ VALUES , ('WARNING', 'Warning', 'Non-breaking error.') ; -# File Types +-- File Types INSERT INTO File_Type ( code, name, extension ) @@ -51,7 +51,7 @@ VALUES ('MPEG-4', 'Multimedia Photographic Export Group 4', 'mp4') ; -# Generic / shared properties +-- Generic / shared properties INSERT INTO Shop_General ( quantity_max ) @@ -59,7 +59,7 @@ VALUES ( 10 ); -# Image types +-- Image types INSERT INTO Shop_Image_Type ( display_order, code, name, name_plural ) @@ -69,7 +69,7 @@ VALUES (3, 'THUMBNAIL', 'Thumbnail Image', 'Thumbnail Images') ; -# Regions +-- Regions INSERT INTO Shop_Region ( display_order, code, name ) @@ -78,7 +78,7 @@ VALUES ; /* -# Region Branches +-- Region Branches INSERT INTO Shop_Region_Branch ( display_order, id_region_parent, id_region_child ) @@ -87,7 +87,7 @@ VALUES ; */ -# Addresses +-- Addresses INSERT INTO Shop_Address ( id_region, postcode, address_line_1, address_line_2, city, county ) @@ -95,7 +95,7 @@ VALUES ( 1, 'CV22 6DN', '53 Alfred Green Close', '', 'Rugby', 'Warwickshire' ); -# Plants +-- Plants INSERT INTO Shop_Plant ( code, name, id_address, id_user_manager ) @@ -103,7 +103,7 @@ VALUES ('MAIN', 'Main Plant', 1, 1) ; -# Storage Locations +-- Storage Locations INSERT INTO Shop_Storage_Location ( id_plant, code, name ) @@ -184,7 +184,7 @@ VALUES ; /* -# Storage Location Branches +-- Storage Location Branches INSERT INTO Shop_Storage_Location_Branch ( id_location_parent, id_location_child ) @@ -193,7 +193,7 @@ VALUES ; */ -# Currency +-- Currency INSERT INTO Shop_Currency ( display_order, code, name, symbol, factor_from_GBP ) @@ -202,7 +202,7 @@ VALUES (2, 'EUR', 'Euro', '€', 1.17) ; -# Taxes and Surcharges +-- Taxes and Surcharges INSERT INTO Shop_Tax_Or_Surcharge ( display_order, id_tax, @@ -220,7 +220,7 @@ VALUES (1, 1, 'VAT', 'Value Added Tax', 1, 1, 0, 0.2, 1, 0, 1) ; -# Unit of Measurement +-- Unit of Measurement INSERT INTO Shop_Unit_Measurement ( name_singular, name_plural, symbol, is_base_unit, is_unit_of_distance, is_unit_of_mass, is_unit_of_time, is_unit_of_volume ) @@ -236,7 +236,7 @@ VALUES , ('day', 'days', 'd', 0, 0, 0, 1, 0) ; -# Unit of Measurement Conversion +-- Unit of Measurement Conversion INSERT INTO Shop_Unit_Measurement_Conversion ( id_unit_derived , id_unit_base @@ -281,7 +281,7 @@ VALUES ; -# Categories +-- Categories INSERT INTO Shop_Product_Category ( display_order, code, @@ -297,7 +297,7 @@ VALUES ; /* -# Recurrence Interval +-- Recurrence Interval INSERT INTO Shop_Interval_Recurrence ( code, name, name_plural ) @@ -308,7 +308,7 @@ VALUES ; */ -# Products +-- Products INSERT INTO Shop_Product ( display_order, id_category, @@ -360,7 +360,7 @@ VALUES ) ; -# Product Permutations +-- Product Permutations INSERT INTO Shop_Product_Permutation ( -- display_order, id_permutation_temp, @@ -370,7 +370,7 @@ INSERT INTO Shop_Product_Permutation ( cost_local_VAT_incl, id_currency_cost, profit_local_min, - # id_currency_profit_min, + -- id_currency_profit_min, latency_manufacture, id_unit_measurement_quantity, count_unit_measurement_per_quantity_step, @@ -396,7 +396,7 @@ VALUES 6, 1, 3, - # 1, + -- 1, 14, 1, 1, @@ -421,7 +421,7 @@ VALUES 7.2, 1, 4, - # 1, + -- 1, 14, 1, 1, @@ -446,7 +446,7 @@ VALUES 12, 1, 5, - # 1, + -- 1, 14, 1, 1, @@ -471,7 +471,7 @@ VALUES 12, 1, 5, - # 1, + -- 1, 14, 1, 1, @@ -496,7 +496,7 @@ VALUES 12, 1, 5, - # 1, + -- 1, 14, 1, 1, @@ -521,7 +521,7 @@ VALUES 12, 1, 5, - # 1, + -- 1, 14, 1, 1, @@ -539,7 +539,7 @@ VALUES ) ; -# Variation Types +-- Variation Types INSERT INTO Shop_Variation_Type ( display_order, code, name, name_plural ) @@ -548,7 +548,7 @@ VALUES , (2, 'SIZE', 'Size', 'Sizes') ; -# Variations +-- Variations INSERT INTO Shop_Variation ( display_order, id_type, code, name, id_unit_measurement, count_unit_measurement ) @@ -681,7 +681,7 @@ WHERE V.id_type = 2 ; -# Product Permutation Variation Links +-- Product Permutation Variation Links INSERT INTO Shop_Product_Permutation_Variation_Link ( display_order, id_permutation, id_variation ) @@ -690,7 +690,7 @@ VALUES (2, 2, 2) ; -# Stock items +-- Stock items INSERT INTO Shop_Stock_Item ( id_permutation , date_purchased @@ -709,7 +709,7 @@ VALUES (6, NOW(), 1, 1, 10, 8.4, '2030-09-05 00:00:00') ; -# Product Price +-- Product Price INSERT INTO Shop_Product_Price ( id_permutation , id_currency @@ -727,7 +727,7 @@ VALUES (6, 1, 1, 180, 150) ; -# Product Images +-- Product Images INSERT INTO Shop_Product_Image ( display_order, id_permutation, @@ -736,16 +736,16 @@ INSERT INTO Shop_Product_Image ( ) VALUES (1, 1, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), - # (1, 1, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), + -- (1, 1, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), (2, 2, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), - # (1, 2, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg') + -- (1, 2, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg') (3, 3, 1, '/static/images/prod_PB0NUOSEs06ymG.jpg'), (4, 4, 1, '/static/images/prod_.jpg'), (5, 5, 1, '/static/images/prod_1.jpg'), (6, 6, 1, '/static/images/prod_2.jpg') ; -# Delivery Options +-- Delivery Options INSERT INTO Shop_Delivery_Option ( display_order, code, name, latency_delivery_min, latency_delivery_max ) @@ -754,7 +754,7 @@ VALUES (2, 'SIGNED_1', 'First Class Signed-For', 2, 4) ; -# Product Delivery Option Links +-- Product Delivery Option Links INSERT INTO Shop_Product_Permutation_Delivery_Option_Link ( display_order, id_product, id_permutation, id_delivery_option, id_region, id_currency, price_local, quantity_min, quantity_max ) @@ -767,7 +767,7 @@ VALUES (6, 5, 6, 1, 1, 1, 10, 0, 1) ; -# Discounts +-- Discounts INSERT INTO Shop_Discount ( id_product, id_permutation, @@ -785,7 +785,7 @@ VALUES (1, 2, 'CRIMBO50', 'Christmas 50% off sale!', 0.5, 3, 9, NOW(), '2023-12-31 23:59:59', 1) ; -# Discount Delivery Region Currency Links +-- Discount Delivery Region Currency Links INSERT INTO Shop_Discount_Region_Currency_Link ( id_discount, id_region, @@ -799,7 +799,7 @@ VALUES ; -# Permission Groups +-- Permission Groups INSERT INTO Shop_Permission_Group ( display_order, code, name ) @@ -815,7 +815,7 @@ VALUES select * from Shop_Permission select * from Shop_Role_Permission_Link */ -# Permissions +-- Permissions INSERT INTO Shop_Permission ( display_order, code, name, id_permission_group, id_access_level_required ) @@ -833,7 +833,7 @@ VALUES (99, 'CONTACT_US', 'Contact Us Page', 2, 1) ; -# Roles +-- Roles INSERT INTO Shop_Role ( display_order, code, @@ -844,7 +844,7 @@ VALUES (2, 'USER', 'User') ; -# Role Permission link +-- Role Permission link INSERT INTO Shop_Role_Permission_Link ( id_role, id_permission, id_access_level ) @@ -867,7 +867,7 @@ VALUES (2, 5, 1) ; -# Users +-- Users INSERT INTO Shop_User ( id_user_auth0 , firstname @@ -903,7 +903,7 @@ VALUES ) ; -# User Role link +-- User Role link INSERT INTO Shop_User_Role_Link ( id_user, id_role ) @@ -911,7 +911,7 @@ VALUES (1, 1) ; -# User Addresses +-- User Addresses INSERT INTO Shop_User_Address ( id_user, id_region, name_full, phone_number, postcode, address_line_1, address_line_2, city, county ) @@ -919,7 +919,7 @@ SELECT U.id_user, 1, CONCAT(U.firstname, ' ', U.surname), '07375 571430', 'CV22 FROM Shop_User U ; -# User Basket +-- User Basket INSERT INTO Shop_User_Basket ( id_user, id_product, @@ -930,7 +930,7 @@ VALUES (1, 1, 1, 69) ; -# User Order Status +-- User Order Status INSERT INTO Shop_User_Order_Status ( display_order, code, name, name_plural ) @@ -940,7 +940,7 @@ VALUES ; /* -# User Order +-- User Order INSERT INTO Shop_User_Order ( id_user, value_total, id_order_status, id_checkout_session, id_currency ) @@ -949,7 +949,7 @@ VALUES (1, 25, 1, 'noods', 1) ; -# User Order Product Link +-- User Order Product Link INSERT INTO Shop_User_Order_Product_Link ( id_order, id_product, id_permutation, quantity ) @@ -960,7 +960,7 @@ VALUES ; */ -# Supplier +-- Supplier INSERT INTO Shop_Supplier ( id_supplier_temp , name_company @@ -988,7 +988,7 @@ VALUES ) ; -# Suppliers +-- Suppliers INSERT INTO Shop_Supplier ( id_supplier_temp , name_company @@ -1028,7 +1028,7 @@ VALUES ) ; -# Supplier Addresses +-- Supplier Addresses INSERT INTO Shop_Supplier_Address ( id_supplier , id_region @@ -1063,14 +1063,14 @@ VALUES ; /* -# Supplier Purchase Order +-- Supplier Purchase Order INSERT INTO Shop_Supplier_Purchase_Order ( id_supplier, value_total, id_order_status, id_checkout_session, id_currency ) VALUES ; -# Supplier Purchase Order Product Link +-- Supplier Purchase Order Product Link INSERT INTO Shop_Supplier_Purchase_Order_Product_Link ( id_order, id_permutation, cost_total_local, id_currency_cost, quantity_ordered, id_unit_quantity, quantity_received, latency_delivery, display_order ) @@ -1079,14 +1079,14 @@ VALUES */ /* -# Manufacturing Purchase Order +-- Manufacturing Purchase Order INSERT INTO Shop_Manufacturing_Purchase_Order ( cost_total_local, id_currency_cost ) VALUES ; -# Manufacturing Purchase Order Product Link +-- Manufacturing Purchase Order Product Link INSERT INTO Shop_Manufacturing_Purchase_Order_Product_Link ( id_order, id_permutation, cost_total_local, id_currency_cost, quantity_used, id_unit_quantity, quantity_produced, latency_manufacturing_days, display_order ) @@ -1095,7 +1095,7 @@ VALUES */ /* -# Customer +-- Customer INSERT INTO Shop_Customer ( name_company, name_contact, department_contact, id_address, phone_number, email, id_currency ) @@ -1105,14 +1105,14 @@ VALUES */ /* -# Customer Sales Order +-- Customer Sales Order INSERT INTO Shop_Customer_Sales_Order ( cost_total_local, id_currency_cost ) VALUES ; -# Customer Sales Order Product Link +-- Customer Sales Order Product Link INSERT INTO Shop_Customer_Sales_Order_Product_Link ( id_order, id_permutation, cost_total_local, id_currency_cost, quantity_ordered, id_unit_quantity, quantity_delivered, latency_delivery_days, display_order ) diff --git a/static/MySQL/9001_view.sql b/static/MySQL/9001_view.sql index df9f49c5..a66613d1 100644 --- a/static/MySQL/9001_view.sql +++ b/static/MySQL/9001_view.sql @@ -1,207 +1,207 @@ -# Product Change Sets +-- Product Change Sets SELECT * FROM Shop_Product_Change_Set; -# User Change Sets +-- User Change Sets SELECT * FROM Shop_User_Change_Set; -# User Change Sets +-- User Change Sets SELECT * FROM Shop_Sales_And_Purchasing_Change_Set; -# Access Levels +-- Access Levels SELECT * FROM Shop_Access_Level; SELECT * FROM Shop_Access_Level_Audit; -# Error Message type +-- Error Message type SELECT * FROM Shop_Msg_Error_Type; -# File Types +-- File Types SELECT * FROM File_Type; SELECT * FROM File_Type_Audit; -# Generic / shared properties +-- Generic / shared properties SELECT * FROM Shop_General; SELECT * FROM Shop_General_Audit; -# Image Types +-- Image Types SELECT * FROM Shop_Image_Type; SELECT * FROM Shop_Image_Type_Audit; -# Regions +-- Regions SELECT * FROM Shop_Region; SELECT * FROM Shop_Region_Audit; -# Region branches +-- Region branches SELECT * FROM Shop_Region_Branch; SELECT * FROM Shop_Region_Branch_Audit; -# Plants +-- Plants SELECT * FROM Shop_Plant; SELECT * FROM Shop_Plant_Audit; -# Storage Locations +-- Storage Locations SELECT * FROM Shop_Storage_Location; SELECT * FROM Shop_Storage_Location_Audit; -# Storage Location branches +-- Storage Location branches SELECT * FROM Shop_Storage_Location_Branch; SELECT * FROM Shop_Storage_Location_Branch_Audit; -# Currencies +-- Currencies SELECT * FROM Shop_Currency; SELECT * FROM Shop_Currency_Audit; -# Taxes and Surcharges +-- Taxes and Surcharges SELECT * FROM Shop_Tax_Or_Surcharge; SELECT * FROM Shop_Tax_Or_Surcharge_Audit; -# Unit of Measurement +-- Unit of Measurement SELECT * FROM Shop_Unit_Measurement; SELECT * FROM Shop_Unit_Measurement_Audit; -# Unit of Measurement Conversion +-- Unit of Measurement Conversion SELECT * FROM Shop_Unit_Measurement_Conversion; SELECT * FROM Shop_Unit_Measurement_Conversion_Audit; /* -# Recurrence Interval +-- Recurrence Interval SELECT * FROM Shop_Interval_Recurrence; SELECT * FROM Shop_Interval_Recurrence_Audit; */ -# Categories +-- Categories SELECT * FROM Shop_Product_Category; SELECT * FROM Shop_Product_Category_Audit; -# Products +-- Products SELECT * FROM Shop_Product; SELECT * FROM Shop_Product_Audit; -# Permutations +-- Permutations SELECT * FROM Shop_Product_Permutation; SELECT * FROM Shop_Product_Permutation_Audit; -# Variation Types +-- Variation Types SELECT * FROM Shop_Variation_Type; SELECT * FROM Shop_Variation_Type_Audit; -# Variations +-- Variations SELECT * FROM Shop_Variation; SELECT * FROM Shop_Variation_Audit; -# Permutation Variation Links +-- Permutation Variation Links SELECT * FROM Shop_Product_Permutation_Variation_Link; SELECT * FROM Shop_Product_Permutation_Variation_Link_Audit; -# Stock Items +-- Stock Items SELECT * FROM Shop_Stock_Item; SELECT * FROM Shop_Stock_Item_Audit; -# Product Currency Links +-- Product Currency Links SELECT * FROM Shop_Product_Price; SELECT * FROM Shop_Product_Price; -# Images +-- Images SELECT * FROM Shop_Product_Image; SELECT * FROM Shop_Product_Image_Audit; -# Delivery Option Types +-- Delivery Option Types SELECT * FROM Shop_Delivery_Option; SELECT * FROM Shop_Delivery_Option_Audit; -# Delivery Options +-- Delivery Options SELECT * FROM Shop_Product_Permutation_Delivery_Option_Link; SELECT * FROM Shop_Product_Permutation_Delivery_Option_Link_Audit; -# Discounts +-- Discounts SELECT * FROM Shop_Discount; SELECT * FROM Shop_Discount_Audit; -# Discount Delivery Region Links +-- Discount Delivery Region Links SELECT * FROM Shop_Discount_Region_Currency_Link; SELECT * FROM Shop_Discount_Region_Currency_Link_Audit; -# Permission Groups +-- Permission Groups SELECT * FROM Shop_Permission_Group; SELECT * FROM Shop_Permission_Group_Audit; -# Permissions +-- Permissions SELECT * FROM Shop_Permission; SELECT * FROM Shop_Permission_Audit; -# Roles +-- Roles SELECT * FROM Shop_Role; SELECT * FROM Shop_Role_Audit; -# Role Permission link +-- Role Permission link SELECT * FROM Shop_Role_Permission_Link; SELECT * FROM Shop_Role_Permission_Link_Audit; -# Users +-- Users SELECT * FROM Shop_User; SELECT * FROM Shop_User_Audit; -# User Role link +-- User Role link SELECT * FROM Shop_User_Role_Link; SELECT * FROM Shop_User_Role_Link_Audit; -# Addresses +-- Addresses SELECT * FROM Shop_Address; SELECT * FROM Shop_Address_Audit; -# Basket +-- Basket SELECT * FROM Shop_User_Basket; SELECT * FROM Shop_User_Basket_Audit; -# Order Statuses +-- Order Statuses SELECT * FROM Shop_User_Order_Status; SELECT * FROM Shop_User_Order_Status_Audit; /* -# Orders +-- Orders SELECT * FROM Shop_User_Order; SELECT * FROM Shop_User_Order_Audit; -# Order Products +-- Order Products SELECT * FROM Shop_User_Order_Product_Link; SELECT * FROM Shop_User_Order_Product_Link_Audit; */ -# Supplier +-- Supplier SELECT * FROM Shop_Supplier; SELECT * FROM Shop_Supplier_Audit; -# Supplier Purchase Order +-- Supplier Purchase Order SELECT * FROM Shop_Supplier_Purchase_Order; SELECT * FROM Shop_Supplier_Purchase_Order_Audit; -# Supplier Purchase Order Product Link +-- Supplier Purchase Order Product Link SELECT * FROM Shop_Supplier_Purchase_Order_Product_Link; SELECT * FROM Shop_Supplier_Purchase_Order_Product_Link_Audit; -# Manufacturing Purchase Order +-- Manufacturing Purchase Order SELECT * FROM Shop_Manufacturing_Purchase_Order; SELECT * FROM Shop_Manufacturing_Purchase_Order_Audit; -# Manufacturing Purchase Order Product Link +-- Manufacturing Purchase Order Product Link SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link; SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link_Audit; -# Customers +-- Customers SELECT * FROM Shop_Customer; SELECT * FROM Shop_Customer_Audit; -# Customer Sales Order +-- Customer Sales Order SELECT * FROM Shop_Customer_Sales_Order; SELECT * FROM Shop_Customer_Sales_Order_Audit; -# Customer Sales Order Product Link +-- Customer Sales Order Product Link SELECT * FROM Shop_Customer_Sales_Order_Product_Link; SELECT * FROM Shop_Customer_Sales_Order_Product_Link_Audit; diff --git a/static/MySQL/deprecated/000_init_tables_authentication.sql b/static/MySQL/deprecated/000_init_tables_authentication.sql index 9acee9ce..632e0fe1 100644 --- a/static/MySQL/deprecated/000_init_tables_authentication.sql +++ b/static/MySQL/deprecated/000_init_tables_authentication.sql @@ -1,11 +1,11 @@ /* Store */ -# Drop dependencies -# DROP PROCEDURE IF EXISTS p_shop_user_eval; +-- Drop dependencies +-- DROP PROCEDURE IF EXISTS p_shop_user_eval; DROP TABLE IF EXISTS User_Eval_Temp; -# Delete old tables +-- Delete old tables DROP TABLE IF EXISTS Shop_Address_Audit; DROP TABLE IF EXISTS Shop_Address; @@ -34,7 +34,7 @@ DROP TABLE IF EXISTS Shop_User_Change_Set; -# User Change Sets +-- User Change Sets CREATE TABLE Shop_User_Change_Set ( id_change_set INT NOT NULL AUTO_INCREMENT PRIMARY KEY, comment VARCHAR(500), @@ -60,7 +60,7 @@ SELECT * FROM Shop_User_Change_Set; -# Access Levels +-- Access Levels CREATE TABLE Shop_Access_Level ( id_access_level INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -118,19 +118,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_access_level, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT (OLD.code <=> NEW.code) UNION - # Changed name + -- Changed name SELECT NEW.id_access_level, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION - # Changed priority + -- Changed priority SELECT NEW.id_access_level, 'priority', CONVERT(OLD.priority, CHAR), CONVERT(NEW.priority, CHAR), NEW.id_change_set WHERE NOT (OLD.priority <=> NEW.priority) UNION - # Changed active + -- Changed active SELECT NEW.id_access_level, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -151,7 +151,7 @@ SELECT * FROM Shop_Access_Level_Audit; -# Permission Groups +-- Permission Groups CREATE TABLE Shop_Permission_Group ( id_group INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -210,15 +210,15 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_group, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_group, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_group, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -237,7 +237,7 @@ SELECT * FROM Shop_Permission_Group_Audit; -# Permissions +-- Permissions CREATE TABLE Shop_Permission ( id_permission INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -304,23 +304,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_permission, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_permission, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed id_permission_group + -- Changed id_permission_group SELECT NEW.id_permission, 'id_permission_group', CONVERT(OLD.id_permission_group, CHAR), CONVERT(NEW.id_permission_group, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission_group <=> NEW.id_permission_group UNION - # Changed required_access_level + -- Changed required_access_level SELECT NEW.id_permission, 'required_access_level', CONVERT(OLD.required_access_level, CHAR), CONVERT(NEW.required_access_level, CHAR), NEW.id_change_set WHERE NOT OLD.required_access_level <=> NEW.required_access_level UNION - # Changed active + -- Changed active SELECT NEW.id_permission, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -341,7 +341,7 @@ SELECT * FROM Shop_Permission_Audit; -# Roles +-- Roles CREATE TABLE Shop_Role ( id_role INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -399,15 +399,15 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_role, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_role, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_role, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -429,7 +429,7 @@ SELECT * FROM Shop_Role_Audit; -# Role Permission link +-- Role Permission link CREATE TABLE Shop_Role_Permission_Link ( id_link INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_role INT, @@ -499,19 +499,19 @@ BEGIN value_new, id_change_set ) - # Changed id_role + -- Changed id_role SELECT NEW.id_link, 'id_role', CONVERT(OLD.id_role, CHAR), CONVERT(NEW.id_role, CHAR), NEW.id_change_set WHERE NOT OLD.id_role <=> NEW.id_role UNION - # Changed id_permission + -- Changed id_permission SELECT NEW.id_link, 'id_permission', CONVERT(OLD.id_permission, CHAR), CONVERT(NEW.id_permission, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission <=> NEW.id_permission UNION - # Changed id_access_level + -- Changed id_access_level SELECT NEW.id_link, 'id_access_level', CONVERT(OLD.id_access_level, CHAR), CONVERT(NEW.id_access_level, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level <=> NEW.id_access_level UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -535,7 +535,7 @@ SELECT * FROM Shop_Role_Permission_Link_Audit; -# Users +-- Users CREATE TABLE Shop_User ( id_user INT NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), @@ -592,15 +592,15 @@ BEGIN value_new, id_change_set ) - # Changed name + -- Changed name SELECT NEW.id_user, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION - # Changed is_super_user + -- Changed is_super_user SELECT NEW.id_user, 'is_super_user', CONVERT(CONVERT(OLD.is_super_user, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_super_user, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_super_user <=> NEW.is_super_user) UNION - # Changed active + -- Changed active SELECT NEW.id_user, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -621,7 +621,7 @@ SELECT * FROM Shop_User_Audit; -# User Role link +-- User Role link CREATE TABLE Shop_User_Role_Link ( id_link INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_user INT, @@ -686,7 +686,7 @@ BEGIN value_new, id_change_set ) - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -705,7 +705,7 @@ SELECT * FROM Shop_User_Role_Link_Audit; -# Addresses +-- Addresses CREATE TABLE Shop_Address ( id_address INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_user INT NOT NULL, @@ -773,39 +773,39 @@ BEGIN value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_address, 'region', OLD.region, NEW.region, NEW.id_change_set WHERE NOT OLD.region <=> NEW.region UNION - # Changed name_full + -- Changed name_full SELECT NEW.id_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set WHERE NOT OLD.name_full <=> NEW.name_full UNION - # Changed phone_number + -- Changed phone_number SELECT NEW.id_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/deprecated/000_init_tables_product.sql b/static/MySQL/deprecated/000_init_tables_product.sql index 31fa9bb9..d10e97ff 100644 --- a/static/MySQL/deprecated/000_init_tables_product.sql +++ b/static/MySQL/deprecated/000_init_tables_product.sql @@ -2,7 +2,7 @@ -# Delete old tables +-- Delete old tables DROP TABLE IF EXISTS Shop_Product_Delivery_Region_Link_Audit; DROP TABLE IF EXISTS Shop_Product_Delivery_Region_Link; @@ -52,7 +52,7 @@ DROP TABLE IF EXISTS Shop_Product_Change_Set; -# Product Change Sets +-- Product Change Sets CREATE TABLE Shop_Product_Change_Set ( id_change_set INT NOT NULL AUTO_INCREMENT PRIMARY KEY, comment VARCHAR(500), @@ -78,7 +78,7 @@ SELECT * FROM Shop_Product_Change_Set; -# File Types +-- File Types CREATE TABLE File_Type ( id_type INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -147,15 +147,15 @@ BEGIN value_prev, value_new ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name WHERE NOT OLD.name <=> NEW.name UNION - # Changed extension + -- Changed extension SELECT NEW.id_type, 'extension', CONVERT(OLD.extension, CHAR), CONVERT(NEW.extension, CHAR) WHERE NOT OLD.extension <=> NEW.extension ; @@ -177,7 +177,7 @@ SELECT * FROM File_Type_Audit; -# Generic / shared properties +-- Generic / shared properties CREATE TABLE Shop_General ( id_general INT NOT NULL AUTO_INCREMENT PRIMARY KEY, quantity_max FLOAT, @@ -227,7 +227,7 @@ BEGIN value_new, id_change_set ) - # Changed quantity max + -- Changed quantity max SELECT NEW.id_general, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; @@ -246,7 +246,7 @@ SELECT * FROM Shop_General_Audit; -# Categories +-- Categories CREATE TABLE Shop_Product_Category ( id_category INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -300,23 +300,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_category, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_category, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed description + -- Changed description SELECT NEW.id_category, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed active + -- Changed active SELECT NEW.id_category, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_category, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -341,7 +341,7 @@ SELECT * FROM Shop_Product_Category_Audit; -# Recurrence Interval +-- Recurrence Interval CREATE TABLE Shop_Interval_Recurrence ( id_interval INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -393,15 +393,15 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_interval, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_interval, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_interval, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural ; @@ -422,7 +422,7 @@ SELECT * FROM Shop_Interval_Recurrence_Audit; -# Products +-- Products CREATE TABLE Shop_Product ( id_product INT NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), @@ -435,7 +435,7 @@ CREATE TABLE Shop_Product ( ON UPDATE RESTRICT, latency_manuf INT NOT NULL DEFAULT 14, quantity_min FLOAT NOT NULL DEFAULT 1, - quantity_max FLOAT NOT NULL DEFAULT 1, # @_quantity_max, + quantity_max FLOAT NOT NULL DEFAULT 1, -- @_quantity_max, quantity_step FLOAT NOT NULL DEFAULT 1, quantity_stock FLOAT NOT NULL DEFAULT 0, is_subscription BIT NOT NULL DEFAULT 0, @@ -494,67 +494,67 @@ BEGIN value_new, id_change_set ) - # Changed name + -- Changed name SELECT NEW.id_product, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed description + -- Changed description SELECT NEW.id_product, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed price_GBP + -- Changed price_GBP SELECT NEW.id_product, 'price_GBP', CONVERT(OLD.price_GBP, CHAR), CONVERT(NEW.price_GBP, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP <=> NEW.price_GBP UNION - # Changed id_category + -- Changed id_category SELECT NEW.id_product, 'id_category', CONVERT(OLD.id_category, CHAR), CONVERT(NEW.id_category, CHAR), NEW.id_change_set WHERE NOT OLD.id_category <=> NEW.id_category UNION - # Changed latency_manuf + -- Changed latency_manuf SELECT NEW.id_product, 'latency_manuf', CONVERT(OLD.latency_manuf, CHAR), CONVERT(NEW.latency_manuf, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manuf <=> NEW.latency_manuf UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_product, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_product, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_step + -- Changed quantity_step SELECT NEW.id_product, 'quantity_step', CONVERT(OLD.quantity_step, CHAR), CONVERT(NEW.quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_step <=> NEW.quantity_step UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_product, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_product, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_product, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_product, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_product, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT OLD.id_stripe_product <=> NEW.id_stripe_product UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_product, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price UNION - # Changed active + -- Changed active SELECT NEW.id_product, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_product, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -589,7 +589,7 @@ SELECT * FROM Shop_Product_Audit; -# Variation Types +-- Variation Types CREATE TABLE Shop_Variation_Type ( id_type INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -643,23 +643,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -678,7 +678,7 @@ SELECT * FROM Shop_Variation_Type_Audit; -# Variations +-- Variations CREATE TABLE Shop_Variation ( id_variation INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_type INT NOT NULL, @@ -736,19 +736,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_variation, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_variation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_variation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_variation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -767,7 +767,7 @@ SELECT * FROM Shop_Variation_Type_Audit; -# Product Variation Link +-- Product Variation Link CREATE TABLE Shop_Product_Variation_Link ( id_link INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_product INT, @@ -833,19 +833,19 @@ BEGIN value_new, id_change_set ) - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_link, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -864,7 +864,7 @@ SELECT * FROM Shop_Product_Variation_Link_Audit; -# Image Types +-- Image Types CREATE TABLE Shop_Image_Type ( id_type INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50), @@ -918,23 +918,23 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -955,7 +955,7 @@ SELECT * FROM Shop_Image_Type_Audit; -# Images +-- Images CREATE TABLE Shop_Image ( id_image INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_type INT NOT NULL, @@ -1014,23 +1014,23 @@ BEGIN value_new, id_change_set ) - # Changed id_type + -- Changed id_type SELECT NEW.id_image, 'id_type', CONVERT(OLD.id_type, CHAR), CONVERT(NEW.id_type, CHAR), NEW.id_change_set WHERE NOT OLD.id_type <=> NEW.id_type UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_image, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed url + -- Changed url SELECT NEW.id_image, 'url', OLD.url, NEW.url, NEW.id_change_set WHERE NOT OLD.url <=> NEW.url UNION - # Changed active + -- Changed active SELECT NEW.id_image, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_image, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -1049,7 +1049,7 @@ SELECT * FROM Shop_Image_Audit; /* -# Product Image Link +-- Product Image Link CREATE TABLE Shop_Product_Image_Link ( id_link INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_product INT, @@ -1115,15 +1115,15 @@ BEGIN id_change_set ) VALUES ( - ( # Changed id_product + ( -- Changed id_product SELECT NEW.id_link, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product ), - ( # Changed id_variation + ( -- Changed id_variation SELECT NEW.id_link, 'id_image', OLD.id_image, NEW.id_image, NEW.id_change_set WHERE NOT OLD.id_image <=> NEW.id_image ), - ( # Changed active + ( -- Changed active SELECT NEW.id_link, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ) @@ -1143,7 +1143,7 @@ SELECT * FROM Shop_Product_Image_Link_Audit; */ -# Delivery Option Types +-- Delivery Option Types CREATE TABLE Shop_Delivery_Option_Type ( id_type INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50) NOT NULL, @@ -1200,35 +1200,35 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed latency_delivery_min + -- Changed latency_delivery_min SELECT NEW.id_type, 'latency_delivery_min', CONVERT(OLD.latency_delivery_min, CHAR), CONVERT(NEW.latency_delivery_min, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_min <=> NEW.latency_delivery_min UNION - # Changed latency_delivery_max + -- Changed latency_delivery_max SELECT NEW.id_type, 'latency_delivery_max', CONVERT(OLD.latency_delivery_max, CHAR), CONVERT(NEW.latency_delivery_max, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_max <=> NEW.latency_delivery_max UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_type, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_type, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -1248,7 +1248,7 @@ SELECT * FROM Shop_Delivery_Option_Type_Audit; -# Delivery Option +-- Delivery Option CREATE TABLE Shop_Delivery_Option ( id_option INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_product INT, @@ -1314,19 +1314,19 @@ BEGIN value_new, id_change_set ) - # Changed id_product + -- Changed id_product SELECT NEW.id_option, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_delivery_type + -- Changed id_delivery_type SELECT NEW.id_option, 'id_delivery_type', CONVERT(OLD.id_delivery_type, CHAR), CONVERT(NEW.id_delivery_type, CHAR), NEW.id_change_set WHERE NOT OLD.id_delivery_type <=> NEW.id_delivery_type UNION - # Changed price_GBP + -- Changed price_GBP SELECT NEW.id_option, 'price_GBP', CONVERT(OLD.price_GBP, CHAR), CONVERT(NEW.price_GBP, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP <=> NEW.price_GBP UNION - # Changed active + -- Changed active SELECT NEW.id_option, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -1345,7 +1345,7 @@ SELECT * FROM Shop_Delivery_Option_Audit; -# Delivery Regions +-- Delivery Regions CREATE TABLE Shop_Delivery_Region ( id_region INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code VARCHAR(50) NOT NULL, @@ -1398,19 +1398,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_region, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_region, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_region, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_region, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -1429,7 +1429,7 @@ SELECT * FROM Shop_Delivery_Region_Audit; -# Product Delivery Option Link +-- Product Delivery Option Link CREATE TABLE Shop_Product_Delivery_Region_Link ( id_link INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_product INT NOT NULL, @@ -1494,15 +1494,15 @@ BEGIN value_new, id_change_set ) - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/deprecated/108_tbl_Shop_Recurrence_Interval.sql b/static/MySQL/deprecated/108_tbl_Shop_Recurrence_Interval.sql index 1a8341db..d76bcc6a 100644 --- a/static/MySQL/deprecated/108_tbl_Shop_Recurrence_Interval.sql +++ b/static/MySQL/deprecated/108_tbl_Shop_Recurrence_Interval.sql @@ -1,5 +1,5 @@ -# Recurrence Interval +-- Recurrence Interval diff --git a/static/MySQL/deprecated/109_tbl_Shop_Recurrence_Interval_Audit.sql b/static/MySQL/deprecated/109_tbl_Shop_Recurrence_Interval_Audit.sql index d84813f4..54fdc973 100644 --- a/static/MySQL/deprecated/109_tbl_Shop_Recurrence_Interval_Audit.sql +++ b/static/MySQL/deprecated/109_tbl_Shop_Recurrence_Interval_Audit.sql @@ -1,5 +1,5 @@ -# Recurrence Interval Audits +-- Recurrence Interval Audits diff --git a/static/MySQL/deprecated/113.1_tbl_Shop_Product_Variation_Type_Link.sql b/static/MySQL/deprecated/113.1_tbl_Shop_Product_Variation_Type_Link.sql index 38293389..e3f42c62 100644 --- a/static/MySQL/deprecated/113.1_tbl_Shop_Product_Variation_Type_Link.sql +++ b/static/MySQL/deprecated/113.1_tbl_Shop_Product_Variation_Type_Link.sql @@ -1,5 +1,5 @@ -# Product Variation Type Link +-- Product Variation Type Link diff --git a/static/MySQL/deprecated/113.2_tbl_Shop_Product_Variation_Type_Link_Audit.sql b/static/MySQL/deprecated/113.2_tbl_Shop_Product_Variation_Type_Link_Audit.sql index 58a7f567..d0f6b01c 100644 --- a/static/MySQL/deprecated/113.2_tbl_Shop_Product_Variation_Type_Link_Audit.sql +++ b/static/MySQL/deprecated/113.2_tbl_Shop_Product_Variation_Type_Link_Audit.sql @@ -1,5 +1,5 @@ -# Product Variation Type Link Audits +-- Product Variation Type Link Audits diff --git a/static/MySQL/deprecated/116_tbl_Shop_Product_Variation_Link.sql b/static/MySQL/deprecated/116_tbl_Shop_Product_Variation_Link.sql index 7b5ddbc9..3816bd9c 100644 --- a/static/MySQL/deprecated/116_tbl_Shop_Product_Variation_Link.sql +++ b/static/MySQL/deprecated/116_tbl_Shop_Product_Variation_Link.sql @@ -1,5 +1,5 @@ -# Product Variation Link +-- Product Variation Link diff --git a/static/MySQL/deprecated/117.0_tbl_Shop_Product_Variation_Link_Audit.sql b/static/MySQL/deprecated/117.0_tbl_Shop_Product_Variation_Link_Audit.sql index 2791a952..55543919 100644 --- a/static/MySQL/deprecated/117.0_tbl_Shop_Product_Variation_Link_Audit.sql +++ b/static/MySQL/deprecated/117.0_tbl_Shop_Product_Variation_Link_Audit.sql @@ -1,5 +1,5 @@ -# Product Variation Link Audits +-- Product Variation Link Audits diff --git a/static/MySQL/deprecated/128_tbl_Shop_Product_Delivery_Region_Link.sql b/static/MySQL/deprecated/128_tbl_Shop_Product_Delivery_Region_Link.sql index cc9873b5..c4f7b6b8 100644 --- a/static/MySQL/deprecated/128_tbl_Shop_Product_Delivery_Region_Link.sql +++ b/static/MySQL/deprecated/128_tbl_Shop_Product_Delivery_Region_Link.sql @@ -1,5 +1,5 @@ -# Product Delivery Option Link +-- Product Delivery Option Link diff --git a/static/MySQL/deprecated/129_tbl_Shop_Product_Delivery_Region_Link_Audit.sql b/static/MySQL/deprecated/129_tbl_Shop_Product_Delivery_Region_Link_Audit.sql index f552c212..665671c3 100644 --- a/static/MySQL/deprecated/129_tbl_Shop_Product_Delivery_Region_Link_Audit.sql +++ b/static/MySQL/deprecated/129_tbl_Shop_Product_Delivery_Region_Link_Audit.sql @@ -1,5 +1,5 @@ -# Product Delivery Region Link Audits +-- Product Delivery Region Link Audits diff --git a/static/MySQL/deprecated/170_ish_tbl_ERP_Order.sql b/static/MySQL/deprecated/170_ish_tbl_ERP_Order.sql index a3855931..73960c87 100644 --- a/static/MySQL/deprecated/170_ish_tbl_ERP_Order.sql +++ b/static/MySQL/deprecated/170_ish_tbl_ERP_Order.sql @@ -1,5 +1,5 @@ -# ERP Order +-- ERP Order diff --git a/static/MySQL/deprecated/171_tbl_Shop_User_Order.sql b/static/MySQL/deprecated/171_tbl_Shop_User_Order.sql index 081384ec..bf3160b3 100644 --- a/static/MySQL/deprecated/171_tbl_Shop_User_Order.sql +++ b/static/MySQL/deprecated/171_tbl_Shop_User_Order.sql @@ -1,5 +1,5 @@ -# User Order +-- User Order diff --git a/static/MySQL/deprecated/172_tbl_Shop_User_Order_Audit.sql b/static/MySQL/deprecated/172_tbl_Shop_User_Order_Audit.sql index ae9eedd5..1b602f1a 100644 --- a/static/MySQL/deprecated/172_tbl_Shop_User_Order_Audit.sql +++ b/static/MySQL/deprecated/172_tbl_Shop_User_Order_Audit.sql @@ -1,5 +1,5 @@ -# User Order Audits +-- User Order Audits SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Order_Audit'; diff --git a/static/MySQL/deprecated/173_tbl_Shop_User_Order_Product_Link.sql b/static/MySQL/deprecated/173_tbl_Shop_User_Order_Product_Link.sql index f2b8c2ed..9e467382 100644 --- a/static/MySQL/deprecated/173_tbl_Shop_User_Order_Product_Link.sql +++ b/static/MySQL/deprecated/173_tbl_Shop_User_Order_Product_Link.sql @@ -1,5 +1,5 @@ -# User Order Product link +-- User Order Product link diff --git a/static/MySQL/deprecated/174_tbl_Shop_User_Order_Product_Link_Audit.sql b/static/MySQL/deprecated/174_tbl_Shop_User_Order_Product_Link_Audit.sql index 0f1ca26a..bd3c31f9 100644 --- a/static/MySQL/deprecated/174_tbl_Shop_User_Order_Product_Link_Audit.sql +++ b/static/MySQL/deprecated/174_tbl_Shop_User_Order_Product_Link_Audit.sql @@ -1,5 +1,5 @@ -# User Order Product Link Audits +-- User Order Product Link Audits diff --git a/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql b/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql index 92e65558..e0277d48 100644 --- a/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql +++ b/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql @@ -1,5 +1,5 @@ -# Shop Recurrence Interval +-- Shop Recurrence Interval @@ -36,19 +36,19 @@ BEGIN value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_interval, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_interval, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_interval, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed name + -- Changed name SELECT NEW.id_interval, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; 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 b035334c..f2ed43e7 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 @@ -1,5 +1,5 @@ -# Shop Product Variation Link +-- Shop Product Variation Link @@ -40,20 +40,20 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_link, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; 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 434dbde0..ad37c160 100644 --- a/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql +++ b/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql @@ -1,5 +1,5 @@ -# Shop Product Variation Link +-- Shop Product Variation Link @@ -40,20 +40,20 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_link, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; diff --git a/static/MySQL/deprecated/322_tri_Shop_Price.sql b/static/MySQL/deprecated/322_tri_Shop_Price.sql index 9180ab20..c5b57f50 100644 --- a/static/MySQL/deprecated/322_tri_Shop_Price.sql +++ b/static/MySQL/deprecated/322_tri_Shop_Price.sql @@ -1,5 +1,5 @@ -# Shop Product Currency Region Link +-- Shop Product Currency Region Link @@ -60,32 +60,32 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_link, 'id_currency', CONVERT(OLD.id_currency, CHAR), CONVERT(NEW.id_currency, CHAR), NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', OLD.price_local, NEW.price_local, NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local UNION */ - # Changed price_local_VAT_incl + -- Changed price_local_VAT_incl SELECT NEW.id_link, 'price_local_VAT_incl', OLD.price_local_VAT_incl, NEW.price_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_incl <=> NEW.price_local_VAT_incl UNION - # Changed price_local_VAT_excl + -- Changed price_local_VAT_excl SELECT NEW.id_link, 'price_local_VAT_excl', OLD.price_local_VAT_excl, NEW.price_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_excl <=> NEW.price_local_VAT_excl UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_link, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; 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 45647958..edfe357b 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 @@ -1,5 +1,5 @@ -# Shop Product Delivery Region Link +-- Shop Product Delivery Region Link @@ -40,16 +40,16 @@ BEGIN id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; diff --git a/static/MySQL/deprecated/371_tri_Shop_User_Order.sql b/static/MySQL/deprecated/371_tri_Shop_User_Order.sql index 0fcda7c1..ff46d095 100644 --- a/static/MySQL/deprecated/371_tri_Shop_User_Order.sql +++ b/static/MySQL/deprecated/371_tri_Shop_User_Order.sql @@ -1,5 +1,5 @@ -# Shop Product Variation Link +-- Shop Product Variation Link @@ -43,23 +43,23 @@ BEGIN value_new, id_change_set_user ) - # Changed id_user + -- Changed id_user SELECT NEW.id_order, 'id_user', OLD.id_user, NEW.id_user, NEW.id_change_set_user WHERE NOT OLD.id_user <=> NEW.id_user UNION - # Changed value_total + -- Changed value_total SELECT NEW.id_order, 'value_total', CONVERT(OLD.value_total, CHAR), CONVERT(NEW.value_total, CHAR), NEW.id_change_set_user WHERE NOT (OLD.value_total <=> NEW.value_total) UNION - # Changed id_order_status + -- Changed id_order_status SELECT NEW.id_order, 'id_order_status', CONVERT(OLD.id_order_status, CHAR), CONVERT(NEW.id_order_status, CHAR), NEW.id_change_set_user WHERE NOT (OLD.id_order_status <=> NEW.id_order_status) UNION - # Changed id_checkout_session + -- Changed id_checkout_session SELECT NEW.id_order, 'id_checkout_session', OLD.id_checkout_session, NEW.id_checkout_session, NEW.id_change_set_user WHERE NOT (OLD.id_checkout_session <=> NEW.id_checkout_session) UNION - # Changed active + -- Changed active SELECT NEW.id_order, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set_user WHERE NOT (OLD.active <=> NEW.active) ; 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 d9229e5a..6c734f2b 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 @@ -1,5 +1,5 @@ -# Shop User Order Product Link +-- Shop User Order Product Link @@ -39,15 +39,15 @@ BEGIN value_new, id_change_set ) - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'active', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT (OLD.id_product <=> NEW.id_product) UNION - # Changed quantity + -- Changed quantity SELECT NEW.id_link, 'quantity', CONVERT(OLD.quantity, CHAR), CONVERT(NEW.quantity, CHAR), NEW.id_change_set WHERE NOT (OLD.quantity <=> NEW.quantity) UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; 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 33c37952..3bae9227 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 @@ -83,9 +83,9 @@ BEGIN CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, - # id_type INT NOT NULL, - # CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) - # REFERENCES Shop_Msg_Error_Type (id_type), + -- id_type INT NOT NULL, + -- CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) + -- REFERENCES Shop_Msg_Error_Type (id_type), code VARCHAR(50), msg VARCHAR(4000) NOT NULL ); @@ -133,13 +133,13 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN CALL p_shop_user_eval ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_USER' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' AND active), # a_ids_access_level - '', # a_ids_product - '' # a_ids_permutation + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_USER' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' AND active), -- a_ids_access_level + '', -- a_ids_product + '' -- a_ids_permutation ); IF NOT (SELECT can_edit FROM Shop_User_Eval_Temp WHERE guid = v_guid) THEN @@ -163,8 +163,8 @@ BEGIN -- Invalid Orders IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # Invalid Order IDs - IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_order AND FIND_IN_SET(id_order, a_ids_order) > 0) THEN # id_order LIKE CONCAT('%', a_ids_order, '%') LIMIT 1) THEN + -- Invalid Order IDs + IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_order AND FIND_IN_SET(id_order, a_ids_order) > 0) THEN -- id_order LIKE CONCAT('%', a_ids_order, '%') LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( guid, code, @@ -173,11 +173,11 @@ BEGIN VALUES ( v_guid, v_code_error_data, - CONCAT('You do not have access to the following order IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND FIND_IN_SET(id_order, a_ids_order) > 0)) # id_order LIKE CONCAT('%', a_ids_order, '%'))) # AND v_has_filter_order # filtered by parent condition + CONCAT('You do not have access to the following order IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND FIND_IN_SET(id_order, a_ids_order) > 0)) -- id_order LIKE CONCAT('%', a_ids_order, '%'))) -- AND v_has_filter_order -- filtered by parent condition ) ; END IF; - # Invalid Checkout Session IDs + -- Invalid Checkout Session IDs IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_session AND id_checkout_session = a_id_checkout_session) THEN INSERT INTO tmp_Msg_Error ( guid, @@ -187,7 +187,7 @@ BEGIN VALUES ( v_guid, v_code_error_data, - CONCAT('You do not have access to the following checkout session IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND id_checkout_session = a_id_checkout_session)) # AND v_has_filter_order # filtered by parent condition + CONCAT('You do not have access to the following checkout session IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND id_checkout_session = a_id_checkout_session)) -- AND v_has_filter_order -- filtered by parent condition ) ; END IF; @@ -206,7 +206,7 @@ BEGIN INNER JOIN tmp_Shop_User t_U ON UO.id_user = t_U.id_user AND t_U.active - WHERE ((NOT v_has_filter_order OR FIND_IN_SET(UO.id_order, a_ids_order) > 0) # UO.id_order LIKE CONCAT('%', a_ids_order, '%')) + WHERE ((NOT v_has_filter_order OR FIND_IN_SET(UO.id_order, a_ids_order) > 0) -- UO.id_order LIKE CONCAT('%', a_ids_order, '%')) OR (NOT v_has_filter_session OR UO.id_checkout_session = a_id_checkout_session)) AND UO.active ; @@ -234,7 +234,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -242,7 +242,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user, a_ids_order, diff --git a/static/MySQL/deprecated/706_p_shop_get_product.sql b/static/MySQL/deprecated/706_p_shop_get_product.sql index fc8526c7..968a6080 100644 --- a/static/MySQL/deprecated/706_p_shop_get_product.sql +++ b/static/MySQL/deprecated/706_p_shop_get_product.sql @@ -4,11 +4,11 @@ /* CALL p_shop_get_product ( - '', # a_id_user - 1, # a_id_product - '', # a_ids_image - 0, # a_get_first_image_only - 1 # a_get_all_images + '', -- a_id_user + 1, -- a_id_product + '', -- a_ids_image + 0, -- a_get_first_image_only + 1 -- a_get_all_images ) */ @@ -35,7 +35,7 @@ BEGIN DECLARE v_has_filter_permutation BIT; DECLARE v_has_product_permutations BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_id_permission_product INT; DECLARE v_ids_product_permission VARCHAR(500); DECLARE v_id_access_level_view INT; @@ -113,8 +113,8 @@ BEGIN CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) @@ -124,22 +124,22 @@ BEGIN -- Parse filters - # SET v_id_product_search = CONCAT('%', CAST(a_id_product AS CHAR), '%'); - # select v_id_product_search; + -- SET v_id_product_search = CONCAT('%', CAST(a_id_product AS CHAR), '%'); + -- select v_id_product_search; SET v_has_filter_image = ''; - # Products + -- Products INSERT INTO tmp_Shop_Product ( id_product, id_category, display_order ) SELECT P.id_product, P.id_category, P.display_order FROM Shop_Product P - # WHERE P.id_product LIKE v_id_product_search + -- WHERE P.id_product LIKE v_id_product_search WHERE P.id_product = a_id_product AND NOT P.has_variations AND P.active ; - # Product Permutations + -- Product Permutations INSERT INTO tmp_Shop_Product ( id_product, id_category, id_permutation, display_order ) @@ -149,7 +149,7 @@ BEGIN ON PP.id_product = P.id_product AND P.has_variations AND P.active - # WHERE PP.id_product LIKE v_id_product_search + -- WHERE PP.id_product LIKE v_id_product_search WHERE PP.id_product = a_id_product AND PP.active ; @@ -158,7 +158,7 @@ BEGIN -- SET v_has_filter_product = NOT ISNULL(a_id_product); SET v_has_product_permutations = EXISTS (SELECT id_permutation FROM tmp_Shop_Product WHERE NOT ISNULL(id_permutation)); - IF ISNULL(a_id_product) THEN # NOT v_has_filter_product + IF ISNULL(a_id_product) THEN -- NOT v_has_filter_product INSERT INTO tmp_Msg_Error ( guid, code, @@ -172,7 +172,7 @@ BEGIN ; END IF; - # Permutations + -- Permutations IF v_has_filter_permutation THEN DELETE FROM tmp_Shop_Product WHERE FIND_IN_SET(id_permutation, a_ids_permutation) = 0 @@ -195,7 +195,7 @@ BEGIN /* - # Variations + -- Variations INSERT INTO tmp_Shop_Variation ( id_variation, id_product ) @@ -208,7 +208,7 @@ BEGIN */ IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN - # Product Images + -- Product Images INSERT INTO tmp_Shop_Image ( id_product, id_image, display_order ) @@ -222,7 +222,7 @@ BEGIN AND NOT P.has_variations WHERE I.active ; - # Product Permutation Images + -- Product Permutation Images INSERT INTO tmp_Shop_Image ( id_product, id_permutation, @@ -250,7 +250,7 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) AND EXISTS (SELECT * FROM tmp_Shop_Product LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_product := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); SET v_ids_product_permission := (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR '|') FROM tmp_Shop_Product); @@ -269,11 +269,11 @@ BEGIN t_P.can_admin = UE_T.can_admin; DELETE FROM tmp_Shop_Product - WHERE FIND_IN_SET(id_product, (SELECT GROUP_CONCAT(id_product SEPARATOR ',') FROM Shop_User_Eval_Temp)) = 0 # id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_User_Eval_Temp), '%'); + WHERE FIND_IN_SET(id_product, (SELECT GROUP_CONCAT(id_product SEPARATOR ',') FROM Shop_User_Eval_Temp)) = 0 -- id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_User_Eval_Temp), '%'); ; - # CALL p_shop_user_eval_clear_temp(v_guid); - # DROP TABLE IF EXISTS Shop_User_Eval_Temp; + -- CALL p_shop_user_eval_clear_temp(v_guid); + -- DROP TABLE IF EXISTS Shop_User_Eval_Temp; DELETE FROM Shop_User_Eval_Temp WHERE GUID = v_guid; END IF; @@ -282,7 +282,7 @@ BEGIN -- Returns SET v_now := NOW(); - # Category + -- Category SELECT DISTINCT t_P.id_category, C.name, C.description, @@ -294,7 +294,7 @@ BEGIN ; IF NOT v_has_product_permutations THEN - # Products + -- Products SELECT t_P.id_product, NULL AS id_permutation, P.name, @@ -321,7 +321,7 @@ BEGIN ORDER BY t_P.display_order ; ELSE - # Permutations + -- Permutations SELECT t_P.id_product, t_P.id_permutation, P.name, @@ -352,7 +352,7 @@ BEGIN ; END IF; - # Variations + -- Variations IF v_has_product_permutations THEN SELECT PPVL.id_variation, t_P.id_product, @@ -385,7 +385,7 @@ BEGIN END IF; IF v_has_product_permutations THEN - # Permutation Variations + -- Permutation Variations SELECT t_P.id_permutation, t_P.id_product, t_P.id_category, @@ -402,7 +402,7 @@ BEGIN ; END IF; - # Images + -- Images SELECT I.id_image, t_P.id_product, I.id_permutation, @@ -418,7 +418,7 @@ BEGIN ORDER BY I.display_order ; - # Delivery Regions + -- Delivery Regions IF v_has_product_permutations THEN SELECT DR.id_region, t_P.id_category, @@ -453,7 +453,7 @@ BEGIN ; END IF; - # Delivery options + -- Delivery options IF v_has_product_permutations THEN SELECT _DO.id_option, _DO.id_product, @@ -521,7 +521,7 @@ BEGIN END IF; IF v_has_product_permutations THEN - # Discounts + -- Discounts SELECT D.id_discount, t_P.id_category, a_id_product, @@ -540,7 +540,7 @@ BEGIN WHERE D.active ; ELSE - # Discounts + -- Discounts SELECT D.id_discount, t_P.id_category, D.id_product, @@ -562,7 +562,7 @@ BEGIN END IF; IF v_has_product_permutations THEN - # Discount Delivery Regions + -- Discount Delivery Regions SELECT DDRL.id_discount, DDRL.id_region, t_P.id_category, @@ -583,7 +583,7 @@ BEGIN WHERE D.active ; ELSE - # Discount Delivery Regions + -- Discount Delivery Regions SELECT DDRL.id_discount, DDRL.id_region, t_P.id_category, @@ -606,14 +606,14 @@ BEGIN ; END IF; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_categories, @@ -639,8 +639,8 @@ DELIMITER ; CALL p_shop_get_product ( - '', # a_id_user - 1 # a_id_product + '', -- a_id_user + 1 -- a_id_product ); /* diff --git a/static/MySQL/deprecated/dump.sql b/static/MySQL/deprecated/dump.sql index 91f55473..7fc0217d 100644 --- a/static/MySQL/deprecated/dump.sql +++ b/static/MySQL/deprecated/dump.sql @@ -80,15 +80,15 @@ DELIMITER ;;; value_prev, value_new ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name WHERE NOT OLD.name <=> NEW.name UNION - # Changed extension + -- Changed extension SELECT NEW.id_type, 'extension', CONVERT(OLD.extension, CHAR), CONVERT(NEW.extension, CHAR) WHERE NOT OLD.extension <=> NEW.extension ; @@ -243,23 +243,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_access_level, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT (OLD.code <=> NEW.code) UNION - # Changed name + -- Changed name SELECT NEW.id_access_level, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION - # Changed priority + -- Changed priority SELECT NEW.id_access_level, 'priority', CONVERT(OLD.priority, CHAR), CONVERT(NEW.priority, CHAR), NEW.id_change_set WHERE NOT (OLD.priority <=> NEW.priority) UNION - # Changed active + -- Changed active SELECT NEW.id_access_level, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_access_level, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -384,39 +384,39 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed name_full + -- Changed name_full SELECT NEW.id_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set WHERE NOT OLD.name_full <=> NEW.name_full UNION - # Changed phone_number + -- Changed phone_number SELECT NEW.id_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -530,23 +530,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_category, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_category, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed description + -- Changed description SELECT NEW.id_category, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed active + -- Changed active SELECT NEW.id_category, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_category, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -665,27 +665,27 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_currency, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_currency, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed symbol + -- Changed symbol SELECT NEW.id_currency, 'symbol', OLD.symbol, NEW.symbol, NEW.id_change_set WHERE NOT OLD.symbol <=> NEW.symbol UNION - # Changed ratio_2_GBP + -- Changed ratio_2_GBP SELECT NEW.id_currency, 'factor_from_GBP', OLD.factor_from_GBP, NEW.factor_from_GBP, NEW.id_change_set WHERE NOT OLD.factor_from_GBP <=> NEW.factor_from_GBP UNION - # Changed active + -- Changed active SELECT NEW.id_currency, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_currency, 'display_order', CONVERT(display_order, CHAR), CONVERT(display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -803,35 +803,35 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_option, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_option, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed latency_delivery_min + -- Changed latency_delivery_min SELECT NEW.id_option, 'latency_delivery_min', CONVERT(OLD.latency_delivery_min, CHAR), CONVERT(NEW.latency_delivery_min, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_min <=> NEW.latency_delivery_min UNION - # Changed latency_delivery_max + -- Changed latency_delivery_max SELECT NEW.id_option, 'latency_delivery_max', CONVERT(OLD.latency_delivery_max, CHAR), CONVERT(NEW.latency_delivery_max, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_max <=> NEW.latency_delivery_max UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_option, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_option, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed active + -- Changed active SELECT NEW.id_option, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_option, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -958,47 +958,47 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_discount, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_discount, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed multiplier + -- Changed multiplier SELECT NEW.id_discount, 'multiplier', OLD.multiplier, NEW.multiplier, NEW.id_change_set WHERE NOT OLD.multiplier <=> NEW.multiplier UNION - # Changed subtractor + -- Changed subtractor SELECT NEW.id_discount, 'subtractor', OLD.subtractor, NEW.subtractor, NEW.id_change_set WHERE NOT OLD.subtractor <=> NEW.subtractor UNION - # Changed apply_multiplier_first + -- Changed apply_multiplier_first SELECT NEW.id_discount, 'apply_multiplier_first', CONVERT(CONVERT(OLD.apply_multiplier_first, SIGNED), CHAR), CONVERT(CONVERT(NEW.apply_multiplier_first, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.apply_multiplier_first <=> NEW.apply_multiplier_first UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_discount, 'quantity_min', OLD.quantity_min, NEW.quantity_min, NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_discount, 'quantity_max', OLD.quantity_max, NEW.quantity_max, NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed date_start + -- Changed date_start SELECT NEW.id_discount, 'date_start', OLD.date_start, NEW.date_start, NEW.id_change_set WHERE NOT OLD.date_start <=> NEW.date_start UNION - # Changed date_end + -- Changed date_end SELECT NEW.id_discount, 'date_end', OLD.date_end, NEW.date_end, NEW.id_change_set WHERE NOT OLD.date_end <=> NEW.date_end UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_discount, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_discount, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -1122,16 +1122,16 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_discount + -- Changed id_discount SELECT NEW.id_link, 'id_discount', CONVERT(OLD.id_discount, CHAR), CONVERT(NEW.id_discount, CHAR), NEW.id_change_set WHERE NOT OLD.id_discount <=> NEW.id_discount UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -1241,7 +1241,7 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed quantity max + -- Changed quantity max SELECT NEW.id_general, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; @@ -1369,31 +1369,31 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed id_type_image + -- Changed id_type_image SELECT NEW.id_image, 'id_type_image', CONVERT(OLD.id_type_image, CHAR), CONVERT(NEW.id_type_image, CHAR), NEW.id_change_set WHERE NOT OLD.id_type_image <=> NEW.id_type_image UNION - # Changed id_type_file + -- Changed id_type_file SELECT NEW.id_image, 'id_type_file', CONVERT(OLD.id_type_file, CHAR), CONVERT(NEW.id_type_file, CHAR), NEW.id_change_set WHERE NOT OLD.id_type_file <=> NEW.id_type_file UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_image, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_image, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed url + -- Changed url SELECT NEW.id_image, 'url', OLD.url, NEW.url, NEW.id_change_set WHERE NOT OLD.url <=> NEW.url UNION - # Changed active + -- Changed active SELECT NEW.id_image, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_image, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -1507,23 +1507,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -1672,27 +1672,27 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_permission, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_permission, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed id_permission_group + -- Changed id_permission_group SELECT NEW.id_permission, 'id_permission_group', CONVERT(OLD.id_permission_group, CHAR), CONVERT(NEW.id_permission_group, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission_group <=> NEW.id_permission_group UNION - # Changed Id_access_level_required + -- Changed Id_access_level_required SELECT NEW.id_permission, 'Id_access_level_required', CONVERT(OLD.Id_access_level_required, CHAR), CONVERT(NEW.Id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.Id_access_level_required <=> NEW.Id_access_level_required UNION - # Changed active + -- Changed active SELECT NEW.id_permission, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_permission, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -1809,19 +1809,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_group, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_group, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_group, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_group, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -1982,89 +1982,89 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed name + -- Changed name SELECT NEW.id_product, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name /* UNION - # Changed description + -- Changed description SELECT NEW.id_product, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed price_GBP_full + -- Changed price_GBP_full SELECT NEW.id_product, 'price_GBP_full', CONVERT(OLD.price_GBP_full, CHAR), CONVERT(NEW.price_GBP_full, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP_full <=> NEW.price_GBP_full UNION - # Changed price_GBP_min + -- Changed price_GBP_min SELECT NEW.id_product, 'price_GBP_min', CONVERT(OLD.price_GBP_min, CHAR), CONVERT(NEW.price_GBP_min, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP_min <=> NEW.price_GBP_min UNION - # Changed has_variations + -- Changed has_variations SELECT NEW.id_product, 'has_variations', CONVERT(CONVERT(NEW.has_variations, SIGNED), CHAR), CONVERT(CONVERT(NEW.has_variations, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.has_variations <=> NEW.has_variations UNION /* - # Changed discount + -- Changed discount SELECT NEW.id_product, 'discount', CONVERT(OLD.discount, CHAR), CONVERT(NEW.discount, CHAR), NEW.id_change_set WHERE NOT OLD.discount <=> NEW.discount */ UNION - # Changed id_category + -- Changed id_category SELECT NEW.id_product, 'id_category', CONVERT(OLD.id_category, CHAR), CONVERT(NEW.id_category, CHAR), NEW.id_change_set WHERE NOT OLD.id_category <=> NEW.id_category /* UNION - # Changed latency_manuf + -- Changed latency_manuf SELECT NEW.id_product, 'latency_manuf', CONVERT(OLD.latency_manuf, CHAR), CONVERT(NEW.latency_manuf, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manuf <=> NEW.latency_manuf UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_product, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_product, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_step + -- Changed quantity_step SELECT NEW.id_product, 'quantity_step', CONVERT(OLD.quantity_step, CHAR), CONVERT(NEW.quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_step <=> NEW.quantity_step UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_product, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_product, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_product, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_product, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_access_level_required + -- Changed id_access_level_required SELECT NEW.id_product, 'id_access_level_required', CONVERT(OLD.id_access_level_required, CHAR), CONVERT(NEW.id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_product, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT OLD.id_stripe_product <=> NEW.id_stripe_product /* UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_product, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price */ UNION - # Changed active + -- Changed active SELECT NEW.id_product, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_product, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -2260,32 +2260,32 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_link, 'id_currency', CONVERT(OLD.id_currency, CHAR), CONVERT(NEW.id_currency, CHAR), NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', OLD.price_local, NEW.price_local, NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local UNION */ - # Changed price_local_VAT_incl + -- Changed price_local_VAT_incl SELECT NEW.id_link, 'price_local_VAT_incl', OLD.price_local_VAT_incl, NEW.price_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_incl <=> NEW.price_local_VAT_incl UNION - # Changed price_local_VAT_excl + -- Changed price_local_VAT_excl SELECT NEW.id_link, 'price_local_VAT_excl', OLD.price_local_VAT_excl, NEW.price_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_excl <=> NEW.price_local_VAT_excl UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_link, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -2435,32 +2435,32 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_link, 'id_currency', CONVERT(OLD.id_currency, CHAR), CONVERT(NEW.id_currency, CHAR), NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', OLD.price_local, NEW.price_local, NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local UNION */ - # Changed price_local_VAT_incl + -- Changed price_local_VAT_incl SELECT NEW.id_link, 'price_local_VAT_incl', OLD.price_local_VAT_incl, NEW.price_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_incl <=> NEW.price_local_VAT_incl UNION - # Changed price_local_VAT_excl + -- Changed price_local_VAT_excl SELECT NEW.id_link, 'price_local_VAT_excl', OLD.price_local_VAT_excl, NEW.price_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_excl <=> NEW.price_local_VAT_excl UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_link, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -2592,32 +2592,32 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed id_option + -- Changed id_option SELECT NEW.id_link, 'id_option', CONVERT(OLD.id_option, CHAR), CONVERT(NEW.id_option, CHAR), NEW.id_change_set WHERE NOT OLD.id_option <=> NEW.id_option UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', CONVERT(OLD.price_local, CHAR), CONVERT(NEW.price_local, CHAR), NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -2755,86 +2755,86 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_permutation, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_permutation, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION - # Changed name + -- Changed name SELECT NEW.id_permutation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION */ - # Changed description + -- Changed description SELECT NEW.id_permutation, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT (OLD.description <=> NEW.description) UNION - # Changed cost_local_manufacturing + -- Changed cost_local_manufacturing SELECT NEW.id_permutation, 'cost_local_manufacturing', CONVERT(OLD.cost_local_manufacturing, CHAR), CONVERT(NEW.cost_local_manufacturing, CHAR), NEW.id_change_set WHERE NOT (OLD.cost_local_manufacturing <=> NEW.cost_local_manufacturing) UNION - # Changed id_currency_cost_manufacturing + -- Changed id_currency_cost_manufacturing SELECT NEW.id_permutation, 'id_currency_cost_manufacturing', CONVERT(OLD.id_currency_cost_manufacturing, CHAR), CONVERT(NEW.id_currency_cost_manufacturing, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_cost_manufacturing <=> NEW.id_currency_cost_manufacturing) UNION - # Changed profit_local_min + -- Changed profit_local_min SELECT NEW.id_permutation, 'profit_local_min', CONVERT(OLD.profit_local_min, CHAR), CONVERT(NEW.profit_local_min, CHAR), NEW.id_change_set WHERE NOT (OLD.profit_local_min <=> NEW.profit_local_min) UNION - # Changed id_currency_profit_min + -- Changed id_currency_profit_min SELECT NEW.id_permutation, 'id_currency_profit_min', CONVERT(OLD.id_currency_profit_min, CHAR), CONVERT(NEW.id_currency_profit_min, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_profit_min <=> NEW.id_currency_profit_min) UNION /* - # Changed price_GBP_min + -- Changed price_GBP_min SELECT NEW.id_permutation, 'price_GBP_min', CONVERT(OLD.price_GBP_min, CHAR), CONVERT(NEW.price_GBP_min, CHAR), NEW.id_change_set WHERE NOT (OLD.price_GBP_min <=> NEW.price_GBP_min) UNION */ - # Changed latency_manufacture + -- Changed latency_manufacture SELECT NEW.id_product, 'latency_manufacture', CONVERT(OLD.latency_manufacture, CHAR), CONVERT(NEW.latency_manufacture, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manufacture <=> NEW.latency_manufacture UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_product, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_product, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_step + -- Changed quantity_step SELECT NEW.id_product, 'quantity_step', CONVERT(OLD.quantity_step, CHAR), CONVERT(NEW.quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_step <=> NEW.quantity_step UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_product, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_product, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_product, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_product, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_permutation, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT (OLD.id_stripe_product <=> NEW.id_stripe_product) UNION - # Changed active + -- Changed active SELECT NEW.id_permutation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_permutation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -2956,20 +2956,20 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_link, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -3082,19 +3082,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_interval, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_interval, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_interval, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed name + -- Changed name SELECT NEW.id_interval, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -3207,19 +3207,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_region, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_region, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_region, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_region, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -3336,16 +3336,16 @@ DELIMITER ;;; id_change_set ) /* - # Changed depth + -- Changed depth SELECT NEW.id_branch, 'depth', CONVERT(OLD.depth, CHAR), CONVERT(NEW.depth, CHAR), NEW.id_change_set WHERE NOT OLD.depth <=> NEW.depth UNION */ - # Changed active + -- Changed active SELECT NEW.id_branch, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_branch, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -3462,19 +3462,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_role, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_role, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_role, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_role, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -3598,20 +3598,20 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_role + -- Changed id_role SELECT NEW.id_link, 'id_role', CONVERT(OLD.id_role, CHAR), CONVERT(NEW.id_role, CHAR), NEW.id_change_set WHERE NOT OLD.id_role <=> NEW.id_role UNION - # Changed id_permission + -- Changed id_permission SELECT NEW.id_link, 'id_permission', CONVERT(OLD.id_permission, CHAR), CONVERT(NEW.id_permission, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission <=> NEW.id_permission UNION */ - # Changed id_access_level + -- Changed id_access_level SELECT NEW.id_link, 'id_access_level', CONVERT(OLD.id_access_level, CHAR), CONVERT(NEW.id_access_level, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level <=> NEW.id_access_level UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -3739,39 +3739,39 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_tax, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_tax, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed fixed_fee + -- Changed fixed_fee SELECT NEW.id_tax, 'fixed_fee', OLD.fixed_fee, NEW.fixed_fee, NEW.id_change_set WHERE NOT OLD.fixed_fee <=> NEW.fixed_fee UNION - # Changed multiplier + -- Changed multiplier SELECT NEW.id_tax, 'multiplier', OLD.multiplier, NEW.multiplier, NEW.id_change_set WHERE NOT OLD.multiplier <=> NEW.multiplier UNION - # Changed apply_fixed_fee_before_multiplier + -- Changed apply_fixed_fee_before_multiplier SELECT NEW.id_tax, 'apply_fixed_fee_before_multiplier', CONVERT(CONVERT(OLD.apply_fixed_fee_before_multiplier, SIGNED), CHAR), CONVERT(CONVERT(NEW.apply_fixed_fee_before_multiplier, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.apply_fixed_fee_before_multiplier <=> NEW.apply_fixed_fee_before_multiplier UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_tax, 'quantity_min', OLD.quantity_min, NEW.quantity_min, NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_tax, 'quantity_max', OLD.quantity_max, NEW.quantity_max, NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_tax, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_tax, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -3889,15 +3889,15 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed name + -- Changed name SELECT NEW.id_user, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION - # Changed is_super_user + -- Changed is_super_user SELECT NEW.id_user, 'is_super_user', CONVERT(CONVERT(OLD.is_super_user, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_super_user, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_super_user <=> NEW.is_super_user) UNION - # Changed active + -- Changed active SELECT NEW.id_user, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -4021,19 +4021,19 @@ DELIMITER ;;; value_new, id_change_set_user ) - # Changed id_user + -- Changed id_user SELECT NEW.id_item, 'id_user', OLD.id_user, NEW.id_user, NEW.id_change_set_user WHERE NOT OLD.id_user <=> NEW.id_user UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_item, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set_user WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed quantity + -- Changed quantity SELECT NEW.id_item, 'quantity', CONVERT(OLD.quantity, CHAR), CONVERT(NEW.quantity, CHAR), NEW.id_change_set_user WHERE NOT (OLD.quantity <=> NEW.quantity) UNION - # Changed active + -- Changed active SELECT NEW.id_item, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set_user WHERE NOT (OLD.active <=> NEW.active) ; @@ -4209,23 +4209,23 @@ DELIMITER ;;; value_new, id_change_set_user ) - # Changed id_user + -- Changed id_user SELECT NEW.id_order, 'id_user', OLD.id_user, NEW.id_user, NEW.id_change_set_user WHERE NOT OLD.id_user <=> NEW.id_user UNION - # Changed value_total + -- Changed value_total SELECT NEW.id_order, 'value_total', CONVERT(OLD.value_total, CHAR), CONVERT(NEW.value_total, CHAR), NEW.id_change_set_user WHERE NOT (OLD.value_total <=> NEW.value_total) UNION - # Changed id_order_status + -- Changed id_order_status SELECT NEW.id_order, 'id_order_status', CONVERT(OLD.id_order_status, CHAR), CONVERT(NEW.id_order_status, CHAR), NEW.id_change_set_user WHERE NOT (OLD.id_order_status <=> NEW.id_order_status) UNION - # Changed id_checkout_session + -- Changed id_checkout_session SELECT NEW.id_order, 'id_checkout_session', OLD.id_checkout_session, NEW.id_checkout_session, NEW.id_change_set_user WHERE NOT (OLD.id_checkout_session <=> NEW.id_checkout_session) UNION - # Changed active + -- Changed active SELECT NEW.id_order, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set_user WHERE NOT (OLD.active <=> NEW.active) ; @@ -4349,15 +4349,15 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'active', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT (OLD.id_product <=> NEW.id_product) UNION - # Changed quantity + -- Changed quantity SELECT NEW.id_link, 'quantity', CONVERT(OLD.quantity, CHAR), CONVERT(NEW.quantity, CHAR), NEW.id_change_set WHERE NOT (OLD.quantity <=> NEW.quantity) UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -4471,23 +4471,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_Status, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_Status, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_Status, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_Status, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_Status, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4607,7 +4607,7 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -4723,19 +4723,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_variation, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_variation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_variation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_variation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4849,23 +4849,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4999,8 +4999,8 @@ BEGIN CREATE TABLE tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, id_type INT NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) REFERENCES Shop_Msg_Error_Type(id_type), @@ -5074,18 +5074,18 @@ BEGIN -- Returns - # User + -- User SELECT * FROM tmp_Shop_User ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error ; /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user, a_name, a_email, @@ -5134,11 +5134,11 @@ BEGIN DECLARE v_n_quantity_permutation_basket INT; DECLARE v_row_number INT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_id_permission_product INT; DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_now DATETIME; - # DECLARE v_quantity_new INT; + -- DECLARE v_quantity_new INT; DECLARE v_change_set_used BIT; DECLARE v_id_change_set INT; @@ -5231,8 +5231,8 @@ BEGIN display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, id_type INT NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) REFERENCES Shop_Msg_Error_Type(id_type), @@ -5246,7 +5246,7 @@ BEGIN SET v_has_filter_permutation_edit = NOT ISNULL(a_id_permutation_edit); SET v_has_filter_currency = NOT ISNULL(a_id_currency); SET v_has_filter_region = NOT ISNULL(a_id_region_purchase); - # SET v_quantity_new = CASE WHEN a_sum_not_edit THEN quantity + a_quantity_product_edit ELSE a_quantity_product_edit END; + -- SET v_quantity_new = CASE WHEN a_sum_not_edit THEN quantity + a_quantity_product_edit ELSE a_quantity_product_edit END; /* SELECT v_has_filter_user, v_has_filter_basket ; @@ -5468,7 +5468,7 @@ BEGIN -- String product id, permutation id, quantity list IF NOT EXISTS (SELECT * FROM tmp_Shop_Basket WHERE active LIMIT 1) AND NOT EXISTS (SELECT msg FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN -- NOT v_has_filter_user AND - # Get product ids + -- Get product ids CALL p_split(a_ids_permutation_basket, ','); INSERT INTO tmp_Shop_Product ( id_product, id_permutation, display_order @@ -5486,7 +5486,7 @@ BEGIN */ DROP TABLE Split_Temp; - # Get product quantities + -- Get product quantities CALL p_split(a_quantities_permutation_basket, ','); INSERT INTO tmp_Shop_Quantity ( quantity, display_order @@ -5501,7 +5501,7 @@ BEGIN */ DROP TABLE Split_Temp; - # Compare number of product ids to number of quantities + -- Compare number of product ids to number of quantities SET v_n_id_permutation_basket := (SELECT display_order FROM tmp_Shop_Product ORDER BY display_order DESC LIMIT 1); SET v_n_quantity_permutation_basket := (SELECT display_order FROM tmp_Shop_Quantity ORDER BY display_order DESC LIMIT 1); IF NOT v_n_id_permutation_basket = v_n_quantity_permutation_basket THEN @@ -5581,7 +5581,7 @@ BEGIN */ - # Edit basket product + -- Edit basket product IF v_has_filter_permutation_edit AND NOT EXISTS (SELECT msg FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN IF EXISTS ( SELECT * @@ -5752,44 +5752,44 @@ BEGIN */ -- Returns CALL p_shop_get_many_product ( - a_id_user, # a_id_user - 1, # a_get_all_categories - '', # a_ids_category - 0, # a_get_inactive_categories - 0, # a_get_all_products + a_id_user, -- a_id_user + 1, -- a_get_all_categories + '', -- a_ids_category + 0, -- a_get_inactive_categories + 0, -- a_get_all_products ( SELECT GROUP_CONCAT(t_B.id_product SEPARATOR ',') FROM tmp_Shop_Basket t_B WHERE active = 1 - ), # a_ids_product - 0, # a_get_inactive_products - 0, # a_get_first_product_only - 0, # a_get_all_product_permutations + ), -- a_ids_product + 0, -- a_get_inactive_products + 0, -- a_get_first_product_only + 0, -- a_get_all_product_permutations ( SELECT GROUP_CONCAT(t_B.id_permutation SEPARATOR ',') FROM tmp_Shop_Basket t_B WHERE NOT ISNULL(t_B.id_permutation) AND active = 1 - ), # a_ids_permutation - 0, # a_get_inactive_permutations - 0, # a_get_all_images - '', # a_ids_image - 0, # a_get_inactive_images - 1, # a_get_first_image_only - 0, # a_get_all_delivery_region - a_id_region_purchase, # a_ids_delivery_region - 0, # a_get_inactive_delivery_region - 0, # a_get_all_currency - a_id_currency, # a_ids_currency - 0, # a_get_inactive_currency - 1, # a_get_all_discount - '', # a_ids_discount - 0 # a_get_inactive_discount + ), -- a_ids_permutation + 0, -- a_get_inactive_permutations + 0, -- a_get_all_images + '', -- a_ids_image + 0, -- a_get_inactive_images + 1, -- a_get_first_image_only + 0, -- a_get_all_delivery_region + a_id_region_purchase, -- a_ids_delivery_region + 0, -- a_get_inactive_delivery_region + 0, -- a_get_all_currency + a_id_currency, -- a_ids_currency + 0, -- a_get_inactive_currency + 1, -- a_get_all_discount + '', -- a_ids_discount + 0 -- a_get_inactive_discount ); - # Basket + -- Basket SELECT t_UB.id_category, t_UB.id_product, t_UB.id_permutation, @@ -5813,7 +5813,7 @@ BEGIN ORDER BY C.display_order, P.display_order ; - # Errors + -- Errors /* Completed by product get many */ SELECT t_ME.display_order, @@ -5830,7 +5830,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_categories, @@ -5852,7 +5852,7 @@ BEGIN ; END IF; - # DROP TABLE IF EXISTS tmp_Msg_Error; + -- DROP TABLE IF EXISTS tmp_Msg_Error; DELETE FROM tmp_Msg_Error WHERE guid = v_guid; IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN DROP TABLE tmp_Msg_Error; @@ -5950,7 +5950,7 @@ BEGIN DECLARE v_has_filter_currency BIT; DECLARE v_has_filter_discount BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_product INT; DECLARE v_ids_product_permission VARCHAR(4000); @@ -6103,7 +6103,7 @@ BEGIN display_order_category INT NOT NULL, display_order_product INT NOT NULL, display_order_permutation INT NULL, - rank_permutation INT NOT NULL, # _in_category + rank_permutation INT NOT NULL, -- _in_category name VARCHAR(255) NOT NULL, description VARCHAR(4000) NOT NULL, /* @@ -6182,11 +6182,11 @@ BEGIN display_order INT NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) @@ -6246,7 +6246,7 @@ BEGIN C.display_order AS display_order_category, P.display_order AS display_order_product, PP.display_order AS display_order_permutation, - RANK() OVER (ORDER BY C.display_order, P.display_order, PP.display_order) AS rank_permutation, #PARTITION BY P.id_category # _in_category + RANK() OVER (ORDER BY C.display_order, P.display_order, PP.display_order) AS rank_permutation, --PARTITION BY P.id_category -- _in_category P.name, PP.description, /* @@ -6270,7 +6270,7 @@ BEGIN INNER JOIN Shop_Product_Category C ON P.id_category = C.id_category WHERE - # permutations + -- permutations ( ( a_get_all_product_permutation @@ -6278,7 +6278,7 @@ BEGIN ) AND (a_get_inactive_permutation OR PP.active) ) - # categories + -- categories AND ( ( a_get_all_category @@ -6286,7 +6286,7 @@ BEGIN ) AND (a_get_inactive_category OR C.active) ) - # products + -- products AND ( ( a_get_all_product @@ -6320,16 +6320,16 @@ BEGIN /* INSERT INTO tmp_Shop_Variation ( - id_variation, id_product # , display_order + id_variation, id_product -- , display_order ) - SELECT P.id_variation, P.id_product # , P.display_order + SELECT P.id_variation, P.id_product -- , P.display_order FROM Shop_Variation V INNER JOIN tmp_Shop_Product t_P ON V.id_product = t_P.id_product WHERE V.active; */ - # Product Images + -- Product Images INSERT INTO tmp_Shop_Image ( id_product, id_permutation, @@ -6386,7 +6386,7 @@ BEGIN END IF; */ - # Delivery Regions + -- Delivery Regions INSERT INTO tmp_Delivery_Region ( id_region, active, @@ -6511,7 +6511,7 @@ BEGIN -- select * from tmp_Shop_Product; - # Currencies + -- Currencies IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN INSERT INTO tmp_Currency ( id_currency, @@ -6599,7 +6599,7 @@ BEGIN END IF; END IF; - # Discounts + -- Discounts IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN INSERT INTO tmp_Discount ( id_discount, @@ -6625,12 +6625,12 @@ BEGIN ) ; END IF; - # select 'pre-permission results'; - # select * from tmp_Shop_Product; + -- select 'pre-permission results'; + -- select * from tmp_Shop_Product; -- Permissions IF EXISTS (SELECT * FROM tmp_Shop_Product_Category LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_product := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); -- SET v_ids_product_permission := (SELECT GROUP_CONCAT(id_product SEPARATOR ',') FROM tmp_Shop_Product); SET v_ids_permutation_permission := (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') FROM tmp_Shop_Product WHERE NOT ISNULL(id_permutation)); @@ -6652,7 +6652,7 @@ BEGIN DELETE FROM tmp_Shop_Product t_P WHERE - FIND_IN_SET(t_P.id_permutation, (SELECT GROUP_CONCAT(UET.id_permutation SEPARATOR ',') FROM Shop_User_Eval_Temp UET)) = 0 # id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_User_Eval_Temp), '%'); + FIND_IN_SET(t_P.id_permutation, (SELECT GROUP_CONCAT(UET.id_permutation SEPARATOR ',') FROM Shop_User_Eval_Temp UET)) = 0 -- id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_User_Eval_Temp), '%'); OR ( ISNULL(t_P.can_view) AND ( @@ -6670,8 +6670,8 @@ BEGIN ) ; - # CALL p_shop_user_eval_clear_temp(v_guid); - # DROP TABLE IF EXISTS Shop_User_Eval_Temp; + -- CALL p_shop_user_eval_clear_temp(v_guid); + -- DROP TABLE IF EXISTS Shop_User_Eval_Temp; DELETE FROM Shop_User_Eval_Temp WHERE GUID = v_guid ; @@ -6683,7 +6683,7 @@ BEGIN -- Returns SET v_now := NOW(); - # Categories + -- Categories SELECT DISTINCT t_C.id_category, C.name, @@ -6697,7 +6697,7 @@ BEGIN ORDER BY C.display_order ; - # Products + -- Products SELECT t_P.id_product, t_P.id_permutation, @@ -6729,7 +6729,7 @@ BEGIN ORDER BY t_P.rank_permutation ; - # Variations + -- Variations SELECT V.id_variation, t_P.id_product, @@ -6750,7 +6750,7 @@ BEGIN ; /* - # Permutation variations output + -- Permutation variations output SELECT t_P.id_permutation, t_P.id_product, t_P.id_category, @@ -6769,7 +6769,7 @@ BEGIN select * from tmp_shop_product; */ - # Product Price + -- Product Price SELECT PCRL.id_link AS id_price, t_P.id_permutation, @@ -6802,7 +6802,7 @@ BEGIN ; /* - # Currency + -- Currency SELECT DISTINCT C.id_currency, C.code, @@ -6816,7 +6816,7 @@ BEGIN ; */ - # Images + -- Images SELECT t_I.id_image, t_I.id_product, @@ -6834,7 +6834,7 @@ BEGIN ORDER BY t_P.rank_permutation, I.display_order ; - # Delivery options + -- Delivery options SELECT _DO.id_option, PDOL.id_product, @@ -6870,7 +6870,7 @@ BEGIN ORDER BY t_P.rank_permutation, PDOL.display_order ; - # Discounts + -- Discounts SELECT D.id_discount, P.id_category, @@ -6909,7 +6909,7 @@ BEGIN ; /* - # Delivery Regions + -- Delivery Regions SELECT t_DR.id_region, t_P.id_category, @@ -6933,7 +6933,7 @@ BEGIN ; */ - # Errors + -- Errors SELECT t_ME.display_order, t_ME.guid, @@ -6949,7 +6949,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_category, @@ -6964,8 +6964,8 @@ BEGIN ; */ - # select 'other outputs'; - # select * from tmp_Shop_Product; + -- select 'other outputs'; + -- select * from tmp_Shop_Product; -- Clean up DROP TABLE IF EXISTS tmp_Discount; @@ -7081,11 +7081,11 @@ BEGIN active BIT NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), /* id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type @@ -7155,17 +7155,17 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # SELECT * FROM tmp_Msg_Error LIMIT 1; + -- SELECT * FROM tmp_Msg_Error LIMIT 1; CALL p_shop_user_eval ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), # a_ids_access_level - (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link), # (SELECT DISTINCT id_product FROM tmp_Shop_Product_Currency_Link) calc_PCL) # a_ids_product - (SELECT GROUP_CONCAT(DISTINCT id_permutation SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link) # a_ids_permutation + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), -- a_ids_access_level + (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link), -- (SELECT DISTINCT id_product FROM tmp_Shop_Product_Currency_Link) calc_PCL) -- a_ids_product + (SELECT GROUP_CONCAT(DISTINCT id_permutation SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link) -- a_ids_permutation ); - # SELECT * FROM tmp_Msg_Error LIMIT 1; + -- SELECT * FROM tmp_Msg_Error LIMIT 1; IF EXISTS (SELECT can_admin FROM Shop_User_Eval_Temp WHERE guid = v_guid AND NOT can_admin LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( @@ -7221,7 +7221,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -7229,7 +7229,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user ; @@ -7304,11 +7304,11 @@ BEGIN description VARCHAR(4000) NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), /* id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type @@ -7429,13 +7429,13 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN CALL p_shop_user_eval ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), # a_ids_access_level - (SELECT GROUP_CONCAT(id_product SEPARATOR ',') From tmp_Shop_Product), # a_ids_product - (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') From tmp_Shop_Product) # a_ids_permutation -- WHERE NOT ISNULL(id_permutation) + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), -- a_ids_access_level + (SELECT GROUP_CONCAT(id_product SEPARATOR ',') From tmp_Shop_Product), -- a_ids_product + (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') From tmp_Shop_Product) -- a_ids_permutation -- WHERE NOT ISNULL(id_permutation) ); IF EXISTS (SELECT can_admin FROM Shop_User_Eval_Temp WHERE guid = v_guid AND NOT can_admin) THEN @@ -7498,7 +7498,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -7506,7 +7506,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user ; @@ -7596,9 +7596,9 @@ BEGIN CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, - # id_type INT NOT NULL, - # CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) - # REFERENCES Shop_Msg_Error_Type (id_type), + -- id_type INT NOT NULL, + -- CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) + -- REFERENCES Shop_Msg_Error_Type (id_type), code VARCHAR(50), msg VARCHAR(4000) NOT NULL ); @@ -7646,13 +7646,13 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN CALL p_shop_user_eval ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_USER' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' AND active), # a_ids_access_level - '', # a_ids_product - '' # a_ids_permutation + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_USER' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' AND active), -- a_ids_access_level + '', -- a_ids_product + '' -- a_ids_permutation ); IF NOT (SELECT can_edit FROM Shop_User_Eval_Temp WHERE guid = v_guid) THEN @@ -7676,8 +7676,8 @@ BEGIN -- Invalid Orders IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # Invalid Order IDs - IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_order AND FIND_IN_SET(id_order, a_ids_order) > 0) THEN # id_order LIKE CONCAT('%', a_ids_order, '%') LIMIT 1) THEN + -- Invalid Order IDs + IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_order AND FIND_IN_SET(id_order, a_ids_order) > 0) THEN -- id_order LIKE CONCAT('%', a_ids_order, '%') LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( guid, code, @@ -7686,11 +7686,11 @@ BEGIN VALUES ( v_guid, v_code_error_data, - CONCAT('You do not have access to the following order IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND FIND_IN_SET(id_order, a_ids_order) > 0)) # id_order LIKE CONCAT('%', a_ids_order, '%'))) # AND v_has_filter_order # filtered by parent condition + CONCAT('You do not have access to the following order IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND FIND_IN_SET(id_order, a_ids_order) > 0)) -- id_order LIKE CONCAT('%', a_ids_order, '%'))) -- AND v_has_filter_order -- filtered by parent condition ) ; END IF; - # Invalid Checkout Session IDs + -- Invalid Checkout Session IDs IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_session AND id_checkout_session = a_id_checkout_session) THEN INSERT INTO tmp_Msg_Error ( guid, @@ -7700,7 +7700,7 @@ BEGIN VALUES ( v_guid, v_code_error_data, - CONCAT('You do not have access to the following checkout session IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND id_checkout_session = a_id_checkout_session)) # AND v_has_filter_order # filtered by parent condition + CONCAT('You do not have access to the following checkout session IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND id_checkout_session = a_id_checkout_session)) -- AND v_has_filter_order -- filtered by parent condition ) ; END IF; @@ -7719,7 +7719,7 @@ BEGIN INNER JOIN tmp_Shop_User t_U ON UO.id_user = t_U.id_user AND t_U.active - WHERE ((NOT v_has_filter_order OR FIND_IN_SET(UO.id_order, a_ids_order) > 0) # UO.id_order LIKE CONCAT('%', a_ids_order, '%')) + WHERE ((NOT v_has_filter_order OR FIND_IN_SET(UO.id_order, a_ids_order) > 0) -- UO.id_order LIKE CONCAT('%', a_ids_order, '%')) OR (NOT v_has_filter_session OR UO.id_checkout_session = a_id_checkout_session)) AND UO.active ; @@ -7747,7 +7747,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -7755,7 +7755,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user, a_ids_order, @@ -7801,7 +7801,7 @@ BEGIN DECLARE v_id_permission INT; -- DECLARE v_ids_product VARCHAR(500); DECLARE v_id_access_level_view INT; - # DECLARE v_id_access_level_product_required INT; + -- DECLARE v_id_access_level_product_required INT; DECLARE v_priority_access_level_view INT; DECLARE v_priority_access_level_edit INT; DECLARE v_priority_access_level_admin INT; @@ -7819,10 +7819,10 @@ BEGIN SET v_code_error_permission := (SELECT code FROM Shop_Msg_Error_Type WHERE id_type = 2); -- Clear previous proc results - # DROP TABLE IF EXISTS tmp_User_Role_Link; - # DROP TEMPORARY TABLE IF EXISTS tmp_User_Role_Link; + -- DROP TABLE IF EXISTS tmp_User_Role_Link; + -- DROP TEMPORARY TABLE IF EXISTS tmp_User_Role_Link; DROP TABLE IF EXISTS tmp_Shop_Product_p_Shop_User_Eval; - # DROP TABLE IF EXISTS Shop_User_Eval_Temp; + -- DROP TABLE IF EXISTS Shop_User_Eval_Temp; -- Parse arguments + get default values @@ -7927,7 +7927,7 @@ BEGIN msg VARCHAR(4000) NOT NULL ); - # select * from Shop_Msg_Error_Type; + -- select * from Shop_Msg_Error_Type; -- Parse filters IF a_guid IS NULL OR EXISTS (SELECT * FROM Shop_User_Eval_Temp WHERE a_guid = guid) THEN @@ -7976,7 +7976,7 @@ BEGIN ); DROP TABLE Split_Temp; IF 0 = v_id_access_level OR v_id_access_level <=> NULL THEN - # SET v_has_filter_access_level = 0; + -- SET v_has_filter_access_level = 0; INSERT INTO tmp_Msg_Error ( guid, code, @@ -8017,7 +8017,7 @@ BEGIN ON PP.id_access_level_required = AL.id_access_level AND AL.active WHERE FIND_IN_SET(PP.id_permutation, a_ids_permutation) > 0 - # AND P.active # not worried as we want users to be able to see their order history + -- AND P.active -- not worried as we want users to be able to see their order history ; /* DELETE FROM tmp_Shop_Product_p_Shop_User_Eval @@ -8028,7 +8028,7 @@ BEGIN END IF; IF v_has_filter_permission THEN - # Invalid permission IDs + -- Invalid permission IDs IF EXISTS (SELECT id_permission FROM Shop_Permission WHERE FIND_IN_SET(id_permission, a_ids_permission) > 0 AND NOT active) THEN INSERT INTO tmp_Msg_Error ( guid, @@ -8127,7 +8127,7 @@ BEGIN guid, id_user, id_permission_required, - # id_access_level_required, + -- id_access_level_required, priority_access_level_required, priority_access_level_user, is_super_user @@ -8168,9 +8168,9 @@ BEGIN WHERE U.id_user = a_id_user AND (a_get_inactive_users OR U.active) AND FIND_IN_SET(P.id_permission, a_ids_permission) > 0 - # AND v_id_permission = P.id_permission - # AND v_id_access_level = AL.id_access_leveld - GROUP BY U.id_user, P.id_permission # , is_super_user + -- AND v_id_permission = P.id_permission + -- AND v_id_access_level = AL.id_access_leveld + GROUP BY U.id_user, P.id_permission -- , is_super_user ; */ @@ -8196,7 +8196,7 @@ BEGIN WHERE UE_T.guid = a_guid AND UE_T.id_user = a_id_user AND RPL.id_permission = UE_T.id_permission_required - # GROUP BY UE_T.id_user + -- GROUP BY UE_T.id_user ; ELSE UPDATE Shop_User_Eval_Temp UE_T @@ -8207,15 +8207,15 @@ BEGIN UE_T.can_admin = 0 WHERE UE_T.guid = a_guid AND UE_T.id_user = a_id_user - # GROUP BY UE_T.id_user + -- GROUP BY UE_T.id_user ; END IF; END IF; -- Clean up DROP TABLE IF EXISTS tmp_Shop_Product_p_Shop_User_Eval; - # DROP TEMPORARY TABLE IF EXISTS tmp_User_Role_Link; - # DROP TABLE IF EXISTS tmp_Msg_Error; + -- DROP TEMPORARY TABLE IF EXISTS tmp_User_Role_Link; + -- DROP TABLE IF EXISTS tmp_Msg_Error; END ;; DELIMITER ;; /*!50003 SET sql_mode = @saved_sql_mode */ ; diff --git a/static/MySQL/deprecated/dump2.sql b/static/MySQL/deprecated/dump2.sql index 06ae32be..c3b3c18d 100644 --- a/static/MySQL/deprecated/dump2.sql +++ b/static/MySQL/deprecated/dump2.sql @@ -80,15 +80,15 @@ DELIMITER ;;; value_prev, value_new ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name WHERE NOT OLD.name <=> NEW.name UNION - # Changed extension + -- Changed extension SELECT NEW.id_type, 'extension', CONVERT(OLD.extension, CHAR), CONVERT(NEW.extension, CHAR) WHERE NOT OLD.extension <=> NEW.extension ; @@ -243,23 +243,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_access_level, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT (OLD.code <=> NEW.code) UNION - # Changed name + -- Changed name SELECT NEW.id_access_level, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION - # Changed priority + -- Changed priority SELECT NEW.id_access_level, 'priority', CONVERT(OLD.priority, CHAR), CONVERT(NEW.priority, CHAR), NEW.id_change_set WHERE NOT (OLD.priority <=> NEW.priority) UNION - # Changed active + -- Changed active SELECT NEW.id_access_level, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_access_level, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -384,39 +384,39 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed region + -- Changed region SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed name_full + -- Changed name_full SELECT NEW.id_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set WHERE NOT OLD.name_full <=> NEW.name_full UNION - # Changed phone_number + -- Changed phone_number SELECT NEW.id_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION - # Changed postcode + -- Changed postcode SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION - # Changed address_line_1 + -- Changed address_line_1 SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION - # Changed address_line_2 + -- Changed address_line_2 SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION - # Changed city + -- Changed city SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION - # Changed county + -- Changed county SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION - # Changed active + -- Changed active SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -530,23 +530,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_category, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_category, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed description + -- Changed description SELECT NEW.id_category, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed active + -- Changed active SELECT NEW.id_category, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_category, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -665,27 +665,27 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_currency, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_currency, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed symbol + -- Changed symbol SELECT NEW.id_currency, 'symbol', OLD.symbol, NEW.symbol, NEW.id_change_set WHERE NOT OLD.symbol <=> NEW.symbol UNION - # Changed ratio_2_GBP + -- Changed ratio_2_GBP SELECT NEW.id_currency, 'factor_from_GBP', OLD.factor_from_GBP, NEW.factor_from_GBP, NEW.id_change_set WHERE NOT OLD.factor_from_GBP <=> NEW.factor_from_GBP UNION - # Changed active + -- Changed active SELECT NEW.id_currency, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_currency, 'display_order', CONVERT(display_order, CHAR), CONVERT(display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -803,35 +803,35 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_option, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_option, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed latency_delivery_min + -- Changed latency_delivery_min SELECT NEW.id_option, 'latency_delivery_min', CONVERT(OLD.latency_delivery_min, CHAR), CONVERT(NEW.latency_delivery_min, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_min <=> NEW.latency_delivery_min UNION - # Changed latency_delivery_max + -- Changed latency_delivery_max SELECT NEW.id_option, 'latency_delivery_max', CONVERT(OLD.latency_delivery_max, CHAR), CONVERT(NEW.latency_delivery_max, CHAR), NEW.id_change_set WHERE NOT OLD.latency_delivery_max <=> NEW.latency_delivery_max UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_option, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_option, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed active + -- Changed active SELECT NEW.id_option, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_option, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -958,47 +958,47 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_discount, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_discount, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed multiplier + -- Changed multiplier SELECT NEW.id_discount, 'multiplier', OLD.multiplier, NEW.multiplier, NEW.id_change_set WHERE NOT OLD.multiplier <=> NEW.multiplier UNION - # Changed subtractor + -- Changed subtractor SELECT NEW.id_discount, 'subtractor', OLD.subtractor, NEW.subtractor, NEW.id_change_set WHERE NOT OLD.subtractor <=> NEW.subtractor UNION - # Changed apply_multiplier_first + -- Changed apply_multiplier_first SELECT NEW.id_discount, 'apply_multiplier_first', CONVERT(CONVERT(OLD.apply_multiplier_first, SIGNED), CHAR), CONVERT(CONVERT(NEW.apply_multiplier_first, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.apply_multiplier_first <=> NEW.apply_multiplier_first UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_discount, 'quantity_min', OLD.quantity_min, NEW.quantity_min, NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_discount, 'quantity_max', OLD.quantity_max, NEW.quantity_max, NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed date_start + -- Changed date_start SELECT NEW.id_discount, 'date_start', OLD.date_start, NEW.date_start, NEW.id_change_set WHERE NOT OLD.date_start <=> NEW.date_start UNION - # Changed date_end + -- Changed date_end SELECT NEW.id_discount, 'date_end', OLD.date_end, NEW.date_end, NEW.id_change_set WHERE NOT OLD.date_end <=> NEW.date_end UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_discount, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_discount, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -1122,16 +1122,16 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_discount + -- Changed id_discount SELECT NEW.id_link, 'id_discount', CONVERT(OLD.id_discount, CHAR), CONVERT(NEW.id_discount, CHAR), NEW.id_change_set WHERE NOT OLD.id_discount <=> NEW.id_discount UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -1241,7 +1241,7 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed quantity max + -- Changed quantity max SELECT NEW.id_general, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; @@ -1369,31 +1369,31 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed id_type_image + -- Changed id_type_image SELECT NEW.id_image, 'id_type_image', CONVERT(OLD.id_type_image, CHAR), CONVERT(NEW.id_type_image, CHAR), NEW.id_change_set WHERE NOT OLD.id_type_image <=> NEW.id_type_image UNION - # Changed id_type_file + -- Changed id_type_file SELECT NEW.id_image, 'id_type_file', CONVERT(OLD.id_type_file, CHAR), CONVERT(NEW.id_type_file, CHAR), NEW.id_change_set WHERE NOT OLD.id_type_file <=> NEW.id_type_file UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_image, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_image, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed url + -- Changed url SELECT NEW.id_image, 'url', OLD.url, NEW.url, NEW.id_change_set WHERE NOT OLD.url <=> NEW.url UNION - # Changed active + -- Changed active SELECT NEW.id_image, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_image, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -1507,23 +1507,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -1672,27 +1672,27 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_permission, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_permission, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed id_permission_group + -- Changed id_permission_group SELECT NEW.id_permission, 'id_permission_group', CONVERT(OLD.id_permission_group, CHAR), CONVERT(NEW.id_permission_group, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission_group <=> NEW.id_permission_group UNION - # Changed Id_access_level_required + -- Changed Id_access_level_required SELECT NEW.id_permission, 'Id_access_level_required', CONVERT(OLD.Id_access_level_required, CHAR), CONVERT(NEW.Id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.Id_access_level_required <=> NEW.Id_access_level_required UNION - # Changed active + -- Changed active SELECT NEW.id_permission, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_permission, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -1809,19 +1809,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_group, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_group, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_group, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_group, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -1982,89 +1982,89 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed name + -- Changed name SELECT NEW.id_product, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name /* UNION - # Changed description + -- Changed description SELECT NEW.id_product, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT OLD.description <=> NEW.description UNION - # Changed price_GBP_full + -- Changed price_GBP_full SELECT NEW.id_product, 'price_GBP_full', CONVERT(OLD.price_GBP_full, CHAR), CONVERT(NEW.price_GBP_full, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP_full <=> NEW.price_GBP_full UNION - # Changed price_GBP_min + -- Changed price_GBP_min SELECT NEW.id_product, 'price_GBP_min', CONVERT(OLD.price_GBP_min, CHAR), CONVERT(NEW.price_GBP_min, CHAR), NEW.id_change_set WHERE NOT OLD.price_GBP_min <=> NEW.price_GBP_min UNION - # Changed has_variations + -- Changed has_variations SELECT NEW.id_product, 'has_variations', CONVERT(CONVERT(NEW.has_variations, SIGNED), CHAR), CONVERT(CONVERT(NEW.has_variations, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.has_variations <=> NEW.has_variations UNION /* - # Changed discount + -- Changed discount SELECT NEW.id_product, 'discount', CONVERT(OLD.discount, CHAR), CONVERT(NEW.discount, CHAR), NEW.id_change_set WHERE NOT OLD.discount <=> NEW.discount */ UNION - # Changed id_category + -- Changed id_category SELECT NEW.id_product, 'id_category', CONVERT(OLD.id_category, CHAR), CONVERT(NEW.id_category, CHAR), NEW.id_change_set WHERE NOT OLD.id_category <=> NEW.id_category /* UNION - # Changed latency_manuf + -- Changed latency_manuf SELECT NEW.id_product, 'latency_manuf', CONVERT(OLD.latency_manuf, CHAR), CONVERT(NEW.latency_manuf, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manuf <=> NEW.latency_manuf UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_product, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_product, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_step + -- Changed quantity_step SELECT NEW.id_product, 'quantity_step', CONVERT(OLD.quantity_step, CHAR), CONVERT(NEW.quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_step <=> NEW.quantity_step UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_product, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_product, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_product, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_product, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_access_level_required + -- Changed id_access_level_required SELECT NEW.id_product, 'id_access_level_required', CONVERT(OLD.id_access_level_required, CHAR), CONVERT(NEW.id_access_level_required, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_product, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT OLD.id_stripe_product <=> NEW.id_stripe_product /* UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_product, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price */ UNION - # Changed active + -- Changed active SELECT NEW.id_product, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_product, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -2260,32 +2260,32 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_link, 'id_currency', CONVERT(OLD.id_currency, CHAR), CONVERT(NEW.id_currency, CHAR), NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', OLD.price_local, NEW.price_local, NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local UNION */ - # Changed price_local_VAT_incl + -- Changed price_local_VAT_incl SELECT NEW.id_link, 'price_local_VAT_incl', OLD.price_local_VAT_incl, NEW.price_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_incl <=> NEW.price_local_VAT_incl UNION - # Changed price_local_VAT_excl + -- Changed price_local_VAT_excl SELECT NEW.id_link, 'price_local_VAT_excl', OLD.price_local_VAT_excl, NEW.price_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_excl <=> NEW.price_local_VAT_excl UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_link, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -2435,32 +2435,32 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_currency + -- Changed id_currency SELECT NEW.id_link, 'id_currency', CONVERT(OLD.id_currency, CHAR), CONVERT(NEW.id_currency, CHAR), NEW.id_change_set WHERE NOT OLD.id_currency <=> NEW.id_currency UNION - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', OLD.price_local, NEW.price_local, NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local UNION */ - # Changed price_local_VAT_incl + -- Changed price_local_VAT_incl SELECT NEW.id_link, 'price_local_VAT_incl', OLD.price_local_VAT_incl, NEW.price_local_VAT_incl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_incl <=> NEW.price_local_VAT_incl UNION - # Changed price_local_VAT_excl + -- Changed price_local_VAT_excl SELECT NEW.id_link, 'price_local_VAT_excl', OLD.price_local_VAT_excl, NEW.price_local_VAT_excl, NEW.id_change_set WHERE NOT OLD.price_local_VAT_excl <=> NEW.price_local_VAT_excl UNION - # Changed id_stripe_price + -- Changed id_stripe_price SELECT NEW.id_link, 'id_stripe_price', OLD.id_stripe_price, NEW.id_stripe_price, NEW.id_change_set WHERE NOT OLD.id_stripe_price <=> NEW.id_stripe_price UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -2592,32 +2592,32 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_permutation + -- Changed id_permutation SELECT NEW.id_link, 'id_permutation', CONVERT(OLD.id_permutation, CHAR), CONVERT(NEW.id_permutation, CHAR), NEW.id_change_set WHERE NOT OLD.id_permutation <=> NEW.id_permutation UNION - # Changed id_option + -- Changed id_option SELECT NEW.id_link, 'id_option', CONVERT(OLD.id_option, CHAR), CONVERT(NEW.id_option, CHAR), NEW.id_change_set WHERE NOT OLD.id_option <=> NEW.id_option UNION - # Changed id_region + -- Changed id_region SELECT NEW.id_link, 'id_region', CONVERT(OLD.id_region, CHAR), CONVERT(NEW.id_region, CHAR), NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION */ - # Changed price_local + -- Changed price_local SELECT NEW.id_link, 'price_local', CONVERT(OLD.price_local, CHAR), CONVERT(NEW.price_local, CHAR), NEW.id_change_set WHERE NOT OLD.price_local <=> NEW.price_local UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -2755,86 +2755,86 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_permutation, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_permutation, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION - # Changed name + -- Changed name SELECT NEW.id_permutation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION */ - # Changed description + -- Changed description SELECT NEW.id_permutation, 'description', OLD.description, NEW.description, NEW.id_change_set WHERE NOT (OLD.description <=> NEW.description) UNION - # Changed cost_local_manufacturing + -- Changed cost_local_manufacturing SELECT NEW.id_permutation, 'cost_local_manufacturing', CONVERT(OLD.cost_local_manufacturing, CHAR), CONVERT(NEW.cost_local_manufacturing, CHAR), NEW.id_change_set WHERE NOT (OLD.cost_local_manufacturing <=> NEW.cost_local_manufacturing) UNION - # Changed id_currency_cost_manufacturing + -- Changed id_currency_cost_manufacturing SELECT NEW.id_permutation, 'id_currency_cost_manufacturing', CONVERT(OLD.id_currency_cost_manufacturing, CHAR), CONVERT(NEW.id_currency_cost_manufacturing, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_cost_manufacturing <=> NEW.id_currency_cost_manufacturing) UNION - # Changed profit_local_min + -- Changed profit_local_min SELECT NEW.id_permutation, 'profit_local_min', CONVERT(OLD.profit_local_min, CHAR), CONVERT(NEW.profit_local_min, CHAR), NEW.id_change_set WHERE NOT (OLD.profit_local_min <=> NEW.profit_local_min) UNION - # Changed id_currency_profit_min + -- Changed id_currency_profit_min SELECT NEW.id_permutation, 'id_currency_profit_min', CONVERT(OLD.id_currency_profit_min, CHAR), CONVERT(NEW.id_currency_profit_min, CHAR), NEW.id_change_set WHERE NOT (OLD.id_currency_profit_min <=> NEW.id_currency_profit_min) UNION /* - # Changed price_GBP_min + -- Changed price_GBP_min SELECT NEW.id_permutation, 'price_GBP_min', CONVERT(OLD.price_GBP_min, CHAR), CONVERT(NEW.price_GBP_min, CHAR), NEW.id_change_set WHERE NOT (OLD.price_GBP_min <=> NEW.price_GBP_min) UNION */ - # Changed latency_manufacture + -- Changed latency_manufacture SELECT NEW.id_product, 'latency_manufacture', CONVERT(OLD.latency_manufacture, CHAR), CONVERT(NEW.latency_manufacture, CHAR), NEW.id_change_set WHERE NOT OLD.latency_manufacture <=> NEW.latency_manufacture UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_product, 'quantity_min', CONVERT(OLD.quantity_min, CHAR), CONVERT(NEW.quantity_min, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_product, 'quantity_max', CONVERT(OLD.quantity_max, CHAR), CONVERT(NEW.quantity_max, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed quantity_step + -- Changed quantity_step SELECT NEW.id_product, 'quantity_step', CONVERT(OLD.quantity_step, CHAR), CONVERT(NEW.quantity_step, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_step <=> NEW.quantity_step UNION - # Changed quantity_stock + -- Changed quantity_stock SELECT NEW.id_product, 'quantity_stock', CONVERT(OLD.quantity_stock, CHAR), CONVERT(NEW.quantity_stock, CHAR), NEW.id_change_set WHERE NOT OLD.quantity_stock <=> NEW.quantity_stock UNION - # Changed is_subscription + -- Changed is_subscription SELECT NEW.id_product, 'is_subscription', CONVERT(CONVERT(OLD.is_subscription, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_subscription, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.is_subscription <=> NEW.is_subscription UNION - # Changed id_unit_measurement_interval_recurrence + -- Changed id_unit_measurement_interval_recurrence SELECT NEW.id_product, 'id_unit_measurement_interval_recurrence', CONVERT(OLD.id_unit_measurement_interval_recurrence, CHAR), CONVERT(NEW.id_unit_measurement_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.id_unit_measurement_interval_recurrence <=> NEW.id_unit_measurement_interval_recurrence UNION - # Changed count_interval_recurrence + -- Changed count_interval_recurrence SELECT NEW.id_product, 'count_interval_recurrence', CONVERT(OLD.count_interval_recurrence, CHAR), CONVERT(NEW.count_interval_recurrence, CHAR), NEW.id_change_set WHERE NOT OLD.count_interval_recurrence <=> NEW.count_interval_recurrence UNION - # Changed id_stripe_product + -- Changed id_stripe_product SELECT NEW.id_permutation, 'id_stripe_product', OLD.id_stripe_product, NEW.id_stripe_product, NEW.id_change_set WHERE NOT (OLD.id_stripe_product <=> NEW.id_stripe_product) UNION - # Changed active + -- Changed active SELECT NEW.id_permutation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_permutation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -2956,20 +2956,20 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed id_variation + -- Changed id_variation SELECT NEW.id_link, 'id_variation', OLD.id_variation, NEW.id_variation, NEW.id_change_set WHERE NOT OLD.id_variation <=> NEW.id_variation UNION */ - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_link, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -3082,19 +3082,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_interval, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_interval, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_interval, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed name + -- Changed name SELECT NEW.id_interval, 'active', OLD.active, NEW.active, NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -3207,19 +3207,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_region, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_region, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_region, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_region, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -3336,16 +3336,16 @@ DELIMITER ;;; id_change_set ) /* - # Changed depth + -- Changed depth SELECT NEW.id_branch, 'depth', CONVERT(OLD.depth, CHAR), CONVERT(NEW.depth, CHAR), NEW.id_change_set WHERE NOT OLD.depth <=> NEW.depth UNION */ - # Changed active + -- Changed active SELECT NEW.id_branch, 'active', CONVERT(OLD.active, CHAR), CONVERT(NEW.active, CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_branch, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -3462,19 +3462,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_role, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_role, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_role, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_role, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order ; @@ -3598,20 +3598,20 @@ DELIMITER ;;; id_change_set ) /* - # Changed id_role + -- Changed id_role SELECT NEW.id_link, 'id_role', CONVERT(OLD.id_role, CHAR), CONVERT(NEW.id_role, CHAR), NEW.id_change_set WHERE NOT OLD.id_role <=> NEW.id_role UNION - # Changed id_permission + -- Changed id_permission SELECT NEW.id_link, 'id_permission', CONVERT(OLD.id_permission, CHAR), CONVERT(NEW.id_permission, CHAR), NEW.id_change_set WHERE NOT OLD.id_permission <=> NEW.id_permission UNION */ - # Changed id_access_level + -- Changed id_access_level SELECT NEW.id_link, 'id_access_level', CONVERT(OLD.id_access_level, CHAR), CONVERT(NEW.id_access_level, CHAR), NEW.id_change_set WHERE NOT OLD.id_access_level <=> NEW.id_access_level UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -3739,39 +3739,39 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_tax, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_tax, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed fixed_fee + -- Changed fixed_fee SELECT NEW.id_tax, 'fixed_fee', OLD.fixed_fee, NEW.fixed_fee, NEW.id_change_set WHERE NOT OLD.fixed_fee <=> NEW.fixed_fee UNION - # Changed multiplier + -- Changed multiplier SELECT NEW.id_tax, 'multiplier', OLD.multiplier, NEW.multiplier, NEW.id_change_set WHERE NOT OLD.multiplier <=> NEW.multiplier UNION - # Changed apply_fixed_fee_before_multiplier + -- Changed apply_fixed_fee_before_multiplier SELECT NEW.id_tax, 'apply_fixed_fee_before_multiplier', CONVERT(CONVERT(OLD.apply_fixed_fee_before_multiplier, SIGNED), CHAR), CONVERT(CONVERT(NEW.apply_fixed_fee_before_multiplier, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.apply_fixed_fee_before_multiplier <=> NEW.apply_fixed_fee_before_multiplier UNION - # Changed quantity_min + -- Changed quantity_min SELECT NEW.id_tax, 'quantity_min', OLD.quantity_min, NEW.quantity_min, NEW.id_change_set WHERE NOT OLD.quantity_min <=> NEW.quantity_min UNION - # Changed quantity_max + -- Changed quantity_max SELECT NEW.id_tax, 'quantity_max', OLD.quantity_max, NEW.quantity_max, NEW.id_change_set WHERE NOT OLD.quantity_max <=> NEW.quantity_max UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_tax, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT OLD.display_order <=> NEW.display_order UNION - # Changed active + -- Changed active SELECT NEW.id_tax, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT OLD.active <=> NEW.active ; @@ -3889,15 +3889,15 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed name + -- Changed name SELECT NEW.id_user, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT (OLD.name <=> NEW.name) UNION - # Changed is_super_user + -- Changed is_super_user SELECT NEW.id_user, 'is_super_user', CONVERT(CONVERT(OLD.is_super_user, SIGNED), CHAR), CONVERT(CONVERT(NEW.is_super_user, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.is_super_user <=> NEW.is_super_user) UNION - # Changed active + -- Changed active SELECT NEW.id_user, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -4021,19 +4021,19 @@ DELIMITER ;;; value_new, id_change_set_user ) - # Changed id_user + -- Changed id_user SELECT NEW.id_item, 'id_user', OLD.id_user, NEW.id_user, NEW.id_change_set_user WHERE NOT OLD.id_user <=> NEW.id_user UNION - # Changed id_product + -- Changed id_product SELECT NEW.id_item, 'id_product', OLD.id_product, NEW.id_product, NEW.id_change_set_user WHERE NOT OLD.id_product <=> NEW.id_product UNION - # Changed quantity + -- Changed quantity SELECT NEW.id_item, 'quantity', CONVERT(OLD.quantity, CHAR), CONVERT(NEW.quantity, CHAR), NEW.id_change_set_user WHERE NOT (OLD.quantity <=> NEW.quantity) UNION - # Changed active + -- Changed active SELECT NEW.id_item, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set_user WHERE NOT (OLD.active <=> NEW.active) ; @@ -4209,23 +4209,23 @@ DELIMITER ;;; value_new, id_change_set_user ) - # Changed id_user + -- Changed id_user SELECT NEW.id_order, 'id_user', OLD.id_user, NEW.id_user, NEW.id_change_set_user WHERE NOT OLD.id_user <=> NEW.id_user UNION - # Changed value_total + -- Changed value_total SELECT NEW.id_order, 'value_total', CONVERT(OLD.value_total, CHAR), CONVERT(NEW.value_total, CHAR), NEW.id_change_set_user WHERE NOT (OLD.value_total <=> NEW.value_total) UNION - # Changed id_order_status + -- Changed id_order_status SELECT NEW.id_order, 'id_order_status', CONVERT(OLD.id_order_status, CHAR), CONVERT(NEW.id_order_status, CHAR), NEW.id_change_set_user WHERE NOT (OLD.id_order_status <=> NEW.id_order_status) UNION - # Changed id_checkout_session + -- Changed id_checkout_session SELECT NEW.id_order, 'id_checkout_session', OLD.id_checkout_session, NEW.id_checkout_session, NEW.id_change_set_user WHERE NOT (OLD.id_checkout_session <=> NEW.id_checkout_session) UNION - # Changed active + -- Changed active SELECT NEW.id_order, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set_user WHERE NOT (OLD.active <=> NEW.active) ; @@ -4349,15 +4349,15 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed id_product + -- Changed id_product SELECT NEW.id_link, 'active', CONVERT(OLD.id_product, CHAR), CONVERT(NEW.id_product, CHAR), NEW.id_change_set WHERE NOT (OLD.id_product <=> NEW.id_product) UNION - # Changed quantity + -- Changed quantity SELECT NEW.id_link, 'quantity', CONVERT(OLD.quantity, CHAR), CONVERT(NEW.quantity, CHAR), NEW.id_change_set WHERE NOT (OLD.quantity <=> NEW.quantity) UNION - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -4471,23 +4471,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_Status, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_Status, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_Status, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_Status, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_Status, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4607,7 +4607,7 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed active + -- Changed active SELECT NEW.id_link, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; @@ -4723,19 +4723,19 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_variation, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_variation, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed active + -- Changed active SELECT NEW.id_variation, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_variation, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4849,23 +4849,23 @@ DELIMITER ;;; value_new, id_change_set ) - # Changed code + -- Changed code SELECT NEW.id_type, 'code', OLD.code, NEW.code, NEW.id_change_set WHERE NOT OLD.code <=> NEW.code UNION - # Changed name + -- Changed name SELECT NEW.id_type, 'name', OLD.name, NEW.name, NEW.id_change_set WHERE NOT OLD.name <=> NEW.name UNION - # Changed name_plural + -- Changed name_plural SELECT NEW.id_type, 'name_plural', OLD.name_plural, NEW.name_plural, NEW.id_change_set WHERE NOT OLD.name_plural <=> NEW.name_plural UNION - # Changed active + -- Changed active SELECT NEW.id_type, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) UNION - # Changed display_order + -- Changed display_order SELECT NEW.id_type, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set WHERE NOT (OLD.display_order <=> NEW.display_order) ; @@ -4999,8 +4999,8 @@ BEGIN CREATE TABLE tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, id_type INT NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) REFERENCES Shop_Msg_Error_Type(id_type), @@ -5074,18 +5074,18 @@ BEGIN -- Returns - # User + -- User SELECT * FROM tmp_Shop_User ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error ; /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user, a_name, a_email, @@ -5134,11 +5134,11 @@ BEGIN DECLARE v_n_quantity_permutation_basket INT; DECLARE v_row_number INT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_id_permission_product INT; DECLARE v_ids_permutation_permission VARCHAR(4000); DECLARE v_now DATETIME; - # DECLARE v_quantity_new INT; + -- DECLARE v_quantity_new INT; DECLARE v_change_set_used BIT; DECLARE v_id_change_set INT; @@ -5231,8 +5231,8 @@ BEGIN display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, id_type INT NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) REFERENCES Shop_Msg_Error_Type(id_type), @@ -5246,7 +5246,7 @@ BEGIN SET v_has_filter_permutation_edit = NOT ISNULL(a_id_permutation_edit); SET v_has_filter_currency = NOT ISNULL(a_id_currency); SET v_has_filter_region = NOT ISNULL(a_id_region_purchase); - # SET v_quantity_new = CASE WHEN a_sum_not_edit THEN quantity + a_quantity_product_edit ELSE a_quantity_product_edit END; + -- SET v_quantity_new = CASE WHEN a_sum_not_edit THEN quantity + a_quantity_product_edit ELSE a_quantity_product_edit END; /* SELECT v_has_filter_user, v_has_filter_basket ; @@ -5468,7 +5468,7 @@ BEGIN -- String product id, permutation id, quantity list IF NOT EXISTS (SELECT * FROM tmp_Shop_Basket WHERE active LIMIT 1) AND NOT EXISTS (SELECT msg FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN -- NOT v_has_filter_user AND - # Get product ids + -- Get product ids CALL p_split(a_ids_permutation_basket, ','); INSERT INTO tmp_Shop_Product ( id_product, id_permutation, display_order @@ -5486,7 +5486,7 @@ BEGIN */ DROP TABLE Split_Temp; - # Get product quantities + -- Get product quantities CALL p_split(a_quantities_permutation_basket, ','); INSERT INTO tmp_Shop_Quantity ( quantity, display_order @@ -5501,7 +5501,7 @@ BEGIN */ DROP TABLE Split_Temp; - # Compare number of product ids to number of quantities + -- Compare number of product ids to number of quantities SET v_n_id_permutation_basket := (SELECT display_order FROM tmp_Shop_Product ORDER BY display_order DESC LIMIT 1); SET v_n_quantity_permutation_basket := (SELECT display_order FROM tmp_Shop_Quantity ORDER BY display_order DESC LIMIT 1); IF NOT v_n_id_permutation_basket = v_n_quantity_permutation_basket THEN @@ -5581,7 +5581,7 @@ BEGIN */ - # Edit basket product + -- Edit basket product IF v_has_filter_permutation_edit AND NOT EXISTS (SELECT msg FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN IF EXISTS ( SELECT * @@ -5752,44 +5752,44 @@ BEGIN */ -- Returns CALL p_shop_get_many_product ( - a_id_user, # a_id_user - 1, # a_get_all_categories - '', # a_ids_category - 0, # a_get_inactive_categories - 0, # a_get_all_products + a_id_user, -- a_id_user + 1, -- a_get_all_categories + '', -- a_ids_category + 0, -- a_get_inactive_categories + 0, -- a_get_all_products ( SELECT GROUP_CONCAT(t_B.id_product SEPARATOR ',') FROM tmp_Shop_Basket t_B WHERE active = 1 - ), # a_ids_product - 0, # a_get_inactive_products - 0, # a_get_first_product_only - 0, # a_get_all_product_permutations + ), -- a_ids_product + 0, -- a_get_inactive_products + 0, -- a_get_first_product_only + 0, -- a_get_all_product_permutations ( SELECT GROUP_CONCAT(t_B.id_permutation SEPARATOR ',') FROM tmp_Shop_Basket t_B WHERE NOT ISNULL(t_B.id_permutation) AND active = 1 - ), # a_ids_permutation - 0, # a_get_inactive_permutations - 0, # a_get_all_images - '', # a_ids_image - 0, # a_get_inactive_images - 1, # a_get_first_image_only - 0, # a_get_all_delivery_region - a_id_region_purchase, # a_ids_delivery_region - 0, # a_get_inactive_delivery_region - 0, # a_get_all_currency - a_id_currency, # a_ids_currency - 0, # a_get_inactive_currency - 1, # a_get_all_discount - '', # a_ids_discount - 0 # a_get_inactive_discount + ), -- a_ids_permutation + 0, -- a_get_inactive_permutations + 0, -- a_get_all_images + '', -- a_ids_image + 0, -- a_get_inactive_images + 1, -- a_get_first_image_only + 0, -- a_get_all_delivery_region + a_id_region_purchase, -- a_ids_delivery_region + 0, -- a_get_inactive_delivery_region + 0, -- a_get_all_currency + a_id_currency, -- a_ids_currency + 0, -- a_get_inactive_currency + 1, -- a_get_all_discount + '', -- a_ids_discount + 0 -- a_get_inactive_discount ); - # Basket + -- Basket SELECT t_UB.id_category, t_UB.id_product, t_UB.id_permutation, @@ -5813,7 +5813,7 @@ BEGIN ORDER BY C.display_order, P.display_order ; - # Errors + -- Errors /* Completed by product get many */ SELECT t_ME.display_order, @@ -5830,7 +5830,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_categories, @@ -5852,7 +5852,7 @@ BEGIN ; END IF; - # DROP TABLE IF EXISTS tmp_Msg_Error; + -- DROP TABLE IF EXISTS tmp_Msg_Error; DELETE FROM tmp_Msg_Error WHERE guid = v_guid; IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN DROP TABLE tmp_Msg_Error; @@ -5950,7 +5950,7 @@ BEGIN DECLARE v_has_filter_currency BIT; DECLARE v_has_filter_discount BIT; DECLARE v_guid BINARY(36); - # DECLARE v_id_user VARCHAR(100); + -- DECLARE v_id_user VARCHAR(100); DECLARE v_ids_permutation_unavailable VARCHAR(4000); DECLARE v_id_permission_product INT; DECLARE v_ids_product_permission VARCHAR(4000); @@ -6103,7 +6103,7 @@ BEGIN display_order_category INT NOT NULL, display_order_product INT NOT NULL, display_order_permutation INT NULL, - rank_permutation INT NOT NULL, # _in_category + rank_permutation INT NOT NULL, -- _in_category name VARCHAR(255) NOT NULL, description VARCHAR(4000) NOT NULL, /* @@ -6182,11 +6182,11 @@ BEGIN display_order INT NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, - # code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- code VARCHAR(50) NOT NULL, + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) @@ -6246,7 +6246,7 @@ BEGIN C.display_order AS display_order_category, P.display_order AS display_order_product, PP.display_order AS display_order_permutation, - RANK() OVER (ORDER BY C.display_order, P.display_order, PP.display_order) AS rank_permutation, #PARTITION BY P.id_category # _in_category + RANK() OVER (ORDER BY C.display_order, P.display_order, PP.display_order) AS rank_permutation, --PARTITION BY P.id_category -- _in_category P.name, PP.description, /* @@ -6270,7 +6270,7 @@ BEGIN INNER JOIN Shop_Product_Category C ON P.id_category = C.id_category WHERE - # permutations + -- permutations ( ( a_get_all_product_permutation @@ -6278,7 +6278,7 @@ BEGIN ) AND (a_get_inactive_permutation OR PP.active) ) - # categories + -- categories AND ( ( a_get_all_category @@ -6286,7 +6286,7 @@ BEGIN ) AND (a_get_inactive_category OR C.active) ) - # products + -- products AND ( ( a_get_all_product @@ -6320,16 +6320,16 @@ BEGIN /* INSERT INTO tmp_Shop_Variation ( - id_variation, id_product # , display_order + id_variation, id_product -- , display_order ) - SELECT P.id_variation, P.id_product # , P.display_order + SELECT P.id_variation, P.id_product -- , P.display_order FROM Shop_Variation V INNER JOIN tmp_Shop_Product t_P ON V.id_product = t_P.id_product WHERE V.active; */ - # Product Images + -- Product Images INSERT INTO tmp_Shop_Image ( id_product, id_permutation, @@ -6386,7 +6386,7 @@ BEGIN END IF; */ - # Delivery Regions + -- Delivery Regions INSERT INTO tmp_Delivery_Region ( id_region, active, @@ -6511,7 +6511,7 @@ BEGIN -- select * from tmp_Shop_Product; - # Currencies + -- Currencies IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN INSERT INTO tmp_Currency ( id_currency, @@ -6599,7 +6599,7 @@ BEGIN END IF; END IF; - # Discounts + -- Discounts IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid) THEN INSERT INTO tmp_Discount ( id_discount, @@ -6625,12 +6625,12 @@ BEGIN ) ; END IF; - # select 'pre-permission results'; - # select * from tmp_Shop_Product; + -- select 'pre-permission results'; + -- select * from tmp_Shop_Product; -- Permissions IF EXISTS (SELECT * FROM tmp_Shop_Product_Category LIMIT 1) THEN - # SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); + -- SET v_id_user := (SELECT id_user FROM Shop_User WHERE name = CURRENT_USER()); SET v_id_permission_product := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); -- SET v_ids_product_permission := (SELECT GROUP_CONCAT(id_product SEPARATOR ',') FROM tmp_Shop_Product); SET v_ids_permutation_permission := (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') FROM tmp_Shop_Product WHERE NOT ISNULL(id_permutation)); @@ -6652,7 +6652,7 @@ BEGIN DELETE FROM tmp_Shop_Product t_P WHERE - FIND_IN_SET(t_P.id_permutation, (SELECT GROUP_CONCAT(UET.id_permutation SEPARATOR ',') FROM Shop_User_Eval_Temp UET)) = 0 # id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_User_Eval_Temp), '%'); + FIND_IN_SET(t_P.id_permutation, (SELECT GROUP_CONCAT(UET.id_permutation SEPARATOR ',') FROM Shop_User_Eval_Temp UET)) = 0 -- id_product NOT LIKE CONCAT('%', (SELECT GROUP_CONCAT(id_product SEPARATOR '|') FROM Shop_User_Eval_Temp), '%'); OR ( ISNULL(t_P.can_view) AND ( @@ -6670,8 +6670,8 @@ BEGIN ) ; - # CALL p_shop_user_eval_clear_temp(v_guid); - # DROP TABLE IF EXISTS Shop_User_Eval_Temp; + -- CALL p_shop_user_eval_clear_temp(v_guid); + -- DROP TABLE IF EXISTS Shop_User_Eval_Temp; DELETE FROM Shop_User_Eval_Temp WHERE GUID = v_guid ; @@ -6683,7 +6683,7 @@ BEGIN -- Returns SET v_now := NOW(); - # Categories + -- Categories SELECT DISTINCT t_C.id_category, C.name, @@ -6697,7 +6697,7 @@ BEGIN ORDER BY C.display_order ; - # Products + -- Products SELECT t_P.id_product, t_P.id_permutation, @@ -6729,7 +6729,7 @@ BEGIN ORDER BY t_P.rank_permutation ; - # Variations + -- Variations SELECT V.id_variation, t_P.id_product, @@ -6750,7 +6750,7 @@ BEGIN ; /* - # Permutation variations output + -- Permutation variations output SELECT t_P.id_permutation, t_P.id_product, t_P.id_category, @@ -6769,7 +6769,7 @@ BEGIN select * from tmp_shop_product; */ - # Product Price + -- Product Price SELECT PCRL.id_link AS id_price, t_P.id_permutation, @@ -6802,7 +6802,7 @@ BEGIN ; /* - # Currency + -- Currency SELECT DISTINCT C.id_currency, C.code, @@ -6816,7 +6816,7 @@ BEGIN ; */ - # Images + -- Images SELECT t_I.id_image, t_I.id_product, @@ -6834,7 +6834,7 @@ BEGIN ORDER BY t_P.rank_permutation, I.display_order ; - # Delivery options + -- Delivery options SELECT _DO.id_option, PDOL.id_product, @@ -6870,7 +6870,7 @@ BEGIN ORDER BY t_P.rank_permutation, PDOL.display_order ; - # Discounts + -- Discounts SELECT D.id_discount, P.id_category, @@ -6909,7 +6909,7 @@ BEGIN ; /* - # Delivery Regions + -- Delivery Regions SELECT t_DR.id_region, t_P.id_category, @@ -6933,7 +6933,7 @@ BEGIN ; */ - # Errors + -- Errors SELECT t_ME.display_order, t_ME.guid, @@ -6949,7 +6949,7 @@ BEGIN ; /* - # Return arguments for test + -- Return arguments for test SELECT a_ids_category, a_get_inactive_category, @@ -6964,8 +6964,8 @@ BEGIN ; */ - # select 'other outputs'; - # select * from tmp_Shop_Product; + -- select 'other outputs'; + -- select * from tmp_Shop_Product; -- Clean up DROP TABLE IF EXISTS tmp_Discount; @@ -7081,11 +7081,11 @@ BEGIN active BIT NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), /* id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type @@ -7155,17 +7155,17 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # SELECT * FROM tmp_Msg_Error LIMIT 1; + -- SELECT * FROM tmp_Msg_Error LIMIT 1; CALL p_shop_user_eval ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), # a_ids_access_level - (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link), # (SELECT DISTINCT id_product FROM tmp_Shop_Product_Currency_Link) calc_PCL) # a_ids_product - (SELECT GROUP_CONCAT(DISTINCT id_permutation SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link) # a_ids_permutation + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), -- a_ids_access_level + (SELECT GROUP_CONCAT(DISTINCT id_product SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link), -- (SELECT DISTINCT id_product FROM tmp_Shop_Product_Currency_Link) calc_PCL) -- a_ids_product + (SELECT GROUP_CONCAT(DISTINCT id_permutation SEPARATOR ',') FROM tmp_Shop_Product_Currency_Link) -- a_ids_permutation ); - # SELECT * FROM tmp_Msg_Error LIMIT 1; + -- SELECT * FROM tmp_Msg_Error LIMIT 1; IF EXISTS (SELECT can_admin FROM Shop_User_Eval_Temp WHERE guid = v_guid AND NOT can_admin LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( @@ -7221,7 +7221,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -7229,7 +7229,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user ; @@ -7304,11 +7304,11 @@ BEGIN description VARCHAR(4000) NOT NULL ); - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( # IF NOT EXISTS + CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( -- IF NOT EXISTS display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, code VARCHAR(50) NOT NULL, - # CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), + -- CONSTRAINT chk_tmp_Msg_Error_code CHECK (code IN (SELECT code FROM Shop_Msg_Error_Type)), /* id_type INT NOT NULL, CONSTRAINT FK_tmp_Msg_Error_id_type @@ -7429,13 +7429,13 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN CALL p_shop_user_eval ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), # a_ids_access_level - (SELECT GROUP_CONCAT(id_product SEPARATOR ',') From tmp_Shop_Product), # a_ids_product - (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') From tmp_Shop_Product) # a_ids_permutation -- WHERE NOT ISNULL(id_permutation) + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_ADMIN' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'ADMIN' AND active), -- a_ids_access_level + (SELECT GROUP_CONCAT(id_product SEPARATOR ',') From tmp_Shop_Product), -- a_ids_product + (SELECT GROUP_CONCAT(id_permutation SEPARATOR ',') From tmp_Shop_Product) -- a_ids_permutation -- WHERE NOT ISNULL(id_permutation) ); IF EXISTS (SELECT can_admin FROM Shop_User_Eval_Temp WHERE guid = v_guid AND NOT can_admin) THEN @@ -7498,7 +7498,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -7506,7 +7506,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user ; @@ -7596,9 +7596,9 @@ BEGIN CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, guid BINARY(36) NOT NULL, - # id_type INT NOT NULL, - # CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) - # REFERENCES Shop_Msg_Error_Type (id_type), + -- id_type INT NOT NULL, + -- CONSTRAINT FK_tmp_Msg_Error_id_type FOREIGN KEY (id_type) + -- REFERENCES Shop_Msg_Error_Type (id_type), code VARCHAR(50), msg VARCHAR(4000) NOT NULL ); @@ -7646,13 +7646,13 @@ BEGIN -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN CALL p_shop_user_eval ( - v_guid, # a_guid - a_id_user, # a_id_user - 0, # a_get_inactive_users - CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_USER' = code), CHAR), # a_ids_permission - (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' AND active), # a_ids_access_level - '', # a_ids_product - '' # a_ids_permutation + v_guid, -- a_guid + a_id_user, -- a_id_user + 0, -- a_get_inactive_users + CONVERT((SELECT id_permission FROM Shop_Permission WHERE 'STORE_USER' = code), CHAR), -- a_ids_permission + (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' AND active), -- a_ids_access_level + '', -- a_ids_product + '' -- a_ids_permutation ); IF NOT (SELECT can_edit FROM Shop_User_Eval_Temp WHERE guid = v_guid) THEN @@ -7676,8 +7676,8 @@ BEGIN -- Invalid Orders IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE guid = v_guid LIMIT 1) THEN - # Invalid Order IDs - IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_order AND FIND_IN_SET(id_order, a_ids_order) > 0) THEN # id_order LIKE CONCAT('%', a_ids_order, '%') LIMIT 1) THEN + -- Invalid Order IDs + IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_order AND FIND_IN_SET(id_order, a_ids_order) > 0) THEN -- id_order LIKE CONCAT('%', a_ids_order, '%') LIMIT 1) THEN INSERT INTO tmp_Msg_Error ( guid, code, @@ -7686,11 +7686,11 @@ BEGIN VALUES ( v_guid, v_code_error_data, - CONCAT('You do not have access to the following order IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND FIND_IN_SET(id_order, a_ids_order) > 0)) # id_order LIKE CONCAT('%', a_ids_order, '%'))) # AND v_has_filter_order # filtered by parent condition + CONCAT('You do not have access to the following order IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND FIND_IN_SET(id_order, a_ids_order) > 0)) -- id_order LIKE CONCAT('%', a_ids_order, '%'))) -- AND v_has_filter_order -- filtered by parent condition ) ; END IF; - # Invalid Checkout Session IDs + -- Invalid Checkout Session IDs IF EXISTS (SELECT * FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND v_has_filter_session AND id_checkout_session = a_id_checkout_session) THEN INSERT INTO tmp_Msg_Error ( guid, @@ -7700,7 +7700,7 @@ BEGIN VALUES ( v_guid, v_code_error_data, - CONCAT('You do not have access to the following checkout session IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND id_checkout_session = a_id_checkout_session)) # AND v_has_filter_order # filtered by parent condition + CONCAT('You do not have access to the following checkout session IDs: ', (SELECT GROUP_CONCAT(id_order SEPARATOR ', ') FROM Shop_User_Order WHERE NOT (id_user = a_id_user) AND id_checkout_session = a_id_checkout_session)) -- AND v_has_filter_order -- filtered by parent condition ) ; END IF; @@ -7719,7 +7719,7 @@ BEGIN INNER JOIN tmp_Shop_User t_U ON UO.id_user = t_U.id_user AND t_U.active - WHERE ((NOT v_has_filter_order OR FIND_IN_SET(UO.id_order, a_ids_order) > 0) # UO.id_order LIKE CONCAT('%', a_ids_order, '%')) + WHERE ((NOT v_has_filter_order OR FIND_IN_SET(UO.id_order, a_ids_order) > 0) -- UO.id_order LIKE CONCAT('%', a_ids_order, '%')) OR (NOT v_has_filter_session OR UO.id_checkout_session = a_id_checkout_session)) AND UO.active ; @@ -7747,7 +7747,7 @@ BEGIN ; - # Errors + -- Errors SELECT * FROM tmp_Msg_Error WHERE guid = v_guid @@ -7755,7 +7755,7 @@ BEGIN /* - # Return arguments for test + -- Return arguments for test SELECT a_id_user, a_ids_order, @@ -7801,7 +7801,7 @@ BEGIN DECLARE v_id_permission INT; -- DECLARE v_ids_product VARCHAR(500); DECLARE v_id_access_level_view INT; - # DECLARE v_id_access_level_product_required INT; + -- DECLARE v_id_access_level_product_required INT; DECLARE v_priority_access_level_view INT; DECLARE v_priority_access_level_edit INT; DECLARE v_priority_access_level_admin INT; @@ -7819,10 +7819,10 @@ BEGIN SET v_code_error_permission := (SELECT code FROM Shop_Msg_Error_Type WHERE id_type = 2); -- Clear previous proc results - # DROP TABLE IF EXISTS tmp_User_Role_Link; - # DROP TEMPORARY TABLE IF EXISTS tmp_User_Role_Link; + -- DROP TABLE IF EXISTS tmp_User_Role_Link; + -- DROP TEMPORARY TABLE IF EXISTS tmp_User_Role_Link; DROP TABLE IF EXISTS tmp_Shop_Product_p_Shop_User_Eval; - # DROP TABLE IF EXISTS Shop_User_Eval_Temp; + -- DROP TABLE IF EXISTS Shop_User_Eval_Temp; -- Parse arguments + get default values @@ -7927,7 +7927,7 @@ BEGIN msg VARCHAR(4000) NOT NULL ); - # select * from Shop_Msg_Error_Type; + -- select * from Shop_Msg_Error_Type; -- Parse filters IF a_guid IS NULL OR EXISTS (SELECT * FROM Shop_User_Eval_Temp WHERE a_guid = guid) THEN @@ -7976,7 +7976,7 @@ BEGIN ); DROP TABLE Split_Temp; IF 0 = v_id_access_level OR v_id_access_level <=> NULL THEN - # SET v_has_filter_access_level = 0; + -- SET v_has_filter_access_level = 0; INSERT INTO tmp_Msg_Error ( guid, code, @@ -8017,7 +8017,7 @@ BEGIN ON PP.id_access_level_required = AL.id_access_level AND AL.active WHERE FIND_IN_SET(PP.id_permutation, a_ids_permutation) > 0 - # AND P.active # not worried as we want users to be able to see their order history + -- AND P.active -- not worried as we want users to be able to see their order history ; /* DELETE FROM tmp_Shop_Product_p_Shop_User_Eval @@ -8028,7 +8028,7 @@ BEGIN END IF; IF v_has_filter_permission THEN - # Invalid permission IDs + -- Invalid permission IDs IF EXISTS (SELECT id_permission FROM Shop_Permission WHERE FIND_IN_SET(id_permission, a_ids_permission) > 0 AND NOT active) THEN INSERT INTO tmp_Msg_Error ( guid, @@ -8127,7 +8127,7 @@ BEGIN guid, id_user, id_permission_required, - # id_access_level_required, + -- id_access_level_required, priority_access_level_required, priority_access_level_user, is_super_user @@ -8168,9 +8168,9 @@ BEGIN WHERE U.id_user = a_id_user AND (a_get_inactive_users OR U.active) AND FIND_IN_SET(P.id_permission, a_ids_permission) > 0 - # AND v_id_permission = P.id_permission - # AND v_id_access_level = AL.id_access_leveld - GROUP BY U.id_user, P.id_permission # , is_super_user + -- AND v_id_permission = P.id_permission + -- AND v_id_access_level = AL.id_access_leveld + GROUP BY U.id_user, P.id_permission -- , is_super_user ; */ @@ -8196,7 +8196,7 @@ BEGIN WHERE UE_T.guid = a_guid AND UE_T.id_user = a_id_user AND RPL.id_permission = UE_T.id_permission_required - # GROUP BY UE_T.id_user + -- GROUP BY UE_T.id_user ; ELSE UPDATE Shop_User_Eval_Temp UE_T @@ -8207,15 +8207,15 @@ BEGIN UE_T.can_admin = 0 WHERE UE_T.guid = a_guid AND UE_T.id_user = a_id_user - # GROUP BY UE_T.id_user + -- GROUP BY UE_T.id_user ; END IF; END IF; -- Clean up DROP TABLE IF EXISTS tmp_Shop_Product_p_Shop_User_Eval; - # DROP TEMPORARY TABLE IF EXISTS tmp_User_Role_Link; - # DROP TABLE IF EXISTS tmp_Msg_Error; + -- DROP TEMPORARY TABLE IF EXISTS tmp_User_Role_Link; + -- DROP TABLE IF EXISTS tmp_Msg_Error; END ;; DELIMITER ;; /*!50003 SET sql_mode = @saved_sql_mode */ ; diff --git a/templates/js/sections/store.js b/templates/js/sections/store.js index 1a24213e..b576a3b7 100644 --- a/templates/js/sections/store.js +++ b/templates/js/sections/store.js @@ -93,7 +93,7 @@ var flagSupplier = "{{ model.FLAG_SUPPLIER }}"; var flagSupplierAddress = "{{ model.FLAG_SUPPLIER_ADDRESS }}"; var flagSupplierPurchaseOrder = "{{ model.FLAG_SUPPLIER_PURCHASE_ORDER }}"; var flagSymbolCurrencyCost = "{{ model.FLAG_SYMBOL_CURRENCY_COST }}"; -var flagSymbolIsSuffixNotPrefixUnitMeasurementIntervalExpirationUnsealed = "{{ model.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED }}"; +var flagSymbolIsSuffixNotPrefixUnitMeasurementIntervalExpirationUnsealed = "{{ model.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_INTERVAL_EXPIRATION_UNSEALED }}"; var flagSymbolIsSuffixNotPrefixUnitMeasurementIntervalRecurrence = "{{ model.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_RECURRENCE }}"; var flagSymbolIsSuffixNotPrefixUnitMeasurementQuantity = "{{ model.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_QUANTITY }}"; var flagSymbolUnitMeasurementIntervalExpirationUnsealed = "{{ model.FLAG_SYMBOL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED }}";