From a9e27ba9e9a0122b499aa2b9bf0a79a493424333 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 19 Aug 2015 12:00:14 +0200 Subject: [PATCH] =?utf8?q?Changed=20field=20'surname'=20to=20'firstName'?= =?utf8?q?=20as=20surname=20is=20an=20other=20word=20for=20family=20name?= =?utf8?q?=20+=20updated=20'jcore.lib'=20Signed-off-by:Roland=20H=C3=A4der?= =?utf8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- install/install.sql | 30 ++++++------------ lib/jcore.jar | Bin 107806 -> 107750 bytes .../bean/PizzaServiceCustomerBean.java | 8 ++--- web/WEB-INF/web.xml | 2 +- web/customer/register.jsp | 4 +-- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/install/install.sql b/install/install.sql index 04fb29be..be0f194b 100644 --- a/install/install.sql +++ b/install/install.sql @@ -1,25 +1,16 @@ -SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; -SET time_zone = "+00:00"; - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; - - DROP TABLE IF EXISTS `category`; CREATE TABLE IF NOT EXISTS `category` ( -`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', + `id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', `title` varchar(255) NOT NULL COMMENT 'Category title', `parent` bigint(20) unsigned DEFAULT NULL COMMENT 'Parent category' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Categories' AUTO_INCREMENT=3 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Categories'; DROP TABLE IF EXISTS `contacts`; CREATE TABLE IF NOT EXISTS `contacts` ( -`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', + `id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', `own_contact` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether own contact', `gender` varchar(10) NOT NULL DEFAULT 'UNKNOWN' COMMENT 'Gender', - `surname` varchar(100) NOT NULL COMMENT 'Surname', + `first_name` varchar(100) NOT NULL COMMENT 'First name', `family_name` varchar(100) NOT NULL COMMENT 'Family name', `company_name` varchar(255) DEFAULT NULL COMMENT 'Company name', `street` varchar(255) DEFAULT NULL COMMENT 'Street name', @@ -35,16 +26,16 @@ CREATE TABLE IF NOT EXISTS `contacts` ( `comment` tinytext NOT NULL COMMENT 'Comment', `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Entry created', `updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Contacts data' AUTO_INCREMENT=1 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Contacts data' ; DROP TABLE IF EXISTS `products`; CREATE TABLE IF NOT EXISTS `products` ( -`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', + `id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', `category` bigint(20) unsigned DEFAULT NULL COMMENT 'Category id', `title` varchar(255) NOT NULL COMMENT 'Title of product', `price` decimal(20,2) unsigned NOT NULL COMMENT 'Product price', `available` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether product is available' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Products' AUTO_INCREMENT=2 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Products' ; ALTER TABLE `category` @@ -58,11 +49,8 @@ ALTER TABLE `products` ALTER TABLE `category` -MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',AUTO_INCREMENT=3; +MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; ALTER TABLE `contacts` 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',AUTO_INCREMENT=2; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; diff --git a/lib/jcore.jar b/lib/jcore.jar index 05ee9c0e2166866d528b972387d162ac0632abf8..0e8813704d51794f066ea23fb50fd7504286bb4a 100644 GIT binary patch delta 4845 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 F;eVA|!>|AV delta 5019 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 Full-qualified back class name, must implement DatabaseBackend interface database.backend.class - org.mxchange.jcore.database.backend.base64.Base64CsvDatabaseBackend + org.mxchange.jcore.database.backend.mysql.MySqlDatabaseBackend Login name for MySQL database, mostly not root diff --git a/web/customer/register.jsp b/web/customer/register.jsp index ea441607..7b40113b 100644 --- a/web/customer/register.jsp +++ b/web/customer/register.jsp @@ -74,11 +74,11 @@
- +
- +
-- 2.39.5