From: Roland Haeder Date: Wed, 19 Aug 2015 10:00:14 +0000 (+0200) Subject: Changed field 'surname' to 'firstName' as surname is an other word for family name... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a9e27ba9e9a0122b499aa2b9bf0a79a493424333;p=pizzaservice-war.git Changed field 'surname' to 'firstName' as surname is an other word for family name + updated 'jcore.lib' Signed-off-by:Roland Häder --- 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 05ee9c0e..0e881370 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/src/java/org/mxchange/pizzaapplication/customer/bean/PizzaServiceCustomerBean.java b/src/java/org/mxchange/pizzaapplication/customer/bean/PizzaServiceCustomerBean.java index bcdafaad..ee40002b 100644 --- a/src/java/org/mxchange/pizzaapplication/customer/bean/PizzaServiceCustomerBean.java +++ b/src/java/org/mxchange/pizzaapplication/customer/bean/PizzaServiceCustomerBean.java @@ -210,15 +210,15 @@ public class PizzaServiceCustomerBean extends BasePizzaServiceSystem implements } @Override - public String getSurname () { + public String getFirstName () { // Deligate to "hidden" object - return this.getContact().getSurname(); + return this.getContact().getFirstName(); } @Override - public void setSurname (final String surname) { + public void setFirstName (final String firstName) { // Deligate to "hidden" object - this.getContact().setSurname(surname); + this.getContact().setFirstName(firstName); } @Override diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 78c62db0..3d6dc467 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -3,7 +3,7 @@ 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 @@
- +
- +