From 41a96e4787dc41830a0edb0a8e7da00b6d203f21 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sat, 11 Apr 2009 12:14:19 -0400
Subject: [PATCH] added "sys_perm_other" to billing and domain tables. "sys_perm_all" was wrong and is obsolete - sorry.
---
install/sql/ispconfig3.sql | 110 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 60 insertions(+), 50 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index a46c4e7..42b25f7 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -45,19 +45,20 @@
--
CREATE TABLE `billing_invoice` (
- `id` int(11) unsigned NOT NULL auto_increment,
+ `billing_invoice_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
+ `sys_perm_other` varchar(5) default NULL,
`sys_perm_all` varchar(5) default NULL,
`invoice_number` varchar(32) NOT NULL default '',
`invoice_date` date default NULL,
`xml` longtext NOT NULL,
- `total_fee` decimal(10,2) NOT NULL default '0.00',
- `total_fee_taxed` decimal(10,2) NOT NULL default '0.00',
- `currency` char(3) default 'EUR',
- PRIMARY KEY (`id`)
+ `total_fee_net` decimal(10,4) NOT NULL default '0.00',
+ `total_fee_gross` decimal(10,4) NOT NULL default '0.00',
+ `currency_code` char(3) default 'EUR',
+ PRIMARY KEY (`billing_invoice_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -67,26 +68,27 @@
--
CREATE TABLE `billing_product` (
- `id` int(11) unsigned NOT NULL auto_increment,
+ `billing_product_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
+ `sys_perm_other` varchar(5) default NULL,
`sys_perm_all` varchar(5) default NULL,
`parent_id` int(11) unsigned NOT NULL default '0',
`product_name` varchar(64) default NULL,
- `product_details` varchar(255) default NULL,
+ `product_details` varchar(256) default NULL,
`template_id` int(11) unsigned NOT NULL default '0',
`service_class_id` int(11) unsigned NOT NULL default '0',
- `taxclass` int(11) unsigned NOT NULL default '0',
- `setup_fee` decimal(10,2) NOT NULL default '0.00',
- `interval_fee` decimal(10,2) NOT NULL default '0.00',
+ `billing_tax_id` int(11) unsigned NOT NULL default '0',
+ `setup_fee_gross` decimal(10,4) NOT NULL default '0.00',
+ `interval_fee_gross` decimal(10,4) NOT NULL default '0.00',
`interval_length` tinyint(3) NOT NULL default '0',
`interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
`interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
`clearing_period` tinyint(3) unsigned default '1',
- `currency` char(3) default 'EUR',
- PRIMARY KEY (`id`)
+ `currency_code` char(3) default 'EUR',
+ PRIMARY KEY (`billing_product_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -96,34 +98,35 @@
--
CREATE TABLE `billing_service` (
- `id` int(11) unsigned NOT NULL auto_increment,
+ `billing_service_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
+ `sys_perm_other` varchar(5) default NULL,
`sys_perm_all` varchar(5) default NULL,
`product_id` int(11) unsigned default NULL,
- `product_parent_id` int(11) unsigned default NULL,
+ `product_pid` int(11) unsigned default NULL,
`product_name` varchar(64) default NULL,
- `product_details` varchar(255) default NULL,
+ `product_details` varchar(256) default NULL,
`service_class_id` int(11) unsigned default '0',
`service_template_id` int(11) unsigned default NULL,
`service_id` int(11) unsigned default NULL,
- `taxclass` int(11) unsigned NOT NULL default '1',
+ `billing_tax_id` int(11) unsigned NOT NULL default '1',
`quantity` smallint(5) unsigned NOT NULL default '1',
- `setup_fee` decimal(10,2) NOT NULL default '0.00',
- `interval_fee` decimal(10,2) default '0.00',
+ `setup_fee_gross` decimal(10,4) NOT NULL default '0.00',
+ `interval_fee_gross` decimal(10,4) default '0.00',
`interval_fee_is_individual` tinyint(1) default '0',
`interval_length` int(11) NOT NULL default '1',
`interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
`interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
`clearing_period` tinyint(3) unsigned default '1',
- `currency` char(3) default 'EUR',
+ `currency_code` char(3) default 'EUR',
`is_active` tinyint(1) NOT NULL default '0',
- `servicestart_at` date default NULL,
- `serviceend_at` date default NULL,
+ `service_start_at` date default NULL,
+ `service_end_at` date default NULL,
`invoiced_upto` date default NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`billing_service_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -133,26 +136,26 @@
--
CREATE TABLE `billing_service_class` (
- `id` int(11) unsigned NOT NULL auto_increment,
+ `billing_service_class_id` int(11) unsigned NOT NULL auto_increment,
`name` varchar(64) NOT NULL default '',
`sort_order` int(11) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`billing_service_class_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
--
--- Table structure for table `billing_tax_class`
+-- Table structure for table `billing_tax`
--
-CREATE TABLE `billing_tax_class` (
- `id` int(11) unsigned NOT NULL auto_increment,
+CREATE TABLE `billing_tax` (
+ `billing_tax_id` int(11) unsigned NOT NULL auto_increment,
`name` varchar(64) NOT NULL default '',
- `taxrate` decimal(10,2) default NULL,
+ `tax_rate` decimal(10,4) default NULL,
`is_default` tinyint(1) NOT NULL default '0',
`valid_from` date default NULL,
`valid_till` date default NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`billing_tax_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -228,13 +231,13 @@
--
CREATE TABLE `client_address_book` (
- `address_book_id` int(11) unsigned NOT NULL auto_increment,
+ `client_address_book_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
- `role` enum('Standard','Other','Administrator','Abuse','Accounting','Owner','Emergency','Technician','Signatory') default 'Standard',
+ `entry_role` enum('Standard','Other','Administrator','Abuse','Accounting','Owner','Emergency','Technician','Signatory') default 'Standard',
`entry_company` varchar(64) default NULL,
`entry_gender` enum('m','f') default NULL,
`entry_title` varchar(16) default NULL,
@@ -249,8 +252,8 @@
`entry_phone` varchar(32) default NULL,
`entry_fax` varchar(32) default NULL,
`entry_mobile` varchar(32) default NULL,
- `entry_email` varchar(255) default NULL,
- PRIMARY KEY (`address_book_id`)
+ `entry_email` varchar(256) default NULL,
+ PRIMARY KEY (`client_address_book_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -310,13 +313,15 @@
`zone` int(11) unsigned NOT NULL,
`name` varchar(64) NOT NULL,
`type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
- `data` varchar(128) NOT NULL,
+ `data` varchar(255) NOT NULL,
`aux` int(11) unsigned NOT NULL default '0',
`ttl` int(11) unsigned NOT NULL default '86400',
`active` enum('N','Y') NOT NULL default 'Y',
+ `stamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
+ `serial` int(10) unsigned default NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -380,15 +385,16 @@
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
+ `sys_perm_other` varchar(5) default NULL,
`sys_perm_all` varchar(5) default NULL,
`domain_provider_id` int(11) unsigned NOT NULL default '0',
`provider_domain_id` int(11) unsigned default NULL,
`domain` varchar(255) NOT NULL default '',
`tld` varchar(32) NOT NULL default '',
`handle_desc` varchar(32) default NULL,
- `handle_adminc` varchar(32) default NULL,
- `handle_techc` varchar(32) default NULL,
- `handle_zonec` varchar(32) default NULL,
+ `handle_admin_c` varchar(32) default NULL,
+ `handle_tech_c` varchar(32) default NULL,
+ `handle_zone_c` varchar(32) default NULL,
`added_at` timestamp NULL default NULL,
`connected_at` date default NULL,
`disconnected_at` date default NULL,
@@ -403,15 +409,16 @@
--
CREATE TABLE `domain_handle` (
- `id` int(11) unsigned NOT NULL auto_increment,
+ `domain_handle_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
+ `sys_perm_other` varchar(5) default NULL,
`sys_perm_all` varchar(5) default NULL,
`domain_registrar` varchar(64) default NULL,
`handle` varchar(32) default NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`domain_handle_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -421,16 +428,17 @@
--
CREATE TABLE `domain_provider` (
- `id` int(11) unsigned NOT NULL auto_increment,
+ `domain_provider_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
+ `sys_perm_other` varchar(5) default NULL,
`sys_perm_all` varchar(5) default NULL,
`provider` varchar(255) default NULL,
`is_extern` tinyint(1) NOT NULL default '0',
`domainrobot_interface` varchar(16) default '',
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`domain_provider_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -440,16 +448,17 @@
--
CREATE TABLE `domain_tld` (
- `id` int(11) unsigned NOT NULL auto_increment,
+ `domain_tld_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
+ `sys_perm_other` varchar(5) default NULL,
`sys_perm_all` varchar(5) default NULL,
`tld` varchar(32) default NULL,
`domain_provider_id` int(11) unsigned NOT NULL default '0',
`domain_registrar` varchar(64) default NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`domain_tld_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -713,8 +722,8 @@
`quota` int(11) NOT NULL default '0',
`homedir` varchar(255) NOT NULL,
`autoresponder` enum('n','y') NOT NULL default 'n',
- `autoresponder_text` tinytext NULL,
- `custom_mailfilter` text,
+ `autoresponder_text` mediumtext NULL,
+ `custom_mailfilter` mediumtext,
`postfix` enum('n','y') NOT NULL,
`access` enum('n','y') NOT NULL,
`disableimap` enum('0','1') NOT NULL default '0',
@@ -1201,7 +1210,7 @@
`suexec` enum('n','y') NOT NULL default 'y',
`errordocs` tinyint(1) NOT NULL default '1',
`is_subdomainwww` tinyint(1) NOT NULL default '1',
- `subdomain` enum('none','www','*') NOT NULL default 'www',
+ `subdomain` enum('none','www','*') NOT NULL default 'none',
`php` varchar(32) NOT NULL default 'y',
`redirect_type` varchar(255) default NULL,
`redirect_path` varchar(255) default NULL,
@@ -1215,6 +1224,7 @@
`ssl_cert` mediumtext NULL,
`ssl_bundle` mediumtext NULL,
`ssl_action` varchar(16) NULL,
+ `stats_password` varchar(255) default NULL,
`apache_directives` text,
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`domain_id`)
@@ -1334,8 +1344,8 @@
-- Dumping data for table `billing_tax_class`
--
-INSERT INTO `billing_tax_class` VALUES (1,'USt. (DE)',19,1,'2007-01-01',NULL);
-INSERT INTO `billing_tax_class` VALUES (2,'USt. ermäßigt (DE)',7,0,'2007-01-01',NULL);
+INSERT INTO `billing_tax` VALUES (1,'USt. (DE)',19,1,'2007-01-01',NULL);
+INSERT INTO `billing_tax` VALUES (2,'USt. ermäßigt (DE)',7,0,'2007-01-01',NULL);
--
-- Dumping data for table `dns_template`
@@ -1395,7 +1405,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.0.9');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1');
-- --------------------------------------------------------
--
Gitblit v1.9.1