From decab6a638ece21be3322fdc87ebd97893c43aeb Mon Sep 17 00:00:00 2001 From: Teddy Middleton-Smith Date: Mon, 23 Dec 2024 19:37:22 +0000 Subject: [PATCH] Fix (MySQL): Update for MySQL version 8.0.40-0ubuntu0.20.04.1 on Oracle VPS --- .../__pycache__/__init__.cpython-38.pyc | Bin 449 -> 422 bytes lib/__pycache__/__init__.cpython-38.pyc | Bin 418 -> 391 bytes .../argument_validation.cpython-38.pyc | Bin 18391 -> 18728 bytes lib/__pycache__/data_types.cpython-38.pyc | Bin 538 -> 511 bytes models/__pycache__/__init__.cpython-38.pyc | Bin 429 -> 402 bytes .../model_view_base.cpython-38.pyc | Bin 4705 -> 15760 bytes .../model_view_contact.cpython-38.pyc | Bin 1547 -> 1439 bytes .../model_view_home.cpython-38.pyc | Bin 1205 -> 1005 bytes static/MySQL/0000_combined.sql | 305 +++++++++--------- static/MySQL/3000_tri_Shop_Access_Level.sql | 4 +- .../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 | 4 +- static/MySQL/3011_tri_File_Type_Audit.sql | 4 +- static/MySQL/3012_tri_Shop_General.sql | 4 +- static/MySQL/3014_tri_Shop_Image_Type.sql | 4 +- static/MySQL/3100_tri_Shop_Region.sql | 4 +- static/MySQL/3103_tri_Shop_Region_Branch.sql | 4 +- static/MySQL/3106_tri_Shop_Address.sql | 4 +- .../MySQL/3109_tri_Shop_Storage_Location.sql | 4 +- static/MySQL/3115_tri_Shop_Currency.sql | 4 +- .../MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql | 4 +- static/MySQL/3200_tri_Shop_Category.sql | 4 +- static/MySQL/3203_tri_Shop_Product.sql | 4 +- .../3206_tri_Shop_Product_Permutation.sql | 4 +- static/MySQL/3209_tri_Shop_Variation_Type.sql | 4 +- static/MySQL/3212_tri_Shop_Variation.sql | 4 +- ...hop_Product_Permutation_Variation_Link.sql | 4 +- static/MySQL/3218_tri_Shop_Stock_Item.sql | 4 +- static/MySQL/3221_tri_Shop_Product_Price.sql | 4 +- static/MySQL/3224_tri_Shop_Product_Image.sql | 4 +- .../MySQL/3227_tri_Shop_Delivery_Option.sql | 4 +- ...oduct_Permutation_Delivery_Option_Link.sql | 4 +- static/MySQL/3233_tri_Shop_Discount.sql | 4 +- ...tri_Shop_Discount_Region_Currency_Link.sql | 4 +- .../MySQL/3300_tri_Shop_Permission_Group.sql | 4 +- static/MySQL/3303_tri_Shop_Permission.sql | 4 +- static/MySQL/3306_tri_Shop_Role.sql | 4 +- .../3309_tri_Shop_Role_Permission_Link.sql | 4 +- static/MySQL/3312_tri_Shop_User.sql | 4 +- static/MySQL/3315_tri_Shop_User_Role_Link.sql | 4 +- static/MySQL/3318_tri_Shop_User_Address.sql | 4 +- static/MySQL/3321_tri_Shop_User_Basket.sql | 4 +- .../MySQL/3324_tri_Shop_User_Order_Status.sql | 4 +- static/MySQL/3400_tri_Shop_Supplier.sql | 4 +- .../MySQL/3403_tri_Shop_Supplier_Address.sql | 4 +- .../MySQL/3403_tri_Shop_Unit_Measurement.sql | 4 +- ...ri_Shop_Unit_Of_Measurement_Conversion.sql | 4 +- .../3409_tri_Shop_Supplier_Purchase_Order.sql | 4 +- ...p_Supplier_Purchase_Order_Product_Link.sql | 4 +- ..._tri_Shop_Manufacturing_Purchase_Order.sql | 4 +- ...ufacturing_Purchase_Order_Product_Link.sql | 4 +- static/MySQL/3421_tri_Shop_Customer.sql | 4 +- .../3424_tri_Shop_Customer_Sales_Order.sql | 4 +- ...Shop_Customer_Sales_Order_Product_Link.sql | 4 +- .../MySQL/6000_p_debug_timing_reporting.sql | 2 +- static/MySQL/6000_p_split.sql | 2 +- static/MySQL/6001_p_clear_split_temp.sql | 2 +- static/MySQL/6001_p_validate_guid.sql | 6 +- .../MySQL/6003_p_split_key_value_pair_csv.sql | 2 +- ..._p_clear_split_key_value_pair_csv_temp.sql | 2 +- ...ct_permutation_from_variation_csv_list.sql | 2 +- static/MySQL/6500_p_shop_calc_user.sql | 2 +- static/MySQL/6501_p_shop_clear_calc_user.sql | 2 +- .../7003_p_shop_get_many_access_level.sql | 2 +- static/MySQL/7101_p_shop_get_many_region.sql | 2 +- 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 | 2 +- .../7122_p_shop_get_many_unit_measurement.sql | 2 +- .../7200_p_shop_save_product_category.sql | 2 +- ...7200_p_shop_save_product_category_test.sql | 2 +- ..._p_shop_clear_calc_product_permutation.sql | 2 +- static/MySQL/7203_p_shop_save_product.sql | 2 +- .../MySQL/7203_p_shop_save_product_test.sql | 2 +- .../7204_p_shop_calc_product_permutation.sql | 2 +- static/MySQL/7204_p_shop_get_many_product.sql | 2 +- ...205_p_shop_get_many_stripe_product_new.sql | 2 +- .../7206_p_shop_save_product_permutation.sql | 2 +- ...6_p_shop_save_product_permutation_test.sql | 2 +- ...7210_p_shop_get_many_product_variation.sql | 2 +- .../7212_p_shop_save_product_variation.sql | 2 +- ...212_p_shop_save_product_variation_test.sql | 2 +- .../MySQL/7219_p_shop_get_many_stock_item.sql | 2 +- static/MySQL/7220_p_shop_save_stock_item.sql | 2 +- .../7220_p_shop_save_stock_item_test.sql | 2 +- ...price_and_discount_and_delivery_option.sql | 2 +- .../7223_p_shop_get_many_stripe_price_new.sql | 2 +- static/MySQL/7312_p_shop_save_user.sql | 2 +- static/MySQL/7313_p_get_many_user.sql | 2 +- static/MySQL/7321_p_shop_save_user_basket.sql | 2 +- static/MySQL/7400_p_shop_save_supplier.sql | 7 +- .../MySQL/7400_p_shop_save_supplier_temp.sql | 2 +- .../MySQL/7401_p_shop_get_many_supplier.sql | 2 +- ...03_p_shop_save_supplier_purchase_order.sql | 2 +- ...shop_save_supplier_purchase_order_test.sql | 2 +- ..._shop_get_many_supplier_purchase_order.sql | 2 +- ...save_Manufacturing_purchase_order_test.sql | 2 +- ...shop_save_manufacturing_purchase_order.sql | 2 +- ..._get_many_manufacturing_purchase_order.sql | 2 +- static/MySQL/7421_p_shop_save_customer.sql | 2 +- .../MySQL/7422_p_shop_get_many_customer.sql | 2 +- .../7424_p_shop_save_customer_sales_order.sql | 2 +- ...5_p_shop_get_many_customer_sales_order.sql | 2 +- static/MySQL/9000_populate.sql | 2 +- .../000_init_tables_authentication.sql | 34 +- .../deprecated/000_init_tables_product.sql | 66 ++-- .../308_tri_Shop_Recurrence_Interval.sql | 4 +- ...1_tri_Shop_Product_Variation_Type_Link.sql | 4 +- .../316_tri_Shop_Product_Variation_Link.sql | 4 +- .../MySQL/deprecated/322_tri_Shop_Price.sql | 4 +- ..._tri_Shop_Product_Delivery_Region_Link.sql | 4 +- .../deprecated/371_tri_Shop_User_Order.sql | 4 +- .../373_tri_Shop_User_Order_Product_Link.sql | 4 +- .../7000_p_shop_get_many_role_permission.sql | 2 +- .../7000_p_shop_get_many_user_order.sql | 2 +- .../deprecated/706_p_shop_get_product.sql | 2 +- 118 files changed, 367 insertions(+), 363 deletions(-) diff --git a/business_objects/__pycache__/__init__.cpython-38.pyc b/business_objects/__pycache__/__init__.cpython-38.pyc index 29012b58edfa1a6334f0e3b166d67cda4319138a..bef43550ff75b453574d6507676dfc2f1903892c 100644 GIT binary patch delta 124 zcmX@eyo{MIl$V!_0SFHM3QhmUu#wM%F(p7hBR@A)za%v!rBdG|Ke;qFHLs*tKcFZ- zy(lp^H#09?KRh)_zaX)wq&U7jHK{nWBvn7Dv^X;_wYWGwKPf9U8K^uyJ~J<~BtBlR Wpz;=nO>TZlX-=vgBhaSLAnO2h11jbK delta 125 zcmZ3+e2|$hl$V!_0SH!=XQwhUZsapzOw4w+iU}=FEh>&lO({<-it*1&bt%d$OO0{K zPcF?(%_}L62`I`>FG|eK&CE-W3Ck=lP0UdUE-6jP%vUfnFfxh>a106wjt@^wib*Ue ah)F6f&df_KE{@Mn%1TWJ>Ym)eCdzkXTew9ABQARGe9os-KgYq#qxjnU`4-AFo$Xd5gm)H$SB`C)JJ- JX!d821pxnEBX#GKvXs32|GmCCipp z$~!B^(TyNjX*o(8ObNL{lj0sFcPSy1a+KgJ;VzV;6s{bll(Ljia;3!ODEC(gBKPt8 zJ@3ry>}uB^=@rUxGJ5sS`|-T*%skKU`FNl4W4*neg`a;~eQY}S2g~|5UL=3=xHyDg zf6BHjWldPhR?e(F=S(;@>#5n)oIBy7{z;Wl+2`zuw7OU2R35dA`jqNX1=O)o0XZwFR}J zI;6I$ZK(CB!|E1wD{B4fHdT7gnpmeEP#;m-(K4VORJW@gsI6BIRR`6bFWG9R+JzN2 zs3YO^u-c95A$5oHrY-q(75}BD^6H~%59V&{*!M9tg1${^RP9rDp|+W`4GsK_DC}2v zqi;)ftNQpk=aQ{YSDnk-sy*rxYEa#?lKPHqTVYFYvqkluu!bLAI^{j6tCf0HmF8=u z@iU91!wb5!|C6P=_8++W?gO9rRB8Xd{darbp~_s>_EL7I2mO`~rI`v!jh% zC7d;x<uctWDwu0OVE1u;Bj!JVD#%I2s_FuwGX;IR)l99PD1Zn?L zr}-G0+h_&ZjTZLk2DZuvS-v9DTgm#r2Q|}{r1lP|z1@jgJsqU#nHA@frT?p*4N@!i zatc&aswYYHlI@Rzu4zrs#j8IUq|tkzBW*Xxs6rc^=RwD`w$k~E(7D)&j_M7ZZ&|7s zq@>J9X`}3`XX}~3TCrDn)gM^jvR*EL$<~cEdaGK`>++mGUH0p`(dRENEarr!d!yN) zjmh>%BXho7tISoe{x^PjQGaHk+VIYo!EaJu%6+zWo{U;rwM$F+k{j__6*=>RyPZdS>rK^OGW8{@&wyep*-N z=4NWsd%sXUy?3Fa>wfv^>S=$bUfnx8b9!$iRAuZf6vdH+XXF;R6Mr0qRdAhxU9@vf z(eAfhJ7>F2&Ka-=P!F%{f-{)B#`v5)gq95cnenYxvce?qF8U$hQ?f;p-!YP$Q4Xb< z{7X&=GUrlycijP}r68->AhY5cX~qcD!V#y@54dAL=24zgdIFLm@~qNLc~+TaD2L^| ztl-4+pH=DQe61hyg*KHtXX#693G)71pzKg;Nf|3r-c$NY;QBx8L?2_lNZ#Xhu*-0t z@5bw(Mb>%WtOKdshm~wfa&jfe?5@B??~YEZ#Ve$v6)^sotTBLlK`Yll+ZW?iUc@SC z%6Z!=&&w)b?YN4)oRQ}xvdcFDio_=?02a2<`K8eLc}F@~NPF*?<}23&EMit4)jhZ# zzX~1*MS%!!B!f~goY9-uu#v@j7L+(Wh@z32t=5J;h+2831`J4uQ%qhY$w=20&fCg) zY2kknCR5zPF7E3%etnGsVgPpU2UGV)Vj!%|whS1ay|GB3r{FYuGEGr{7;#(%!sJ3Y zk|M(P_!{HPb17o!Nn%&@L&4;=(Rq&Oyc{G2e2lkAy_K>p)H9HQ9NxPNjJKh~;40?`rT%i}wRCH=$g_l4h1&x-Z@q*B})Qv{GQ-e`v zr$3UNZUR#E$#iwTygnEl2N?wNB!x zpmn)`{c}x6pA1mPny7I^-B#;FQxCihyoK#!_U7nkG0r{bV%)PBvp#U4v%@j*Uaw%U z1_Saz8aR+$$&yDf=Lgua%W4+>IIxQ1%SjL z{x*Tcg&q#IZX3k3^t3=sG19^z^t4_ZFv2PrmFP)veZo|ZI{?HD3g~6f`Wo48Pfiq^t;mkQ}nwqWRv|r zWxpx{9@a9w7v$^d$hf7CGd71_J{k$2QJ> zLS~=jY}F@1+Am_5e>uGoLJc?%>2>N&tne0u)WFPJLicr{`#qs+gg^gss*PexJ7}3b zI=Tp21{R7!YgK5yC$t8_-L=zdX}<_C5dbi@F$6gwIvTsuApehqUUO{5@5yxP+a63rcV010?3&(I$bh-k+LlHUTG$o~>5z=s$e1}&HN zx8=&O$g7cB$nYR#82?~{<9E>Z*I(kYierAm{1iPR-6&){3%d%BCncbvlju zrYNuWMJ~FK*?Ca!X8%W7>|yaS6y0QS9|yF`pdMix-QVS4Kd1YZ1I+-GhAE#3H6-0xI??Yl%^Zu#YONKo9vprx6KP zFQa;~4qLNm{YRtkmZ_)32;|O8SW7}(W(G#9;@3%KAfS#zpbd2wS`fy1cn>+&FWR-& z7>Q*JmeE(nT^Vs@td&vL=_1?;#8?&LtBkBNraGO2i*8-cf5*ZuygKwfjrNDEC%3?P z$pzkK+=)ayC$JJiO_%JaCS+VbF)p7NcM;?8CNS=z?DmJU+aGk??Ev0guTcLP=a7EA zKw}%)?T#@7eCUiybZE3q!x{Urn^cTz@P?%s8)?{gHSEVHoX3w$q#i$V0+kaJE-FWP zd6?D1M;q?=qmQ8<{IN%mH0<%E>;pTWIJxhxoeg_m!ycP(#y;Ojj~+gD z0-d81?&#sq9%FgzL^yEYP8hi2m&0bW8a+{LZ59zFaktx4p4iG%d5tvUbyWntbfq?3 z)wGuzF5_auYjj};4Jev#B9AavT_cL@OLeL;i)zE3X_w;tApWxNC zDx_8<_1;)g(E|C6B$aj=1IewDdOTEiv}PlTv=JIkN@QJZytR`0HED;<3Eng=n325< zIa?LZIR!{Nf-Q~Ssm0k@hWbpPvibaPz}8wFh+uhazE))nbmzgy5F(4{PqS#UMiYej z9N|)x*x&S)nv3_dLwuw*kUoSCMgo0y^7S$b8NS+t#iKc{yR8z&5_4Uhj_5^Y7&|d; zM*>nA-_P+7DRd2vhtSDLzQi{Kc4@gZ#|XTl9nt-k_OA(~(m9ZLrs_H8_&>%=3*8R_ zCS4oE@mt2|AII|~f*|ugz&uxC8E_uLd9KWh$LJ4aUIfX#93_5veyLE;Ni4wof>qmR zTl^;`{2?*n5ih#z1bIG%$Bk-{(Y&fTC#}}q0m5GlywIt5QK-BqRK8)TNX#Gc{m?PV zy_|`kF7GnlE$F-rI>zaFTj;zkbQ&=oIVV7jg7Jq0oxlTo4~#YP24>f~5!dk|4ugM; z{UKh&9(WP;lF;hl8;BFpjQp<__QY<({iW5tiMbt}hfdQ&zXHby`6lFcm!}7?-9`#` zxfW5c>0KCXg^PjMXuTauN%TJ{YZCEC^r5q?NgMzm8~q)09E>DvX2gFeB7kZ9h;8sH z5_Ly&g%&9#lv1+^oUWn*IK6o(HE`PQQwW?2%(nUzXCkN!CD4NeUKR=L0VKnn?I3{| zqc6wv48L;TuS5bdkM4U13FN$AMe{H=0nL zn@z9>r#&AAn|lm4ck&Ex7@h9|FKMEMeu%{p7NaO`3^qT9k&U!$;6njtj%Tmp*tQ7; z37?`+{K=q`E3^nv3v}KJ*#0A+vpuewv_zW*PHS8>vP9d%F|j2Y!Ygdg(7-_=Ko@w$ z7#KK&@uoSzdB(uOye{y{c^^dcy1*;O2)q`@8pRl1JMrN40*yBbwR~avvn<+pOMl+R}P%1N>X7pNlLze1UaW-4aHobQoPTL#lFF+;PwMJpCat;|4TFoE} zN4(LiMDVK$MZ>9|X*hm;!l|hVN2{wIdt4O5t^mJ&n4?mN#Y#+O*wK%$A>%JjP0d_r ze>P+2`v*Ro0xDLfh$I7;7S1+Dv!^BPhYQ803h&|q{GUksk>gJug~CKe%p@}Kr3Fs} zNj_qNHa)Sd#7v<45i?2he=}9bgE7yziWw8}e}+f&iFU*P<~$*b2uU>lyTYgOA-SX? zk=yaKaUh4(0+`Q^|63#;{Tk^$zY>Et7w<94SO#L{MZA^1F_UQ`VdAC_bpsBZ9C=^m zlsI@sChBfy(wiUl+U)$)ilI*+%SXz%|r_*+7cU@UVJxh(2sLm>+5e6 z76gPw$%oKK1BP`a*c|l4K$J7t9d!g+C69pn;1T8P z$PY+|HDo8~7iG5b|9jxCrITVlcq1sNA<1BPqwWO-2@GFe?nRi`3VIP5W)|Ycpcmz)mt8!ul-i6Z z=J-QF4jBxp+c<=yqj5cI>qZm)?o2PO(rViZ6$--ap!pi^%kf_^_r+&|a5LXo_>3<( zPYtQf0Q_4*z@ME#2E)w*zP=rjAXy0wuQEG3|8%*wSW6^PlI+fdt0kVCN|GZR!bFLY zQj{El$VSheD18DKw{;#Jp1EQ`H+u01eTw^{MYC$3TD6}X*EF#jwzpc49aLwlOc5R~ zbdQM8wQN7@k@SrF*+G5rYOy0;#g8QMJfGy8W+ak18v0HapJCAoWcmrT?MMN?Xa!k) zU933KV)Gfi2E)e4(CwUgt$S0xT$XA>KO&F4`FT)d)RVanA@6wxz`2e{;v6y zLzoMnGhl8|U~b!3V}RxXg+I0t{DgqssD;}EJS{T)MaplP#g|xASe#}N1CXBNB}I8$ zS6Q7xkv#osH<1Y~#wcn+5RGLy?9zfhv`+Lii#F&ugSMxx3mp#O;=@A6SSxgJ#Yx&k z(GRyuyX`^z`mbXzu#bwc6+GBS#n3+Lfqeu^1NIS8vgE*7S`^%=Sbv*CtfE*x9>k_K zC94QcR}8JAmiC`Z zJ75QvPZ7D3u7b`rC61HVt>j?W+!bD$%wpK;@%q9W264V~svS zWv%KX(@hZb!{Fpjh`;2{@uL@nXne_`8<(rf1wVnFVx{$akA%ism_@7a00Bf&<0OH0 zm>lK;G?h$}e$zCYLEEeA+e|ZjjaOZ$pDEAa<2$J!YtLlq%SO+V&Mp?`STqgcPKKMr z9=cj@T>ec$@L!=~4I1l>X|~P0pD=eoEI8J8OKPl%L?r8gX(ZSU+S_2Op%)R0D2)!s z)MC{!f%ky)vTuKT4U{?4b2N9g2Bv9{3QYg~pBGHyBLc!SAc(+~@y+oVJ|k%Z={E$7 z5x;5!>3@}W2+=h_dPfY>J34^$wx)Opt$Ya55b$e&^o1CtFLVIug)TJPLHhX?kba3E zUH7_xG#yMr-CB_Tt$_4z+SZh;p=E;fpn&wj7^J^1AbqF6;C3@hZ4i(iY5{3HiDY{S z(mDp|@7H@{kba^INHeqd=0KXNrwG`3tqV;5A%^L}`gN(tfS9D3@(ayp6$14)W1v3U znQBL%Zl!v94b=y_(`wt9;~y8WHg0@Eg#fIN3s`R)6Uj~h)(so7F+ghpzwN++af5z> zc|>JB%R+#-uR9Po?bTLDZn(6zH4Vgs=}I8db1Yg-*T&{HrPDOiZ$r%g+Gv_0QiiDd zN22L{F@}D;z2?wo7Brp5{;%>Jq2<`Do@#%Dztv_7>KS+o&fO_IF=Q&2KVt#PYocp}A({1L521P~znIqu861L+@92pSnOa?LUA>RVkvi~ zUSIGJ?A?2n!m*U)C9cM!4{;FQSaVJxtV~yC?P0F0BTF>R1a76_l;?~|A>o}?_SR2f z#Is~%2}<+(8#$coXc)w-T(oz9RE6q zLPO}?Cve;w`y4qa7UO+o;3*}ji6{45kO^r$2U_8Xm{!n*7UI`X$_0c|#2b(l=5NcM zP2h+aJ~~-LxW>?g&4Z9;wt%?b}m|u0U>auI8V@-}20pPcE&G z4+-#}c2r7Sy0p}TOv#cNS(2FA((UoEu=z~2g7ksu($u_;Mh>s*Zmu+q6v-hb#+$QE zdXSB5xT{8brlzVFOt@_$dmMao!nhk~m+&WXO1Z?#^DLfb@s}(vuy}?=tCBF8$W#y$ zsakn*B8{{ke`z8u524K@(u)}O26e`Bs8|CxqA_R$?MS$j+Y|L6aVI@{S5v3JoN2u( z*mdc>7v%x;7VPbEy#*ywCAgzTu3Vn0fK|%)?mKB##5Kfn7JHfYrfC281@QkADVI%5q-kkL?G_Af=ukes|;sykT#o|B?PjwpF%OynDBu@^F~+KMY4c-~a#s literal 18391 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 diff --git a/lib/__pycache__/data_types.cpython-38.pyc b/lib/__pycache__/data_types.cpython-38.pyc index 08437f7e0446290a6a4ef747421daabd8e5a2b06..a43f0ae83573671f10453ce474c89d552cf644d9 100644 GIT binary patch delta 84 zcmbQm@}HSEl$V!_0SFHM3Qh0W$m`5#>8hWRpPQ;*lA4lIsqd1XT$-DjS5mAWP?Vou ml$e{FnU}5~o|>dzkXTew9ABQARGe9os-KgYq(6BHV;KOIDIJvn delta 111 zcmey*Jd1@ll$V!_0SK&{vs2e>X#GKvXs3Jc*e%l$V!_0SFHM3Qd2rkyo41#!WvXKQ~psBsC?aQr{&%ximL5ucTN%peR4R pC^0uTGcR2~JT*zbAhD>VIKDhJsW`JFRX;aBB{ip5e{w&g902Iz9%=vp delta 140 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 HndE-~Fg*~m diff --git a/models/__pycache__/model_view_contact.cpython-38.pyc b/models/__pycache__/model_view_contact.cpython-38.pyc index 09301898e396e7b10f089ff530f9691d3c3bac4e..1cdaffb26544466290bfcecc558d24c4ccded34e 100644 GIT binary patch delta 740 zcmX|Z_{x=zsOX{UC4=te;o={ol@I zxPaeYE74uxUPLO1vz%NR!L<{EW?{-ju)a;}ucov#Urnuj5T{>$Eygs4vH%J_mN)I04P@HeYrEUDySBAK*I(`It*!4>nM^QcNJN_c zxb)+@!bXw(y`lGQS?49xK^wdfvE1bC5gCdXV ziS9|;XXCJgMB1MOK*yZrdXUIj_^e`GcjEuRD+1G4g%OTY@eISYilP?ymSf8D7q7Ii A$^ZZW delta 869 zcmYjPL2uJA6tH5j?quG~4ltlT6h;qQjMyD$5Ez+v|{5nIkUvy#K$17Kxak)^P><@i#Pn3myM8>pJ zIVN2yDx!L1cdCV76At*bV`7qy1EBTnJ$sRzv&UW?FeI9bgViVQwhE+j199j{_jMes z$#59BYl%PT1+iA{rcCyw*XxDxzPl5uffp@q>46B7#rFMn+ueNr=Is`L7woxSzwh=E z5k$((mW?L8ovj;7BkM}>CGc?|2Xz;Wpr0&FPHAcimRg#fnUrWln<*KyQ!6DYO<8K3 znNYp4anX2%=zJ#(4*6;lYtPp!oX4=@x!Fx*uT{#KH_V-(7x6Gw+Kc^BAWcY=TWZh` zq{Qrb`SKEk8-Ap6Cie157{j^r$uJ1`U? z5@ynADzAg*U*!w_h~P#+xB-qPW28HwWl)j=Rn7zff^?&0$eR$8+Z?J7HRQu8T9%xG zNzS3Ug$99&BiTf+c+H}y1z4`YP)M1uY5H+Kn=_lVo;@^|sGaSajS>Dq>43@YzDz(9 z{XtIS9x{@Mkk>B>`#}`_BV8mZ(iNGIHO49|t;!qW=G*>n<~6VstBz4jp7} zy+;qwYb+G>0KGt`W;FWX`_F%vZ~ou!E%%)*bnP0@Kjr$_70^N7Yy;a6ukgCtbjEQ+98P?H>0HFac|>NM zIV~Co)Qh5U7C1dJa1xJlh8JYOLQb40_Q{lO4}2Gr1y&)IWSJT~ znL$k{!qiHqMQPY(AG|+mDmvU%SgykQ|CJM8+F4PJr3JUzc5$oPsAKo4S*Mmb*30D` Y6`E0^SQREyHxnXgA<@%swEV9A3-K&s{r~^~ delta 626 zcmZ9KO=}ZD7{}*jH`z2VQmOP{ksyNPA`*J)t+t?-#%gSYbz#`Ya4E8_2{*`%X;hviB1I zUQWI&|9m>2aBM>F8WG6F9JxeLjybtP3+!6g=nQkptt-d1>)hrIlQ*uBh1}*C4VvW* zelx!~*z-=bP}&oG>MQScEDn{t6y9MHm3QPJcFH#0eF6VReO+}K3qoJ(K!hPG2#${H)zK$ztRu% Hey8;h$y<`g diff --git a/static/MySQL/0000_combined.sql b/static/MySQL/0000_combined.sql index c3660b50..ec48f6e0 100644 --- a/static/MySQL/0000_combined.sql +++ b/static/MySQL/0000_combined.sql @@ -2,7 +2,7 @@ /* Clear Store DataBase */ - +USE partsltd_prod; # Drop dependencies DROP TABLE IF EXISTS tmp_Shop_Calc_User; @@ -3653,7 +3653,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -3694,7 +3694,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3000_tri_Shop_Product_Change_Set.sql @@ -3710,14 +3710,14 @@ CREATE TRIGGER before_insert_Shop_Product_Change_Set BEFORE INSERT ON Shop_Product_Change_Set FOR EACH ROW BEGIN - IF NEW.updated_last_on <=> NULL THEN + IF NEW.updated_last_on IS NULL THEN SET NEW.updated_last_on = NOW(); END IF; - IF NEW.updated_last_by <=> NULL THEN + IF NEW.updated_last_by IS NULL THEN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; -- File: 3001_tri_Shop_User_Change_Set.sql @@ -3734,14 +3734,14 @@ CREATE TRIGGER before_insert_Shop_User_Change_Set BEFORE INSERT ON Shop_User_Change_Set FOR EACH ROW BEGIN - IF NEW.updated_last_on <=> NULL THEN + IF NEW.updated_last_on IS NULL THEN SET NEW.updated_last_on = NOW(); END IF; - IF NEW.updated_last_by <=> NULL THEN + IF NEW.updated_last_by IS NULL THEN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; -- File: 3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql @@ -3756,14 +3756,14 @@ CREATE TRIGGER before_insert_Shop_Sales_And_Purchasing_Change_Set BEFORE INSERT ON Shop_Sales_And_Purchasing_Change_Set FOR EACH ROW BEGIN - IF NEW.updated_last_on <=> NULL THEN + IF NEW.updated_last_on IS NULL THEN SET NEW.updated_last_on = NOW(); END IF; - IF NEW.updated_last_by <=> NULL THEN + IF NEW.updated_last_by IS NULL THEN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; -- File: 3010_tri_File_Type.sql @@ -3776,6 +3776,7 @@ DROP TRIGGER IF EXISTS before_insert_File_Type; DROP TRIGGER IF EXISTS before_update_File_Type; DELIMITER // + CREATE TRIGGER before_insert_File_Type BEFORE INSERT ON File_Type FOR EACH ROW @@ -3783,7 +3784,8 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; + +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type @@ -3809,7 +3811,7 @@ BEGIN WHERE NOT OLD.extension <=> NEW.extension ; END // -DELIMITER ;; +DELIMITER ; -- File: 3011_tri_File_Type_Audit.sql @@ -3830,7 +3832,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type_Audit @@ -3840,7 +3842,7 @@ BEGIN SET NEW.updated_last_on = NOW(); SET NEW.updated_last_by = CURRENT_USER(); END // -DELIMITER ;; +DELIMITER ; -- File: 3012_tri_Shop_General.sql @@ -3859,7 +3861,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_General @@ -3883,7 +3885,7 @@ BEGIN WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; END // -DELIMITER ;; +DELIMITER ; -- File: 3014_tri_Shop_Image_Type.sql @@ -3903,7 +3905,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -3950,7 +3952,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3100_tri_Shop_Region.sql @@ -3970,7 +3972,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4007,7 +4009,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3103_tri_Shop_Region_Branch.sql @@ -4028,7 +4030,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4063,7 +4065,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3106_tri_Shop_Address.sql @@ -4084,7 +4086,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4133,7 +4135,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3109_tri_Shop_Storage_Location.sql @@ -4153,7 +4155,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4190,7 +4192,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; -- File: 3115_tri_Shop_Currency.sql @@ -4211,7 +4213,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4256,7 +4258,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3118_tri_Shop_Tax_Or_Surcharge.sql @@ -4276,7 +4278,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Tax_Or_Surcharge @@ -4332,7 +4334,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -4353,7 +4355,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Product_Category @@ -4397,7 +4399,7 @@ BEGIN WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required ; END // -DELIMITER ;; +DELIMITER ; -- File: 3203_tri_Shop_Product.sql @@ -4419,7 +4421,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4570,7 +4572,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3206_tri_Shop_Product_Permutation.sql @@ -4591,7 +4593,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4740,7 +4742,7 @@ BEGIN */ ; END // -DELIMITER ;; +DELIMITER ; -- File: 3209_tri_Shop_Variation_Type.sql @@ -4762,7 +4764,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4803,7 +4805,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3212_tri_Shop_Variation.sql @@ -4824,7 +4826,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4869,7 +4871,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3215_tri_Shop_Product_Permutation_Variation_Link.sql @@ -4890,7 +4892,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -4929,7 +4931,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3218_tri_Shop_Stock_Item.sql @@ -4949,7 +4951,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5022,7 +5024,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3221_tri_Shop_Product_Price.sql @@ -5053,7 +5055,7 @@ BEGIN ); */ END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5112,7 +5114,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3224_tri_Shop_Product_Image.sql @@ -5133,7 +5135,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5188,7 +5190,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3227_tri_Shop_Delivery_Option.sql @@ -5208,7 +5210,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5263,7 +5265,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql @@ -5283,7 +5285,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5344,7 +5346,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3233_tri_Shop_Discount.sql @@ -5364,7 +5366,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Discount @@ -5428,7 +5430,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -5450,7 +5452,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5485,7 +5487,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3300_tri_Shop_Permission_Group.sql @@ -5505,7 +5507,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5542,7 +5544,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3303_tri_Shop_Permission.sql @@ -5562,7 +5564,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5607,7 +5609,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3306_tri_Shop_Role.sql @@ -5627,7 +5629,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5664,7 +5666,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; -- File: 3309_tri_Shop_Role_Permission_Link.sql @@ -5685,7 +5687,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5724,7 +5726,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3312_tri_Shop_User.sql @@ -5745,7 +5747,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5806,7 +5808,7 @@ BEGIN WHERE NOT (OLD.is_included_VAT_default <=> NEW.is_included_VAT_default) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3315_tri_Shop_User_Role_Link.sql @@ -5826,7 +5828,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5851,7 +5853,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3318_tri_Shop_User_Address.sql @@ -5871,7 +5873,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5928,7 +5930,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3321_tri_Shop_User_Basket.sql @@ -5948,7 +5950,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -5985,7 +5987,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3324_tri_Shop_User_Order_Status.sql @@ -6005,7 +6007,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6046,7 +6048,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3400_tri_Shop_Supplier.sql @@ -6066,7 +6068,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6129,7 +6131,7 @@ BEGIN WHERE NOT OLD.id_supplier_temp <=> NEW.id_supplier_temp ; END // -DELIMITER ;; +DELIMITER ; -- File: 3403_tri_Shop_Supplier_Address.sql @@ -6148,7 +6150,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6197,7 +6199,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; -- File: 3403_tri_Shop_Unit_Measurement.sql @@ -6217,7 +6219,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6274,7 +6276,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -6296,7 +6298,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6341,7 +6343,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -6363,7 +6365,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6422,7 +6424,7 @@ BEGIN */ ; END // -DELIMITER ;; +DELIMITER ; @@ -6444,7 +6446,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6519,7 +6521,7 @@ BEGIN WHERE NOT OLD.cost_unit_local_VAT_incl <=> NEW.cost_unit_local_VAT_incl ; END // -DELIMITER ;; +DELIMITER ; -- File: 3415_tri_Shop_Manufacturing_Purchase_Order.sql @@ -6544,7 +6546,7 @@ BEGIN SET MESSAGE_TEXT = 'Valid created by User ID must be provided.'; END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6593,7 +6595,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; -- File: 3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql @@ -6614,7 +6616,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6687,7 +6689,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -6709,7 +6711,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6762,7 +6764,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; @@ -6784,7 +6786,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6821,7 +6823,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; -- File: 3427_tri_Shop_Customer_Sales_Order_Product_Link.sql @@ -6842,7 +6844,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -6903,7 +6905,7 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; -- File: 6000_p_debug_timing_reporting.sql @@ -6943,7 +6945,7 @@ BEGIN ; END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_debug_timing_reporting ( @@ -7038,7 +7040,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -7080,7 +7082,7 @@ BEGIN COMMIT; END // -DELIMITER ;; +DELIMITER ; /* @@ -7128,7 +7130,7 @@ BEGIN ; END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -7147,9 +7149,9 @@ BEGIN DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; -CALL p_validate_guid_test(); +-- CALL p_validate_guid_test(); -- File: 6003_p_split_key_value_pair_csv.sql @@ -7244,7 +7246,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -7284,7 +7286,7 @@ BEGIN COMMIT; END // -DELIMITER ;; +DELIMITER ; /* @@ -7546,7 +7548,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; */ /* @@ -8297,7 +8299,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -8378,7 +8380,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -8433,7 +8435,7 @@ BEGIN ORDER BY AL.display_order ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8481,7 +8483,7 @@ BEGIN ORDER BY R.display_order ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8520,7 +8522,7 @@ BEGIN OR P.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8560,7 +8562,7 @@ BEGIN OR SL.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8610,7 +8612,7 @@ BEGIN ORDER BY C.display_order ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8651,7 +8653,7 @@ BEGIN OR UM.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* @@ -8990,7 +8992,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* select @@ -9085,7 +9087,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_category_test (); @@ -9130,7 +9132,7 @@ BEGIN END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -9498,7 +9500,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; @@ -9587,7 +9589,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_test (); @@ -10262,7 +10264,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -10784,7 +10786,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -11119,7 +11121,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_User; END // -DELIMITER ;; +DELIMITER ; /* @@ -11809,7 +11811,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -12044,7 +12046,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; CALL partsltd_prod.p_shop_save_product_permutation_test (); @@ -12423,7 +12425,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -13037,7 +13039,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; @@ -13200,7 +13202,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_variation_test (); @@ -13958,7 +13960,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -14628,7 +14630,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -14805,7 +14807,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; CALL partsltd_prod.p_shop_save_stock_item_test (); @@ -15773,7 +15775,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -16056,7 +16058,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_User; DROP TABLE IF EXISTS tmp_Shop_Product_Currency_Link; END // -DELIMITER ;; +DELIMITER ; /* @@ -16349,7 +16351,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; @@ -16849,7 +16851,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; @@ -17669,7 +17671,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_User; END // -DELIMITER ;; +DELIMITER ; /* @@ -18315,15 +18317,16 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; -- SELECT * FROM Shop_Supplier; - +/* delete from shop_supplier_audit where id_supplier = 9; delete from shop_supplier where id_supplier = 9; delete from shop_supplier_address_audit where id_address = -4; delete from shop_supplier_address where id_address = -4; +*/ -- File: 7400_p_shop_save_supplier_temp.sql @@ -18480,7 +18483,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_supplier_test (); @@ -18744,7 +18747,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -19597,7 +19600,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -19805,7 +19808,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_supplier_purchase_order_test (); @@ -20304,7 +20307,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -21285,7 +21288,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -21487,7 +21490,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_Manufacturing_purchase_order_test (); @@ -21886,7 +21889,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* @@ -22186,7 +22189,7 @@ BEGIN -- DROP TABLE tmp_Shop_Customer; DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; /* @@ -22471,7 +22474,7 @@ BEGIN WHERE GUID = v_guid ; END // -DELIMITER ;; +DELIMITER ; /* @@ -22982,7 +22985,7 @@ BEGIN DROP TABLE tmp_Shop_Customer_Sales_Order_Product_Link; DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; /* @@ -23789,7 +23792,7 @@ BEGIN WHERE GUID = v_guid ; END // -DELIMITER ;; +DELIMITER ; /* @@ -24957,7 +24960,7 @@ VALUES /* -- Clean up END // -DELIMITER ;; +DELIMITER ; -- Call diff --git a/static/MySQL/3000_tri_Shop_Access_Level.sql b/static/MySQL/3000_tri_Shop_Access_Level.sql index 2aac8eb1..4ffd740f 100644 --- a/static/MySQL/3000_tri_Shop_Access_Level.sql +++ b/static/MySQL/3000_tri_Shop_Access_Level.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -56,4 +56,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3000_tri_Shop_Product_Change_Set.sql b/static/MySQL/3000_tri_Shop_Product_Change_Set.sql index 9381df44..bc6ebc0b 100644 --- a/static/MySQL/3000_tri_Shop_Product_Change_Set.sql +++ b/static/MySQL/3000_tri_Shop_Product_Change_Set.sql @@ -17,4 +17,4 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3001_tri_Shop_User_Change_Set.sql b/static/MySQL/3001_tri_Shop_User_Change_Set.sql index afb0e726..8e20859f 100644 --- a/static/MySQL/3001_tri_Shop_User_Change_Set.sql +++ b/static/MySQL/3001_tri_Shop_User_Change_Set.sql @@ -18,4 +18,4 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql b/static/MySQL/3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql index 7c10bf4c..60f1abda 100644 --- a/static/MySQL/3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql +++ b/static/MySQL/3002_tri_Shop_Sales_And_Purchasing_Change_Set.sql @@ -17,4 +17,4 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3010_tri_File_Type.sql b/static/MySQL/3010_tri_File_Type.sql index 18176d0d..529c4def 100644 --- a/static/MySQL/3010_tri_File_Type.sql +++ b/static/MySQL/3010_tri_File_Type.sql @@ -14,7 +14,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type @@ -40,4 +40,4 @@ BEGIN WHERE NOT OLD.extension <=> NEW.extension ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3011_tri_File_Type_Audit.sql b/static/MySQL/3011_tri_File_Type_Audit.sql index e94ad6ea..4a198890 100644 --- a/static/MySQL/3011_tri_File_Type_Audit.sql +++ b/static/MySQL/3011_tri_File_Type_Audit.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type_Audit @@ -25,4 +25,4 @@ BEGIN SET NEW.updated_last_on = NOW(); SET NEW.updated_last_by = CURRENT_USER(); END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3012_tri_Shop_General.sql b/static/MySQL/3012_tri_Shop_General.sql index 8f98175e..aa8f4036 100644 --- a/static/MySQL/3012_tri_Shop_General.sql +++ b/static/MySQL/3012_tri_Shop_General.sql @@ -14,7 +14,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_General @@ -38,4 +38,4 @@ BEGIN WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3014_tri_Shop_Image_Type.sql b/static/MySQL/3014_tri_Shop_Image_Type.sql index 8b6d190e..fac5eeab 100644 --- a/static/MySQL/3014_tri_Shop_Image_Type.sql +++ b/static/MySQL/3014_tri_Shop_Image_Type.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -62,4 +62,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3100_tri_Shop_Region.sql b/static/MySQL/3100_tri_Shop_Region.sql index 40a4598c..cb759121 100644 --- a/static/MySQL/3100_tri_Shop_Region.sql +++ b/static/MySQL/3100_tri_Shop_Region.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3103_tri_Shop_Region_Branch.sql b/static/MySQL/3103_tri_Shop_Region_Branch.sql index 53dfc5d6..56dc6316 100644 --- a/static/MySQL/3103_tri_Shop_Region_Branch.sql +++ b/static/MySQL/3103_tri_Shop_Region_Branch.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -50,4 +50,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3106_tri_Shop_Address.sql b/static/MySQL/3106_tri_Shop_Address.sql index 30d2d987..2203be87 100644 --- a/static/MySQL/3106_tri_Shop_Address.sql +++ b/static/MySQL/3106_tri_Shop_Address.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -64,4 +64,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3109_tri_Shop_Storage_Location.sql b/static/MySQL/3109_tri_Shop_Storage_Location.sql index f004d3a9..17d0a810 100644 --- a/static/MySQL/3109_tri_Shop_Storage_Location.sql +++ b/static/MySQL/3109_tri_Shop_Storage_Location.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3115_tri_Shop_Currency.sql b/static/MySQL/3115_tri_Shop_Currency.sql index f540d7a7..c16d0f3c 100644 --- a/static/MySQL/3115_tri_Shop_Currency.sql +++ b/static/MySQL/3115_tri_Shop_Currency.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -60,4 +60,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql b/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql index 54215b15..cf56d456 100644 --- a/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql +++ b/static/MySQL/3118_tri_Shop_Tax_Or_Surcharge.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Tax_Or_Surcharge @@ -71,5 +71,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3200_tri_Shop_Category.sql b/static/MySQL/3200_tri_Shop_Category.sql index 051a98ec..3ae73e92 100644 --- a/static/MySQL/3200_tri_Shop_Category.sql +++ b/static/MySQL/3200_tri_Shop_Category.sql @@ -14,7 +14,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Product_Category @@ -58,4 +58,4 @@ BEGIN WHERE NOT OLD.id_access_level_required <=> NEW.id_access_level_required ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3203_tri_Shop_Product.sql b/static/MySQL/3203_tri_Shop_Product.sql index d302762d..596e1c60 100644 --- a/static/MySQL/3203_tri_Shop_Product.sql +++ b/static/MySQL/3203_tri_Shop_Product.sql @@ -16,7 +16,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -167,4 +167,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3206_tri_Shop_Product_Permutation.sql b/static/MySQL/3206_tri_Shop_Product_Permutation.sql index de1a23a4..c2bcbe9d 100644 --- a/static/MySQL/3206_tri_Shop_Product_Permutation.sql +++ b/static/MySQL/3206_tri_Shop_Product_Permutation.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -164,4 +164,4 @@ BEGIN */ ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3209_tri_Shop_Variation_Type.sql b/static/MySQL/3209_tri_Shop_Variation_Type.sql index d9e8774b..8a642c49 100644 --- a/static/MySQL/3209_tri_Shop_Variation_Type.sql +++ b/static/MySQL/3209_tri_Shop_Variation_Type.sql @@ -16,7 +16,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -57,4 +57,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3212_tri_Shop_Variation.sql b/static/MySQL/3212_tri_Shop_Variation.sql index a5e7c150..729a3858 100644 --- a/static/MySQL/3212_tri_Shop_Variation.sql +++ b/static/MySQL/3212_tri_Shop_Variation.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -60,4 +60,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql b/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql index b2bef410..f33a1448 100644 --- a/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql +++ b/static/MySQL/3215_tri_Shop_Product_Permutation_Variation_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -54,4 +54,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3218_tri_Shop_Stock_Item.sql b/static/MySQL/3218_tri_Shop_Stock_Item.sql index f88085fe..d5be86d9 100644 --- a/static/MySQL/3218_tri_Shop_Stock_Item.sql +++ b/static/MySQL/3218_tri_Shop_Stock_Item.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -88,4 +88,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3221_tri_Shop_Product_Price.sql b/static/MySQL/3221_tri_Shop_Product_Price.sql index f4d7b7e9..8dff41d5 100644 --- a/static/MySQL/3221_tri_Shop_Product_Price.sql +++ b/static/MySQL/3221_tri_Shop_Product_Price.sql @@ -25,7 +25,7 @@ BEGIN ); */ END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -84,4 +84,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3224_tri_Shop_Product_Image.sql b/static/MySQL/3224_tri_Shop_Product_Image.sql index 99520b72..09e437c2 100644 --- a/static/MySQL/3224_tri_Shop_Product_Image.sql +++ b/static/MySQL/3224_tri_Shop_Product_Image.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -70,4 +70,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3227_tri_Shop_Delivery_Option.sql b/static/MySQL/3227_tri_Shop_Delivery_Option.sql index b2a24adb..9876ac42 100644 --- a/static/MySQL/3227_tri_Shop_Delivery_Option.sql +++ b/static/MySQL/3227_tri_Shop_Delivery_Option.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -70,4 +70,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql b/static/MySQL/3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql index 9b7afe1f..ef098ba6 100644 --- a/static/MySQL/3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql +++ b/static/MySQL/3230_tri_Shop_Product_Permutation_Delivery_Option_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -76,4 +76,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3233_tri_Shop_Discount.sql b/static/MySQL/3233_tri_Shop_Discount.sql index dd9b504a..b0fdaa6f 100644 --- a/static/MySQL/3233_tri_Shop_Discount.sql +++ b/static/MySQL/3233_tri_Shop_Discount.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_Shop_Discount @@ -79,5 +79,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql b/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql index 58357d73..b32e6a91 100644 --- a/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql +++ b/static/MySQL/3236_tri_Shop_Discount_Region_Currency_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -50,4 +50,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3300_tri_Shop_Permission_Group.sql b/static/MySQL/3300_tri_Shop_Permission_Group.sql index b74a6b75..b62b526b 100644 --- a/static/MySQL/3300_tri_Shop_Permission_Group.sql +++ b/static/MySQL/3300_tri_Shop_Permission_Group.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3303_tri_Shop_Permission.sql b/static/MySQL/3303_tri_Shop_Permission.sql index 33bd3c89..2aee47bc 100644 --- a/static/MySQL/3303_tri_Shop_Permission.sql +++ b/static/MySQL/3303_tri_Shop_Permission.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -60,4 +60,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3306_tri_Shop_Role.sql b/static/MySQL/3306_tri_Shop_Role.sql index 20402a15..15b5b37c 100644 --- a/static/MySQL/3306_tri_Shop_Role.sql +++ b/static/MySQL/3306_tri_Shop_Role.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql b/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql index c6fb897c..88462337 100644 --- a/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql +++ b/static/MySQL/3309_tri_Shop_Role_Permission_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -54,4 +54,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3312_tri_Shop_User.sql b/static/MySQL/3312_tri_Shop_User.sql index cfc67e99..f177d575 100644 --- a/static/MySQL/3312_tri_Shop_User.sql +++ b/static/MySQL/3312_tri_Shop_User.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -76,4 +76,4 @@ BEGIN WHERE NOT (OLD.is_included_VAT_default <=> NEW.is_included_VAT_default) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3315_tri_Shop_User_Role_Link.sql b/static/MySQL/3315_tri_Shop_User_Role_Link.sql index 904ee0d5..8dba1966 100644 --- a/static/MySQL/3315_tri_Shop_User_Role_Link.sql +++ b/static/MySQL/3315_tri_Shop_User_Role_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -40,4 +40,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3318_tri_Shop_User_Address.sql b/static/MySQL/3318_tri_Shop_User_Address.sql index 99420d98..0399c237 100644 --- a/static/MySQL/3318_tri_Shop_User_Address.sql +++ b/static/MySQL/3318_tri_Shop_User_Address.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -72,4 +72,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3321_tri_Shop_User_Basket.sql b/static/MySQL/3321_tri_Shop_User_Basket.sql index 7a20a6c9..b7806eab 100644 --- a/static/MySQL/3321_tri_Shop_User_Basket.sql +++ b/static/MySQL/3321_tri_Shop_User_Basket.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3324_tri_Shop_User_Order_Status.sql b/static/MySQL/3324_tri_Shop_User_Order_Status.sql index 4c40cd6a..f27d1a09 100644 --- a/static/MySQL/3324_tri_Shop_User_Order_Status.sql +++ b/static/MySQL/3324_tri_Shop_User_Order_Status.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -56,4 +56,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3400_tri_Shop_Supplier.sql b/static/MySQL/3400_tri_Shop_Supplier.sql index 229400c9..da319922 100644 --- a/static/MySQL/3400_tri_Shop_Supplier.sql +++ b/static/MySQL/3400_tri_Shop_Supplier.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -78,4 +78,4 @@ BEGIN WHERE NOT OLD.id_supplier_temp <=> NEW.id_supplier_temp ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3403_tri_Shop_Supplier_Address.sql b/static/MySQL/3403_tri_Shop_Supplier_Address.sql index 93315302..7c36b930 100644 --- a/static/MySQL/3403_tri_Shop_Supplier_Address.sql +++ b/static/MySQL/3403_tri_Shop_Supplier_Address.sql @@ -13,7 +13,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -62,4 +62,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/3403_tri_Shop_Unit_Measurement.sql b/static/MySQL/3403_tri_Shop_Unit_Measurement.sql index 382523f4..b25da068 100644 --- a/static/MySQL/3403_tri_Shop_Unit_Measurement.sql +++ b/static/MySQL/3403_tri_Shop_Unit_Measurement.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -72,5 +72,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql b/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql index f9109286..7116aab2 100644 --- a/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql +++ b/static/MySQL/3406_tri_Shop_Unit_Of_Measurement_Conversion.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -60,5 +60,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql b/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql index bf1d7bfe..697a0d1c 100644 --- a/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql +++ b/static/MySQL/3409_tri_Shop_Supplier_Purchase_Order.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -74,5 +74,5 @@ BEGIN */ ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql b/static/MySQL/3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql index 61749642..65cea58d 100644 --- a/static/MySQL/3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql +++ b/static/MySQL/3412_tri_Shop_Supplier_Purchase_Order_Product_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -90,4 +90,4 @@ BEGIN WHERE NOT OLD.cost_unit_local_VAT_incl <=> NEW.cost_unit_local_VAT_incl ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql b/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql index 024e7180..96035278 100644 --- a/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql +++ b/static/MySQL/3415_tri_Shop_Manufacturing_Purchase_Order.sql @@ -19,7 +19,7 @@ BEGIN SET MESSAGE_TEXT = 'Valid created by User ID must be provided.'; END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -68,4 +68,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql b/static/MySQL/3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql index b51277f9..f3ee5a5f 100644 --- a/static/MySQL/3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql +++ b/static/MySQL/3418_tri_Shop_Manufacturing_Purchase_Order_Product_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -88,5 +88,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3421_tri_Shop_Customer.sql b/static/MySQL/3421_tri_Shop_Customer.sql index 13757770..92d9a2ec 100644 --- a/static/MySQL/3421_tri_Shop_Customer.sql +++ b/static/MySQL/3421_tri_Shop_Customer.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -68,5 +68,5 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql b/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql index e773a121..9c4f83bd 100644 --- a/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql +++ b/static/MySQL/3424_tri_Shop_Customer_Sales_Order.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/3427_tri_Shop_Customer_Sales_Order_Product_Link.sql b/static/MySQL/3427_tri_Shop_Customer_Sales_Order_Product_Link.sql index c291aa10..f9de8566 100644 --- a/static/MySQL/3427_tri_Shop_Customer_Sales_Order_Product_Link.sql +++ b/static/MySQL/3427_tri_Shop_Customer_Sales_Order_Product_Link.sql @@ -15,7 +15,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -76,4 +76,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/6000_p_debug_timing_reporting.sql b/static/MySQL/6000_p_debug_timing_reporting.sql index 2e1b4dba..e96935ef 100644 --- a/static/MySQL/6000_p_debug_timing_reporting.sql +++ b/static/MySQL/6000_p_debug_timing_reporting.sql @@ -34,7 +34,7 @@ BEGIN ; END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_debug_timing_reporting ( diff --git a/static/MySQL/6000_p_split.sql b/static/MySQL/6000_p_split.sql index 33fbcfe7..6df8e674 100644 --- a/static/MySQL/6000_p_split.sql +++ b/static/MySQL/6000_p_split.sql @@ -84,7 +84,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6001_p_clear_split_temp.sql b/static/MySQL/6001_p_clear_split_temp.sql index ffd0ce5b..0894de9f 100644 --- a/static/MySQL/6001_p_clear_split_temp.sql +++ b/static/MySQL/6001_p_clear_split_temp.sql @@ -19,7 +19,7 @@ BEGIN COMMIT; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6001_p_validate_guid.sql b/static/MySQL/6001_p_validate_guid.sql index 3c14f63f..7a6cb0fc 100644 --- a/static/MySQL/6001_p_validate_guid.sql +++ b/static/MySQL/6001_p_validate_guid.sql @@ -35,7 +35,7 @@ BEGIN ; END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -54,6 +54,6 @@ BEGIN DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; -CALL p_validate_guid_test(); \ No newline at end of file +-- CALL p_validate_guid_test(); \ No newline at end of file diff --git a/static/MySQL/6003_p_split_key_value_pair_csv.sql b/static/MySQL/6003_p_split_key_value_pair_csv.sql index bacbb427..4699e311 100644 --- a/static/MySQL/6003_p_split_key_value_pair_csv.sql +++ b/static/MySQL/6003_p_split_key_value_pair_csv.sql @@ -90,7 +90,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql b/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql index 3ab910cf..0ad0fbb2 100644 --- a/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql +++ b/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql @@ -19,7 +19,7 @@ BEGIN COMMIT; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql b/static/MySQL/6210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql index a31b0b8d..bbf6cd10 100644 --- a/static/MySQL/6210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql +++ b/static/MySQL/6210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql @@ -203,7 +203,7 @@ BEGIN CALL p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; */ /* diff --git a/static/MySQL/6500_p_shop_calc_user.sql b/static/MySQL/6500_p_shop_calc_user.sql index 91f4421f..261df4f3 100644 --- a/static/MySQL/6500_p_shop_calc_user.sql +++ b/static/MySQL/6500_p_shop_calc_user.sql @@ -574,7 +574,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/6501_p_shop_clear_calc_user.sql b/static/MySQL/6501_p_shop_clear_calc_user.sql index f0bf33d0..3326cd8a 100644 --- a/static/MySQL/6501_p_shop_clear_calc_user.sql +++ b/static/MySQL/6501_p_shop_clear_calc_user.sql @@ -28,7 +28,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7003_p_shop_get_many_access_level.sql b/static/MySQL/7003_p_shop_get_many_access_level.sql index b29a0438..7a4534dd 100644 --- a/static/MySQL/7003_p_shop_get_many_access_level.sql +++ b/static/MySQL/7003_p_shop_get_many_access_level.sql @@ -35,7 +35,7 @@ BEGIN ORDER BY AL.display_order ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7101_p_shop_get_many_region.sql b/static/MySQL/7101_p_shop_get_many_region.sql index 60fe2d79..fc9f6f2c 100644 --- a/static/MySQL/7101_p_shop_get_many_region.sql +++ b/static/MySQL/7101_p_shop_get_many_region.sql @@ -35,7 +35,7 @@ BEGIN ORDER BY R.display_order ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7106_p_shop_get_many_plant.sql b/static/MySQL/7106_p_shop_get_many_plant.sql index 7f6775c9..55a7a012 100644 --- a/static/MySQL/7106_p_shop_get_many_plant.sql +++ b/static/MySQL/7106_p_shop_get_many_plant.sql @@ -26,7 +26,7 @@ BEGIN OR P.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7109_p_shop_get_many_storage_location.sql b/static/MySQL/7109_p_shop_get_many_storage_location.sql index 35967c0e..8c0b38b1 100644 --- a/static/MySQL/7109_p_shop_get_many_storage_location.sql +++ b/static/MySQL/7109_p_shop_get_many_storage_location.sql @@ -27,7 +27,7 @@ BEGIN OR SL.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7116_p_shop_get_many_currency.sql b/static/MySQL/7116_p_shop_get_many_currency.sql index 29c99957..677d7d71 100644 --- a/static/MySQL/7116_p_shop_get_many_currency.sql +++ b/static/MySQL/7116_p_shop_get_many_currency.sql @@ -37,7 +37,7 @@ BEGIN ORDER BY C.display_order ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7122_p_shop_get_many_unit_measurement.sql b/static/MySQL/7122_p_shop_get_many_unit_measurement.sql index 4beb7a25..07506a45 100644 --- a/static/MySQL/7122_p_shop_get_many_unit_measurement.sql +++ b/static/MySQL/7122_p_shop_get_many_unit_measurement.sql @@ -28,7 +28,7 @@ BEGIN OR UM.active = 1 ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7200_p_shop_save_product_category.sql b/static/MySQL/7200_p_shop_save_product_category.sql index a14f69fa..3dbe034b 100644 --- a/static/MySQL/7200_p_shop_save_product_category.sql +++ b/static/MySQL/7200_p_shop_save_product_category.sql @@ -323,7 +323,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* select diff --git a/static/MySQL/7200_p_shop_save_product_category_test.sql b/static/MySQL/7200_p_shop_save_product_category_test.sql index 1ffa0c53..dc02a329 100644 --- a/static/MySQL/7200_p_shop_save_product_category_test.sql +++ b/static/MySQL/7200_p_shop_save_product_category_test.sql @@ -64,7 +64,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_category_test (); diff --git a/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql b/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql index f5e22447..8c04906e 100644 --- a/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql +++ b/static/MySQL/7202_p_shop_clear_calc_product_permutation.sql @@ -31,7 +31,7 @@ BEGIN END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7203_p_shop_save_product.sql b/static/MySQL/7203_p_shop_save_product.sql index 01ff95c7..b1489e03 100644 --- a/static/MySQL/7203_p_shop_save_product.sql +++ b/static/MySQL/7203_p_shop_save_product.sql @@ -344,5 +344,5 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/7203_p_shop_save_product_test.sql b/static/MySQL/7203_p_shop_save_product_test.sql index 23302e15..e176ef9e 100644 --- a/static/MySQL/7203_p_shop_save_product_test.sql +++ b/static/MySQL/7203_p_shop_save_product_test.sql @@ -82,7 +82,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_test (); diff --git a/static/MySQL/7204_p_shop_calc_product_permutation.sql b/static/MySQL/7204_p_shop_calc_product_permutation.sql index e54a7447..9c00413c 100644 --- a/static/MySQL/7204_p_shop_calc_product_permutation.sql +++ b/static/MySQL/7204_p_shop_calc_product_permutation.sql @@ -662,7 +662,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7204_p_shop_get_many_product.sql b/static/MySQL/7204_p_shop_get_many_product.sql index 684e1da1..a4ec9d05 100644 --- a/static/MySQL/7204_p_shop_get_many_product.sql +++ b/static/MySQL/7204_p_shop_get_many_product.sql @@ -467,7 +467,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7205_p_shop_get_many_stripe_product_new.sql b/static/MySQL/7205_p_shop_get_many_stripe_product_new.sql index 2efdf058..ce89033d 100644 --- a/static/MySQL/7205_p_shop_get_many_stripe_product_new.sql +++ b/static/MySQL/7205_p_shop_get_many_stripe_product_new.sql @@ -277,7 +277,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_User; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7206_p_shop_save_product_permutation.sql b/static/MySQL/7206_p_shop_save_product_permutation.sql index 51a3e326..720006ae 100644 --- a/static/MySQL/7206_p_shop_save_product_permutation.sql +++ b/static/MySQL/7206_p_shop_save_product_permutation.sql @@ -657,7 +657,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7206_p_shop_save_product_permutation_test.sql b/static/MySQL/7206_p_shop_save_product_permutation_test.sql index cfa06e27..4d61f29e 100644 --- a/static/MySQL/7206_p_shop_save_product_permutation_test.sql +++ b/static/MySQL/7206_p_shop_save_product_permutation_test.sql @@ -145,7 +145,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; CALL partsltd_prod.p_shop_save_product_permutation_test (); diff --git a/static/MySQL/7210_p_shop_get_many_product_variation.sql b/static/MySQL/7210_p_shop_get_many_product_variation.sql index 73f75288..572e434c 100644 --- a/static/MySQL/7210_p_shop_get_many_product_variation.sql +++ b/static/MySQL/7210_p_shop_get_many_product_variation.sql @@ -351,7 +351,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7212_p_shop_save_product_variation.sql b/static/MySQL/7212_p_shop_save_product_variation.sql index 71be42eb..0d7523c9 100644 --- a/static/MySQL/7212_p_shop_save_product_variation.sql +++ b/static/MySQL/7212_p_shop_save_product_variation.sql @@ -546,6 +546,6 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/7212_p_shop_save_product_variation_test.sql b/static/MySQL/7212_p_shop_save_product_variation_test.sql index 45093ac4..baca42e2 100644 --- a/static/MySQL/7212_p_shop_save_product_variation_test.sql +++ b/static/MySQL/7212_p_shop_save_product_variation_test.sql @@ -155,7 +155,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_product_variation_test (); diff --git a/static/MySQL/7219_p_shop_get_many_stock_item.sql b/static/MySQL/7219_p_shop_get_many_stock_item.sql index 06bd6d32..6006fbd0 100644 --- a/static/MySQL/7219_p_shop_get_many_stock_item.sql +++ b/static/MySQL/7219_p_shop_get_many_stock_item.sql @@ -725,7 +725,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7220_p_shop_save_stock_item.sql b/static/MySQL/7220_p_shop_save_stock_item.sql index 38140a41..c62bdbb0 100644 --- a/static/MySQL/7220_p_shop_save_stock_item.sql +++ b/static/MySQL/7220_p_shop_save_stock_item.sql @@ -617,7 +617,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7220_p_shop_save_stock_item_test.sql b/static/MySQL/7220_p_shop_save_stock_item_test.sql index 99d0834d..0f03f955 100644 --- a/static/MySQL/7220_p_shop_save_stock_item_test.sql +++ b/static/MySQL/7220_p_shop_save_stock_item_test.sql @@ -89,7 +89,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; CALL partsltd_prod.p_shop_save_stock_item_test (); diff --git a/static/MySQL/7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql b/static/MySQL/7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql index 0def7981..cf12c6b5 100644 --- a/static/MySQL/7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql +++ b/static/MySQL/7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql @@ -954,7 +954,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7223_p_shop_get_many_stripe_price_new.sql b/static/MySQL/7223_p_shop_get_many_stripe_price_new.sql index c8f1b35f..d5b6b9c6 100644 --- a/static/MySQL/7223_p_shop_get_many_stripe_price_new.sql +++ b/static/MySQL/7223_p_shop_get_many_stripe_price_new.sql @@ -228,7 +228,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_User; DROP TABLE IF EXISTS tmp_Shop_Product_Currency_Link; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7312_p_shop_save_user.sql b/static/MySQL/7312_p_shop_save_user.sql index ae4e3a9c..cff747c6 100644 --- a/static/MySQL/7312_p_shop_save_user.sql +++ b/static/MySQL/7312_p_shop_save_user.sql @@ -275,5 +275,5 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/7313_p_get_many_user.sql b/static/MySQL/7313_p_get_many_user.sql index 61d10ba1..62708fa5 100644 --- a/static/MySQL/7313_p_get_many_user.sql +++ b/static/MySQL/7313_p_get_many_user.sql @@ -493,7 +493,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/7321_p_shop_save_user_basket.sql b/static/MySQL/7321_p_shop_save_user_basket.sql index 30ebf728..0b1d91f5 100644 --- a/static/MySQL/7321_p_shop_save_user_basket.sql +++ b/static/MySQL/7321_p_shop_save_user_basket.sql @@ -772,7 +772,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_User; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7400_p_shop_save_supplier.sql b/static/MySQL/7400_p_shop_save_supplier.sql index 54ef9432..6b1c0038 100644 --- a/static/MySQL/7400_p_shop_save_supplier.sql +++ b/static/MySQL/7400_p_shop_save_supplier.sql @@ -585,12 +585,13 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; -- SELECT * FROM Shop_Supplier; - +/* delete from shop_supplier_audit where id_supplier = 9; delete from shop_supplier where id_supplier = 9; delete from shop_supplier_address_audit where id_address = -4; -delete from shop_supplier_address where id_address = -4; \ No newline at end of file +delete from shop_supplier_address where id_address = -4; +*/ \ No newline at end of file diff --git a/static/MySQL/7400_p_shop_save_supplier_temp.sql b/static/MySQL/7400_p_shop_save_supplier_temp.sql index fd3d2301..cb6a6331 100644 --- a/static/MySQL/7400_p_shop_save_supplier_temp.sql +++ b/static/MySQL/7400_p_shop_save_supplier_temp.sql @@ -152,7 +152,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_supplier_test (); diff --git a/static/MySQL/7401_p_shop_get_many_supplier.sql b/static/MySQL/7401_p_shop_get_many_supplier.sql index d8c1d90f..490de0df 100644 --- a/static/MySQL/7401_p_shop_get_many_supplier.sql +++ b/static/MySQL/7401_p_shop_get_many_supplier.sql @@ -247,7 +247,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql b/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql index 70626d08..888f75a6 100644 --- a/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql +++ b/static/MySQL/7403_p_shop_save_supplier_purchase_order.sql @@ -835,7 +835,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7403_p_shop_save_supplier_purchase_order_test.sql b/static/MySQL/7403_p_shop_save_supplier_purchase_order_test.sql index 2f49dec4..f7d73755 100644 --- a/static/MySQL/7403_p_shop_save_supplier_purchase_order_test.sql +++ b/static/MySQL/7403_p_shop_save_supplier_purchase_order_test.sql @@ -140,7 +140,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_supplier_purchase_order_test (); diff --git a/static/MySQL/7404_p_shop_get_many_supplier_purchase_order.sql b/static/MySQL/7404_p_shop_get_many_supplier_purchase_order.sql index 813896fc..a1091306 100644 --- a/static/MySQL/7404_p_shop_get_many_supplier_purchase_order.sql +++ b/static/MySQL/7404_p_shop_get_many_supplier_purchase_order.sql @@ -482,7 +482,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7415_p_shop_save_Manufacturing_purchase_order_test.sql b/static/MySQL/7415_p_shop_save_Manufacturing_purchase_order_test.sql index 447ea810..9753d993 100644 --- a/static/MySQL/7415_p_shop_save_Manufacturing_purchase_order_test.sql +++ b/static/MySQL/7415_p_shop_save_Manufacturing_purchase_order_test.sql @@ -135,7 +135,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // -DELIMITER ;; +DELIMITER ; /* CALL partsltd_prod.p_shop_save_Manufacturing_purchase_order_test (); diff --git a/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql b/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql index 8fc74219..a196775e 100644 --- a/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql +++ b/static/MySQL/7415_p_shop_save_manufacturing_purchase_order.sql @@ -956,7 +956,7 @@ BEGIN CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7416_p_shop_get_many_manufacturing_purchase_order.sql b/static/MySQL/7416_p_shop_get_many_manufacturing_purchase_order.sql index edee8283..25051169 100644 --- a/static/MySQL/7416_p_shop_get_many_manufacturing_purchase_order.sql +++ b/static/MySQL/7416_p_shop_get_many_manufacturing_purchase_order.sql @@ -382,7 +382,7 @@ BEGIN CALL p_debug_timing_reporting( v_time_start ); END IF; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7421_p_shop_save_customer.sql b/static/MySQL/7421_p_shop_save_customer.sql index 86b46279..cc93f1f7 100644 --- a/static/MySQL/7421_p_shop_save_customer.sql +++ b/static/MySQL/7421_p_shop_save_customer.sql @@ -271,7 +271,7 @@ BEGIN -- DROP TABLE tmp_Shop_Customer; DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7422_p_shop_get_many_customer.sql b/static/MySQL/7422_p_shop_get_many_customer.sql index db41c932..17611391 100644 --- a/static/MySQL/7422_p_shop_get_many_customer.sql +++ b/static/MySQL/7422_p_shop_get_many_customer.sql @@ -253,7 +253,7 @@ BEGIN WHERE GUID = v_guid ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7424_p_shop_save_customer_sales_order.sql b/static/MySQL/7424_p_shop_save_customer_sales_order.sql index a7f8e1e7..dce5883c 100644 --- a/static/MySQL/7424_p_shop_save_customer_sales_order.sql +++ b/static/MySQL/7424_p_shop_save_customer_sales_order.sql @@ -490,7 +490,7 @@ BEGIN DROP TABLE tmp_Shop_Customer_Sales_Order_Product_Link; DROP TABLE tmp_Msg_Error; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/7425_p_shop_get_many_customer_sales_order.sql b/static/MySQL/7425_p_shop_get_many_customer_sales_order.sql index 18d48cb7..4c55eb7e 100644 --- a/static/MySQL/7425_p_shop_get_many_customer_sales_order.sql +++ b/static/MySQL/7425_p_shop_get_many_customer_sales_order.sql @@ -737,7 +737,7 @@ BEGIN WHERE GUID = v_guid ; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/9000_populate.sql b/static/MySQL/9000_populate.sql index e5f29ab0..60e05e1b 100644 --- a/static/MySQL/9000_populate.sql +++ b/static/MySQL/9000_populate.sql @@ -1126,7 +1126,7 @@ VALUES /* -- Clean up END // -DELIMITER ;; +DELIMITER ; -- Call diff --git a/static/MySQL/deprecated/000_init_tables_authentication.sql b/static/MySQL/deprecated/000_init_tables_authentication.sql index 6aa48bcf..9acee9ce 100644 --- a/static/MySQL/deprecated/000_init_tables_authentication.sql +++ b/static/MySQL/deprecated/000_init_tables_authentication.sql @@ -54,7 +54,7 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; SELECT * FROM Shop_User_Change_Set; @@ -88,7 +88,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Access_Level_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -135,7 +135,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Access_Level ( display_order, code, name, priority @@ -179,7 +179,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Permission_Group_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -223,7 +223,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Permission_Group ( display_order, code, name @@ -273,7 +273,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Permission_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -325,7 +325,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Permission ( display_order, code, name, id_permission_group, required_access_level @@ -368,7 +368,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Role_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -412,7 +412,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Role ( display_order, @@ -468,7 +468,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Role_Permission_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -516,7 +516,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Role_Permission_Link ( id_role, id_permission, id_access_level @@ -561,7 +561,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_User_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -605,7 +605,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_User ( name, @@ -655,7 +655,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_User_Role_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -691,7 +691,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_User_Role_Link ( id_user, id_role @@ -742,7 +742,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Address_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -810,7 +810,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Address ( id_user, region, name_full, phone_number, postcode, address_line_1, address_line_2, city, county diff --git a/static/MySQL/deprecated/000_init_tables_product.sql b/static/MySQL/deprecated/000_init_tables_product.sql index 214fb6ac..31fa9bb9 100644 --- a/static/MySQL/deprecated/000_init_tables_product.sql +++ b/static/MySQL/deprecated/000_init_tables_product.sql @@ -72,7 +72,7 @@ BEGIN SET NEW.updated_last_by = CURRENT_USER(); END IF; END // -DELIMITER ;; +DELIMITER ; SELECT * FROM Shop_Product_Change_Set; @@ -98,7 +98,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE File_Type_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -124,7 +124,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type_Audit @@ -134,7 +134,7 @@ BEGIN SET NEW.updated_last_on = NOW(); SET NEW.updated_last_by = CURRENT_USER(); END // -DELIMITER ;; +DELIMITER ; DELIMITER // CREATE TRIGGER before_update_File_Type @@ -160,7 +160,7 @@ BEGIN WHERE NOT OLD.extension <=> NEW.extension ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO File_Type ( code, name, extension @@ -197,7 +197,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_General_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -232,7 +232,7 @@ BEGIN WHERE NOT OLD.quantity_max <=> NEW.quantity_max ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_General ( quantity_max @@ -270,7 +270,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Category_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -321,7 +321,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product_Category ( display_order, @@ -363,7 +363,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Interval_Recurrence_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -406,7 +406,7 @@ BEGIN WHERE NOT OLD.name_plural <=> NEW.name_plural ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Interval_Recurrence ( code, name, name_plural @@ -464,7 +464,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -559,7 +559,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product ( display_order, @@ -613,7 +613,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Variation_Type_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -664,7 +664,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Variation_Type ( display_order, code, name, name_plural @@ -706,7 +706,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Variation_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -753,7 +753,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Variation ( display_order, id_type, code, name @@ -802,7 +802,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Variation_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -850,7 +850,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product_Variation_Link ( display_order, id_product, id_variation @@ -888,7 +888,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Image_Type_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -939,7 +939,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Image_Type ( display_order, code, name, name_plural @@ -985,7 +985,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Image_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1035,7 +1035,7 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Image ( display_order, id_product, id_type, url @@ -1083,7 +1083,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Image_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1129,7 +1129,7 @@ BEGIN ) ); END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product_Image_Link ( id_product, id_image @@ -1170,7 +1170,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Delivery_Option_Type_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1233,7 +1233,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Delivery_Option_Type ( display_order, code, name, latency_delivery_min, latency_delivery_max, quantity_min, quantity_max @@ -1283,7 +1283,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Delivery_Option_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1331,7 +1331,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Delivery_Option ( id_product, id_delivery_type, price_GBP @@ -1368,7 +1368,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Delivery_Region_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1415,7 +1415,7 @@ BEGIN WHERE NOT OLD.display_order <=> NEW.display_order ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Delivery_Region ( display_order, code, name @@ -1463,7 +1463,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; CREATE TABLE Shop_Product_Delivery_Region_Link_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -1507,7 +1507,7 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; INSERT INTO Shop_Product_Delivery_Region_Link ( id_product, id_region diff --git a/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql b/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql index 32f479ae..92e65558 100644 --- a/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql +++ b/static/MySQL/deprecated/308_tri_Shop_Recurrence_Interval.sql @@ -16,7 +16,7 @@ BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -53,4 +53,4 @@ BEGIN WHERE NOT OLD.active <=> NEW.active ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/313.1_tri_Shop_Product_Variation_Type_Link.sql b/static/MySQL/deprecated/313.1_tri_Shop_Product_Variation_Type_Link.sql index b5c14ee5..b035334c 100644 --- a/static/MySQL/deprecated/313.1_tri_Shop_Product_Variation_Type_Link.sql +++ b/static/MySQL/deprecated/313.1_tri_Shop_Product_Variation_Type_Link.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -58,4 +58,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql b/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql index 50dbcb62..434dbde0 100644 --- a/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql +++ b/static/MySQL/deprecated/316_tri_Shop_Product_Variation_Link.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -58,4 +58,4 @@ BEGIN WHERE NOT (OLD.display_order <=> NEW.display_order) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/322_tri_Shop_Price.sql b/static/MySQL/deprecated/322_tri_Shop_Price.sql index 277ca4e6..9180ab20 100644 --- a/static/MySQL/deprecated/322_tri_Shop_Price.sql +++ b/static/MySQL/deprecated/322_tri_Shop_Price.sql @@ -29,7 +29,7 @@ BEGIN ); */ END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -90,4 +90,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/deprecated/328_tri_Shop_Product_Delivery_Region_Link.sql b/static/MySQL/deprecated/328_tri_Shop_Product_Delivery_Region_Link.sql index c14e165b..45647958 100644 --- a/static/MySQL/deprecated/328_tri_Shop_Product_Delivery_Region_Link.sql +++ b/static/MySQL/deprecated/328_tri_Shop_Product_Delivery_Region_Link.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -54,4 +54,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/371_tri_Shop_User_Order.sql b/static/MySQL/deprecated/371_tri_Shop_User_Order.sql index cbfc2987..0fcda7c1 100644 --- a/static/MySQL/deprecated/371_tri_Shop_User_Order.sql +++ b/static/MySQL/deprecated/371_tri_Shop_User_Order.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -64,4 +64,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/373_tri_Shop_User_Order_Product_Link.sql b/static/MySQL/deprecated/373_tri_Shop_User_Order_Product_Link.sql index 16a324fd..d9229e5a 100644 --- a/static/MySQL/deprecated/373_tri_Shop_User_Order_Product_Link.sql +++ b/static/MySQL/deprecated/373_tri_Shop_User_Order_Product_Link.sql @@ -19,7 +19,7 @@ BEGIN SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); END IF; END // -DELIMITER ;; +DELIMITER ; DELIMITER // @@ -52,4 +52,4 @@ BEGIN WHERE NOT (OLD.active <=> NEW.active) ; END // -DELIMITER ;; \ No newline at end of file +DELIMITER ; \ No newline at end of file diff --git a/static/MySQL/deprecated/7000_p_shop_get_many_role_permission.sql b/static/MySQL/deprecated/7000_p_shop_get_many_role_permission.sql index 19ae066a..0352273e 100644 --- a/static/MySQL/deprecated/7000_p_shop_get_many_role_permission.sql +++ b/static/MySQL/deprecated/7000_p_shop_get_many_role_permission.sql @@ -127,5 +127,5 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Product; DROP TABLE IF EXISTS tmp_Shop_Image; END // -DELIMITER ;; +DELIMITER ; diff --git a/static/MySQL/deprecated/7000_p_shop_get_many_user_order.sql b/static/MySQL/deprecated/7000_p_shop_get_many_user_order.sql index 207846c1..33c37952 100644 --- a/static/MySQL/deprecated/7000_p_shop_get_many_user_order.sql +++ b/static/MySQL/deprecated/7000_p_shop_get_many_user_order.sql @@ -255,7 +255,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_User; DROP TABLE IF EXISTS tmp_Shop_Order; END // -DELIMITER ;; +DELIMITER ; /* diff --git a/static/MySQL/deprecated/706_p_shop_get_product.sql b/static/MySQL/deprecated/706_p_shop_get_product.sql index 6f7c0c86..fc8526c7 100644 --- a/static/MySQL/deprecated/706_p_shop_get_product.sql +++ b/static/MySQL/deprecated/706_p_shop_get_product.sql @@ -633,7 +633,7 @@ BEGIN DROP TABLE IF EXISTS tmp_Shop_Variation; DROP TABLE IF EXISTS tmp_Shop_Product; END // -DELIMITER ;; +DELIMITER ;