From d636fb8f585ed74d50142890fcc8017fbbbdf822 Mon Sep 17 00:00:00 2001 From: Thomas Peterson Date: Fri, 28 Feb 2025 22:09:34 +0100 Subject: [PATCH] Fixes --- src/new/tests/mysql.sql | 106 +++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 44 deletions(-) diff --git a/src/new/tests/mysql.sql b/src/new/tests/mysql.sql index 5d76f1e14..680398067 100644 --- a/src/new/tests/mysql.sql +++ b/src/new/tests/mysql.sql @@ -1,6 +1,6 @@ --- MariaDB dump 10.19 Distrib 10.11.6-MariaDB, for debian-linux-gnu (x86_64) +-- MariaDB dump 10.17 Distrib 10.4.8-MariaDB, for debian-linux-gnu (x86_64) -- --- Host: mysql Database: psc +-- Host: localhost Database: psc -- ------------------------------------------------------ -- Server version 10.4.8-MariaDB-1:10.4.8+maria~bionic @@ -108,6 +108,21 @@ CREATE TABLE `account_article` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `account_cms` +-- + +DROP TABLE IF EXISTS `account_cms`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `account_cms` ( + `account_id` bigint(20) NOT NULL DEFAULT 0, + `cms_id` bigint(20) NOT NULL DEFAULT 0, + PRIMARY KEY (`account_id`,`cms_id`), + KEY `cms_id` (`cms_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `account_paymenttype` -- @@ -328,22 +343,22 @@ CREATE TABLE `article` ( `lager_file_file` varchar(255) NOT NULL, `lager_file_preview` varchar(255) NOT NULL, `preis` float DEFAULT NULL, - `upload_article` int(1) NULL, + `upload_article` int(1) NOT NULL, `upload_article_status` int(4) DEFAULT NULL, - `upload_center` int(1) NULL, + `upload_center` int(1) NOT NULL, `upload_center_status` int(4) DEFAULT NULL, - `upload_post` int(1) NULL, + `upload_post` int(1) NOT NULL, `upload_post_status` int(4) DEFAULT NULL, - `upload_email` int(1) NULL, + `upload_email` int(1) NOT NULL, `upload_email_status` int(4) DEFAULT NULL, `vorlage_file` varchar(255) DEFAULT NULL, `vorlage_info` text DEFAULT NULL, - `upload_weblayouter` int(1) NULL, + `upload_weblayouter` int(1) NOT NULL, `upload_weblayouter_status` int(4) NOT NULL, - `not_edit` int(1) NULL, + `not_edit` int(1) NOT NULL, `custom_1_title` varchar(255) DEFAULT NULL, `custom_1_text` text DEFAULT NULL, - `resale_design` int(1) NULL, + `resale_design` int(1) NOT NULL, `motive_calc` mediumtext NOT NULL, `motive_price` float NOT NULL, `a9_back1` varchar(255) DEFAULT NULL, @@ -430,12 +445,13 @@ CREATE TABLE `article` ( `as_offer` int(1) DEFAULT NULL, `upload_steplayouter2` int(1) DEFAULT 0, `upload_steplayouter2_status` int(8) DEFAULT NULL, + `sub_title` varchar(100) DEFAULT NULL, PRIMARY KEY (`id`), KEY `install_id_idx` (`install_id`), KEY `shop_id_idx` (`shop_id`), KEY `account_id_idx` (`account_id`), KEY `article_id_a6_org_article_index` (`id`,`a6_org_article`) -) ENGINE=InnoDB AUTO_INCREMENT=217 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=2891 ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=221 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=2891 ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -453,7 +469,7 @@ CREATE TABLE `article_buy` ( KEY `contact_id` (`contact_id`), KEY `article_id` (`article_id`), KEY `contact_article` (`contact_id`,`article_id`) -) ENGINE=InnoDB AUTO_INCREMENT=64 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=76 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -719,7 +735,7 @@ CREATE TABLE `cms` ( `created` datetime DEFAULT NULL, `updated` datetime DEFAULT NULL, `pos` varchar(100) DEFAULT NULL, - `sor` varchar(10) DEFAULT NULL, + `sor` int(4) DEFAULT NULL, `title` varchar(255) DEFAULT NULL, `menu` varchar(255) NOT NULL, `url` varchar(255) DEFAULT NULL, @@ -747,7 +763,7 @@ CREATE TABLE `cms` ( PRIMARY KEY (`id`), KEY `install_id_idx` (`install_id`), KEY `shop_id_idx` (`shop_id`) -) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=2520; +) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=2520; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -874,7 +890,7 @@ CREATE TABLE `contact` ( PRIMARY KEY (`id`), KEY `install_id_idx` (`install_id`), KEY `account_id_idx` (`account_id`) -) ENGINE=InnoDB AUTO_INCREMENT=601 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=1170; +) ENGINE=InnoDB AUTO_INCREMENT=603 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=1170; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -928,7 +944,7 @@ CREATE TABLE `contact_address` ( `zusatz2` varchar(255) DEFAULT NULL, `pos` int(11) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1081 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1082 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1055,7 +1071,7 @@ CREATE TABLE `contact_role` ( PRIMARY KEY (`role_id`,`contact_id`), UNIQUE KEY `uid` (`uid`), KEY `contact_id` (`contact_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1099 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=496; +) ENGINE=InnoDB AUTO_INCREMENT=1107 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=496; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1209,8 +1225,8 @@ CREATE TABLE `install` ( `service_value` int(3) NOT NULL DEFAULT 30, `check_agb_motiv` text NOT NULL, `check_agb_article` text NOT NULL, - `calc_template` longtext NULL, - `calc_template_test` longtext NULL, + `calc_template` longtext NOT NULL, + `calc_template_test` longtext NOT NULL, `motiv_1` int(8) NOT NULL, `motiv_2` int(8) NOT NULL, `motiv_3` int(8) NOT NULL, @@ -1254,7 +1270,7 @@ CREATE TABLE `layouter_design_data` ( `title` varchar(45) DEFAULT NULL, `preview_path` varchar(45) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=148 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=163 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1284,7 +1300,7 @@ CREATE TABLE `layouter_session` ( `template_print_id` varchar(255) DEFAULT NULL, `layouter_modus` int(1) NOT NULL DEFAULT 1, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=156 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=172 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1476,7 +1492,7 @@ CREATE TABLE `news` ( PRIMARY KEY (`id`), KEY `install_id_idx` (`install_id`), KEY `shop_id_idx` (`shop_id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=8192; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=8192; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1543,30 +1559,30 @@ CREATE TABLE `orders` ( `status` varchar(255) DEFAULT NULL, `paymenttype_id` bigint(20) DEFAULT NULL, `shippingtype_id` bigint(20) DEFAULT NULL, - `preis` float NULL, + `preis` float NOT NULL, `preissteuer` float DEFAULT NULL, `preisbrutto` float DEFAULT NULL, - `enable` tinyint(1) NULL DEFAULT 1, + `enable` tinyint(1) NOT NULL DEFAULT 1, `package` varchar(50) DEFAULT '', `info` text DEFAULT NULL, `basketfield1` text DEFAULT NULL, `basketfield2` text DEFAULT NULL, `gutschein` varchar(40) DEFAULT NULL, `gutscheinabzug` float DEFAULT NULL, - `delivery_same` int(1) NULL, + `delivery_same` int(1) NOT NULL, `delivery_address` int(8) DEFAULT NULL, `uuid` varchar(50) NOT NULL, - `versandkosten` float NULL, - `zahlkosten` float NULL, - `gutscheinabzugtyp` int(1) NULL DEFAULT 1, - `use_account_as_invoice` int(1) NULL, - `mwertalle` mediumtext NULL, - `sender_same` int(1) NULL DEFAULT 1, - `invoice_same` int(1) NULL DEFAULT 1, + `versandkosten` float NOT NULL, + `zahlkosten` float NOT NULL, + `gutscheinabzugtyp` int(1) NOT NULL DEFAULT 1, + `use_account_as_invoice` int(1) NOT NULL, + `mwertalle` mediumtext NOT NULL, + `sender_same` int(1) NOT NULL DEFAULT 1, + `invoice_same` int(1) NOT NULL DEFAULT 1, `sender_address` int(8) DEFAULT NULL, `invoice_address` int(8) DEFAULT NULL, `delivery_date` date DEFAULT NULL, - `version` int(5) NULL DEFAULT 1, + `version` int(5) NOT NULL DEFAULT 1, `shippingtype_extra_label` varchar(255) DEFAULT NULL, `file1` varchar(255) DEFAULT NULL, `lang` varchar(2) DEFAULT NULL, @@ -1577,7 +1593,7 @@ CREATE TABLE `orders` ( KEY `install_id_idx` (`install_id`), KEY `account_id_idx` (`account_id`), KEY `shop_id_idx` (`shop_id`) -) ENGINE=InnoDB AUTO_INCREMENT=87 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=682; +) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=682; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1608,12 +1624,12 @@ CREATE TABLE `orderspos` ( `uploadfinish` tinyint(1) DEFAULT NULL, `article_id` int(11) DEFAULT NULL, `question` text DEFAULT NULL, - `resale_price` float NULL, - `typ` int(8) NULL, - `status` int(3) NULL, - `uuid` varchar(50) NULL, - `layouter_mode` int(1) NULL DEFAULT 0, - `render_print` int(1) NULL DEFAULT 0, + `resale_price` float NOT NULL, + `typ` int(8) NOT NULL, + `status` int(3) NOT NULL, + `uuid` varchar(50) NOT NULL, + `layouter_mode` int(1) NOT NULL DEFAULT 0, + `render_print` int(1) NOT NULL DEFAULT 0, `xmlconfigfile` mediumtext DEFAULT NULL, `xmlpagesfile` mediumtext DEFAULT NULL, `xmlpagetemplatesfile` mediumtext DEFAULT NULL, @@ -1646,8 +1662,9 @@ CREATE TABLE `orderspos` ( KEY `uuid` (`uuid`), KEY `article_id` (`article_id`), KEY `orderspos_article_id_orders_id_index` (`article_id`,`orders_id`), - KEY `layouter_mode_render_print` (`layouter_mode`,`render_print`) -) ENGINE=InnoDB AUTO_INCREMENT=112 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=5242; + KEY `layouter_mode_render_print` (`layouter_mode`,`render_print`), + KEY `created_date` (`createdd`) +) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=5242; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1724,7 +1741,8 @@ CREATE TABLE `papierdb` ( `offset_var` float DEFAULT 0, `digital_fix` float DEFAULT 0, `digital_var` float DEFAULT 0, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `art_nr` (`art_nr`) ) ENGINE=InnoDB AUTO_INCREMENT=6712 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2280,7 +2298,7 @@ CREATE TABLE `shop_contact` ( `id` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`id`), KEY `contact_id` (`contact_id`) -) ENGINE=InnoDB AUTO_INCREMENT=955 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=780; +) ENGINE=InnoDB AUTO_INCREMENT=957 DEFAULT CHARSET=utf8 AVG_ROW_LENGTH=780; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2468,4 +2486,4 @@ CREATE TABLE `upload_article` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-09-04 10:23:43 +-- Dump completed on 2025-02-28 21:09:16