From be964054831c41f2995b570f533e3f9820ee31da Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 17 Sep 2015 12:46:54 +0200 Subject: [PATCH] =?utf8?q?fixed=20SQL=20file=20+=20updated=20jar=20Signed-?= =?utf8?q?off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- PizzaService-ejb/lib/jcore.jar | Bin 28035 -> 28883 bytes PizzaService-ejb/lib/jshop-core.jar | Bin 35026 -> 34290 bytes install/install.sql | 25 ++++++++++++++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar index 4426c96e512eef4eac4d14f9f802bb47fc8361a4..107bb124479ac807cac4bf7d732d29970746d24a 100644 GIT binary patch delta 1926 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 Q{{PuoS(&vyoj3aa7dFR6b^rhX diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar index a083ae73fb6a802a6096aa005b1667798a7c6107..f6c7a42c1a6a25ccd13a8375e60645abacf2254c 100644 GIT binary patch delta 1783 zcmZ`)drVVT82{Zz?=9t4N@3+umCC~*poRK?;V4BYlt%@u6FWpKr5Le1w8gQ36cEuw zlW9(7_Q>M07`J49>|wS+7M+QS$&zi!9%eK9dt0(Uwz>UdvWNTbxoE<&-R7L%_dehG z&N*MdyeR&5PPBHlOR@zp13wN{U9^@;KM>Shl63Bi0uH~I>cG|u9*!@HrEFG8U+u}5 zP{XyK3-ugrV#5l$*`WqAJ11IJyz4lAEBZJ(rCJ@Y?U#yWPNdWxkrQ{*LI&a1zLB^j z%{F4#Je&QgAqnJuZxEGhe>IGY3bL)-xV9o`sNQvF7{o2lZ8KM$-+4peM6m9@;T7<` zDXgJ1TCS+3Q}-0$p2Gfa2=otG;J|hjJItuIKtzohPo$$3J1uw;b&Bu)F!WF7yo&F6 zALq=dSK+gu0lO?{L{mEaXx66|eF~(b6>TcoRdg_KWi!id>~?G_?HG=nh`1BS;_k+= z(a~5md1P#qRXH8(>qb8tZ0g@>8jl=LRtXT=1aR6Tz#2+MqDO;~@x76OcuYl5#cmay z0xbT?Xlz`Mkx*cco(#p30_4%yWD*NCgQ;JQLMgjUz zhH|Q1Asu)HQ3^JbS01E{2e3m?u|wb;ceqxF0> z<<^5R)3ni&eABx)pFiVduT2|G?9Oz6%UmZrIUYaR&GGgM=FbEX0X|KEM7_jK5$w<=|*zWg%@&_@l`_u+SCZc8ikEx35w_3qZ#!48G3S>zRF>lU42 zcaYt57qAO`W@g)CVnd5|zVsBSQsEU<23wpr#NUxPr=N>$Ic9bSxl$z6ZQ1n6Vi rD%aw1=1S~f;j zt;Sn4?TJmRF&d**eX&i|mQ=0A#Q2~l?St9}6BBQVz8Hm`NZG(x?#F?D)o&R$F z|IByJ%s<~hBwju$<_z>o1}k6&S|;5`bIK(TLEUjllP<01@I$!cSlETwj^eO=nzr`rw_Kcg@`NaKoDdAM`c; ztk3H5yddP#GCD7R(bI9s0$j4NKU%u7hpkwHW*HtcTC5P!YDSxkb}PK-u%Q!OW^|j; zV?!@|GWx7g&}_v<^qV|Ck3+jOX~2q27}ShIW^6Wj9`!7m6l^hLs}^XR4cjrSbvv|f zrwzNX+m=K99y9zhMq~t7le>d`+q!AX-g4h~U^3uJ?vJ?I;<1<-N`>RG246fe=88^* z_6A~Os%tzHPpGOIiI0t`30F`J#FDN^JQRpf&s9DStz__NYF1scob7G%cA0d$fad=h z@TIokEjdG}KxkiIU}AG17*S;eWrSqhEx_uX3aJy?x|1?g*4bVvt;ISP7+jal)feCh zCmpeLB%)v~Mg=sCsWCMXNU3eXREY)iaJNM_Y@} z=WSmjAfFQ!A!c0t!Equ?#+ZV=2+J5(uun^1Ukt=fw%gc??d@6097Rk(@%6bwsYEz7 z)|w7S?p6~r;tD3PUqJ%&5Ge&|Oe(ksQv!r4O_~-^@sG=1@)+9E6&%1QQKTS)g9`d) zFsmSoIpRyfJk}{VgjoSK|2-lx;N9N6nVx?GTO+Qb7crkrdfn`Gue-p0?FbF3$#f(& zq^8(6-Wt|c?DseRuahLeOq;Md5eTUQ3a+KOep1`XzC)fAYR zP-ApBs@VR4Lbjn~nR$`w23B3L!lH$3SA*#>X6*DkZ9#REj(A5nkxU6Ng_FKOGDWYe zgPL}UbkmW7fKqmP_wsBR>9ltkD1!kv(+zqf1?r8s1?7Ym+=>eFCj|}y3vSw{CcKSmN-t8Pqu4-;kSN_Fl)jes z^A7SXhB2?~4>ZWAlX0i;8@w{=f1xQ2WL#;W7#RHcu=@vB9w&-8Km!OQ^1PcuCnD-I?&K6Nn4F>fZq zadsxf@yD4o$LMU5@~3klF1O9=@^kaLf9@gw-)m&% z(6B=*o2Job=LZs?wL0SW>hgr!f{ZoLe^NY>wvk@EXIij2VM@mE~!cCs>)ptYK-Yb1Pj{@BD~)VzO~`c&B!?+_hKt=+a{sv*fd m6SZvmUWHTf>dTLp^-_GT-M+-}#VK-J!`{93W>aTIv-|~StcLdh diff --git a/install/install.sql b/install/install.sql index a59bab4..61e8e90 100644 --- a/install/install.sql +++ b/install/install.sql @@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS `contacts` ( `fax_number` varchar(100) DEFAULT NULL COMMENT 'Fax number', `email_address` varchar(100) DEFAULT NULL COMMENT 'Email addres', `birthday` date DEFAULT NULL COMMENT 'Birth day', - `comment` tinytext NOT NULL COMMENT 'Comment', + `comment` tinytext NULL DEFAULT NULL COMMENT 'Comment', `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Entry created', `updated` timestamp NULL DEFAULT NULL COMMENT 'Entry updated', PRIMARY KEY (`id`) @@ -33,11 +33,11 @@ CREATE TABLE IF NOT EXISTS `customer` ( `id` bigint(20) unsigned NOT NULL COMMENT 'Primay key', `customer_contact_id` bigint(20) unsigned NOT NULL COMMENT 'Table reference on "contact"', `customer_number` varchar(20) COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT 'Customer number', - `customer_password_hash` varchar(255) COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT 'Password hash', + `customer_password_hash` varchar(255) COLLATE 'utf8mb4_general_ci' NULL DEFAULT NULL COMMENT 'Password hash', `customer_confirm_key` varchar(50) COLLATE 'utf8mb4_general_ci' NULL DEFAULT NULL COMMENT 'Email confirmation key', `customer_status` enum('UNCONFIRMED','CONFIRMED','LOCKED') COLLATE 'utf8mb4_general_ci' NOT NULL DEFAULT 'UNCONFIRMED' COMMENT 'Account status', `customer_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Account creation', - `customer_locked` datetime NULL COMMENT 'Last locked timestamp', + `customer_locked` datetime NULL DEFAULT NULL COMMENT 'Last locked timestamp', PRIMARY KEY (`id`), UNIQUE (`customer_confirm_key`), UNIQUE (`customer_number`), @@ -54,6 +54,18 @@ CREATE TABLE IF NOT EXISTS `products` ( INDEX `category` (`category`) ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb4 COMMENT='Products' ; +CREATE TABLE IF NOT EXISTS `orders` ( + `id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', + `order_status` enum('UNCONFIRMED','CONFIRMED','DELIVERED','CANCELED') NOT NULL DEFAULT 'UNCONFIRMED' COMMENT 'Order status', + `customer_id` bigint(20) unsigned DEFAULT NULL COMMENT 'Table reference customer', + `product_id` bigint(20) unsigned NOT NULL COMMENT 'Table reference products', + `amount` bigint(20) unsigned NOT NULL COMMENT 'Ordered amount', + `added` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Record inserted', + PRIMARY KEY (`id`), + INDEX `product_id` (`product_id`), + INDEX `customer_product` (`customer_id`,`product_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Customer orders'; + ALTER TABLE `category` MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; @@ -66,6 +78,9 @@ MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; ALTER TABLE `products` MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; +ALTER TABLE `orders` +MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; + ALTER TABLE `category` ADD FOREIGN KEY (`parent`) REFERENCES `category` (`id`) ON DELETE SET NULL; @@ -74,3 +89,7 @@ ADD FOREIGN KEY (`customer_contact_id`) REFERENCES `contacts` (`id`) ON DELETE C ALTER TABLE `products` ADD FOREIGN KEY (`category`) REFERENCES `category` (`id`) ON DELETE SET NULL; + +ALTER TABLE `orders` +ADD CONSTRAINT `orders_ibfk_1` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`id`) ON DELETE SET NULL, +ADD CONSTRAINT `orders_ibfk_2` FOREIGN KEY (`product_id`) REFERENCES `products` (`id`) ON DELETE CASCADE; -- 2.39.5