From f3cc7cd0cefb4dc3438016810accffc3fb7757a1 Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Fri, 25 Apr 2014 09:59:00 -0400 Subject: [PATCH] Set version number to 3.0.5.4p1 --- install/sql/ispconfig3.sql | 896 ++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 489 insertions(+), 407 deletions(-) diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 62215a8..42b310b 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -65,9 +65,9 @@ `sys_perm_group` varchar(5) DEFAULT NULL, `sys_perm_other` varchar(5) DEFAULT NULL, `server_id` int(11) NOT NULL DEFAULT '0', - `customer_id` int(4) NOT NULL, - `package_id` int(4) NOT NULL, - `instance_status` int(4) NOT NULL, + `customer_id` int(4) NOT NULL DEFAULT '0', + `package_id` int(4) NOT NULL DEFAULT '0', + `instance_status` int(4) NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -80,9 +80,9 @@ CREATE TABLE IF NOT EXISTS `aps_instances_settings` ( `id` int(4) NOT NULL AUTO_INCREMENT, `server_id` int(11) NOT NULL DEFAULT '0', - `instance_id` int(4) NOT NULL, - `name` varchar(255) NOT NULL, - `value` text NOT NULL, + `instance_id` int(4) NOT NULL DEFAULT '0', + `name` varchar(255) NOT NULL DEFAULT '', + `value` text, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -94,12 +94,12 @@ CREATE TABLE IF NOT EXISTS `aps_packages` ( `id` int(4) NOT NULL AUTO_INCREMENT, - `path` varchar(255) NOT NULL, - `name` varchar(255) NOT NULL, - `category` varchar(255) NOT NULL, - `version` varchar(20) NOT NULL, - `release` int(4) NOT NULL, - `package_url` TEXT NOT NULL, + `path` varchar(255) NOT NULL DEFAULT '', + `name` varchar(255) NOT NULL DEFAULT '', + `category` varchar(255) NOT NULL DEFAULT '', + `version` varchar(20) NOT NULL DEFAULT '', + `release` int(4) NOT NULL DEFAULT '0', + `package_url` TEXT, `package_status` int(1) NOT NULL DEFAULT '2', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -112,8 +112,8 @@ CREATE TABLE IF NOT EXISTS `aps_settings` ( `id` int(4) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `value` text NOT NULL, + `name` varchar(255) NOT NULL DEFAULT '', + `value` text, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -125,7 +125,7 @@ -- CREATE TABLE `attempts_login` ( - `ip` varchar(39) NOT NULL, + `ip` varchar(39) NOT NULL DEFAULT '', `times` int(11) DEFAULT NULL, `login_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -158,7 +158,7 @@ `mobile` varchar(32) DEFAULT NULL, `fax` varchar(32) DEFAULT NULL, `email` varchar(255) DEFAULT NULL, - `internet` varchar(255) NOT NULL, + `internet` varchar(255) NOT NULL DEFAULT '', `icq` varchar(16) DEFAULT NULL, `notes` text, `bank_account_owner` varchar(255) DEFAULT NULL, @@ -169,6 +169,7 @@ `bank_account_swift` varchar(255) DEFAULT NULL, `paypal_email` varchar(255) DEFAULT NULL, `default_mailserver` int(11) unsigned NOT NULL DEFAULT '1', + `mail_servers` blob, `limit_maildomain` int(11) NOT NULL DEFAULT '-1', `limit_mailbox` int(11) NOT NULL DEFAULT '-1', `limit_mailalias` int(11) NOT NULL DEFAULT '-1', @@ -183,6 +184,7 @@ `limit_spamfilter_user` int(11) NOT NULL DEFAULT '0', `limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0', `default_webserver` int(11) unsigned NOT NULL DEFAULT '1', + `web_servers` blob, `limit_web_ip` text, `limit_web_domain` int(11) NOT NULL DEFAULT '-1', `limit_web_quota` int(11) NOT NULL DEFAULT '-1', @@ -202,19 +204,24 @@ `limit_shell_user` int(11) NOT NULL DEFAULT '0', `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot', `limit_webdav_user` int(11) NOT NULL DEFAULT '0', + `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y', `limit_aps` int(11) NOT NULL DEFAULT '-1', `default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1', + `db_servers` blob, `limit_dns_zone` int(11) NOT NULL DEFAULT '-1', `default_slave_dnsserver` int(11) unsigned NOT NULL DEFAULT '1', `limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1', `limit_dns_record` int(11) NOT NULL DEFAULT '-1', `default_dbserver` int(11) NOT NULL DEFAULT '1', + `dns_servers` blob, `limit_database` int(11) NOT NULL DEFAULT '-1', + `limit_database_quota` int(11) NOT NULL default '-1', `limit_cron` int(11) NOT NULL DEFAULT '0', `limit_cron_type` enum('url','chrooted','full') NOT NULL DEFAULT 'url', `limit_cron_frequency` int(11) NOT NULL DEFAULT '5', `limit_traffic_quota` int(11) NOT NULL DEFAULT '-1', `limit_client` int(11) NOT NULL DEFAULT '0', + `limit_domainmodule` int(11) NOT NULL DEFAULT '0', `limit_mailmailinglist` int(11) NOT NULL DEFAULT '-1', `limit_openvz_vm` int(11) NOT NULL DEFAULT '0', `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0', @@ -224,7 +231,7 @@ `language` char(2) NOT NULL DEFAULT 'en', `usertheme` varchar(32) NOT NULL DEFAULT 'default', `template_master` int(11) unsigned NOT NULL DEFAULT '0', - `template_additional` text NOT NULL DEFAULT '', + `template_additional` text, `created_at` bigint(20) DEFAULT NULL, `locked` enum('n','y') NOT NULL DEFAULT 'n', `canceled` enum('n','y') NOT NULL DEFAULT 'n', @@ -232,6 +239,11 @@ `tmp_data` mediumblob, `id_rsa` varchar(2000) NOT NULL DEFAULT '', `ssh_rsa` varchar(600) NOT NULL DEFAULT '', + `customer_no_template` varchar(255) DEFAULT 'C[CUSTOMER_NO]', + `customer_no_start` int(11) NOT NULL DEFAULT '1', + `customer_no_counter` int(11) NOT NULL DEFAULT '0', + `added_date` date NOT NULL DEFAULT '0000-00-00', + `added_by` varchar(255) DEFAULT NULL, PRIMARY KEY (`client_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -267,8 +279,8 @@ `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, - `template_name` varchar(64) NOT NULL, + `sys_perm_other` varchar(5) default NULL, + `template_name` varchar(64) NOT NULL DEFAULT '', `template_type` varchar(1) NOT NULL default 'm', `limit_maildomain` int(11) NOT NULL default '-1', `limit_mailbox` int(11) NOT NULL default '-1', @@ -302,16 +314,19 @@ `limit_shell_user` int(11) NOT NULL default '0', `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no', `limit_webdav_user` int(11) NOT NULL default '0', + `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y', `limit_aps` int(11) NOT NULL DEFAULT '-1', `limit_dns_zone` int(11) NOT NULL default '-1', `limit_dns_slave_zone` int(11) NOT NULL default '-1', `limit_dns_record` int(11) NOT NULL default '-1', `limit_database` int(11) NOT NULL default '-1', + `limit_database_quota` int(11) NOT NULL default '-1', `limit_cron` int(11) NOT NULL default '0', `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url', `limit_cron_frequency` int(11) NOT NULL default '5', `limit_traffic_quota` int(11) NOT NULL default '-1', `limit_client` int(11) NOT NULL default '0', + `limit_domainmodule` int(11) NOT NULL DEFAULT '0', `limit_mailmailinglist` int(11) NOT NULL default '-1', `limit_openvz_vm` int(11) NOT NULL DEFAULT '0', `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0', @@ -334,15 +349,40 @@ -- -------------------------------------------------------- -- +-- Table structure for table `invoice_message_template` +-- + +CREATE TABLE `client_message_template` ( + `client_message_template_id` bigint(20) NOT NULL AUTO_INCREMENT, + `sys_userid` int(11) NOT NULL DEFAULT '0', + `sys_groupid` int(11) 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, + `template_type` varchar(255) DEFAULT NULL, + `template_name` varchar(255) DEFAULT NULL, + `subject` varchar(255) DEFAULT NULL, + `message` text, + PRIMARY KEY (`client_message_template_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- +-- Dumping data for table `invoice_message_template` +-- + +-- -------------------------------------------------------- + +-- -- Table structure for table `country` -- CREATE TABLE `country` ( - `iso` char(2) NOT NULL, - `name` varchar(64) NOT NULL, - `printable_name` varchar(64) NOT NULL, + `iso` char(2) NOT NULL DEFAULT '', + `name` varchar(64) NOT NULL DEFAULT '', + `printable_name` varchar(64) NOT NULL DEFAULT '', `iso3` char(3) DEFAULT NULL, `numcode` smallint(6) DEFAULT NULL, + `eu` enum('n','y') NOT NULL DEFAULT 'n', PRIMARY KEY (`iso`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -361,12 +401,13 @@ `server_id` int(11) unsigned NOT NULL default '0', `parent_domain_id` int(11) unsigned NOT NULL default '0', `type` enum('url','chrooted','full') NOT NULL default 'url', - `command` TEXT NOT NULL, + `command` TEXT, `run_min` varchar(100) NULL, `run_hour` varchar(100) NULL, `run_mday` varchar(100) NULL, `run_month` varchar(100) NULL, `run_wday` varchar(100) NULL, + `log` enum('n','y') NOT NULL default 'n', `active` enum('n','y') NOT NULL default 'y', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -399,23 +440,23 @@ CREATE TABLE `dns_rr` ( `id` int(11) unsigned NOT NULL auto_increment, - `sys_userid` int(11) unsigned NOT NULL, - `sys_groupid` int(11) unsigned NOT NULL, - `sys_perm_user` varchar(5) NOT NULL, - `sys_perm_group` varchar(5) NOT NULL, - `sys_perm_other` varchar(5) NOT NULL, + `sys_userid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_perm_user` varchar(5) NOT NULL DEFAULT '', + `sys_perm_group` varchar(5) NOT NULL DEFAULT '', + `sys_perm_other` varchar(5) NOT NULL DEFAULT '', `server_id` int(11) NOT NULL default '1', - `zone` int(11) unsigned NOT NULL, - `name` varchar(64) NOT NULL, + `zone` int(11) unsigned NOT NULL DEFAULT '0', + `name` varchar(64) NOT NULL DEFAULT '', `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL, - `data` varchar(255) NOT NULL, + `data` varchar(255) NOT NULL DEFAULT '', `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`) + KEY `rr` (`zone`,`type`,`name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -426,16 +467,16 @@ CREATE TABLE `dns_slave` ( `id` int(10) unsigned NOT NULL auto_increment, - `sys_userid` int(11) unsigned NOT NULL, - `sys_groupid` int(11) unsigned NOT NULL, - `sys_perm_user` varchar(5) NOT NULL, - `sys_perm_group` varchar(5) NOT NULL, - `sys_perm_other` varchar(5) NOT NULL, + `sys_userid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_perm_user` varchar(5) NOT NULL DEFAULT '', + `sys_perm_group` varchar(5) NOT NULL DEFAULT '', + `sys_perm_other` varchar(5) NOT NULL DEFAULT '', `server_id` int(11) NOT NULL default '1', - `origin` varchar(255) NOT NULL, - `ns` varchar(255) NOT NULL, - `active` enum('N','Y') NOT NULL, - `xfer` varchar(255) NOT NULL, + `origin` varchar(255) NOT NULL DEFAULT '', + `ns` varchar(255) NOT NULL DEFAULT '', + `active` enum('N','Y') NOT NULL DEFAULT 'N', + `xfer` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), UNIQUE KEY `slave` (`origin`,`server_id`), KEY `active` (`active`) @@ -449,23 +490,23 @@ CREATE TABLE `dns_soa` ( `id` int(10) unsigned NOT NULL auto_increment, - `sys_userid` int(11) unsigned NOT NULL, - `sys_groupid` int(11) unsigned NOT NULL, - `sys_perm_user` varchar(5) NOT NULL, - `sys_perm_group` varchar(5) NOT NULL, - `sys_perm_other` varchar(5) NOT NULL, + `sys_userid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_perm_user` varchar(5) NOT NULL DEFAULT '', + `sys_perm_group` varchar(5) NOT NULL DEFAULT '', + `sys_perm_other` varchar(5) NOT NULL DEFAULT '', `server_id` int(11) NOT NULL default '1', - `origin` varchar(255) NOT NULL, - `ns` varchar(255) NOT NULL, - `mbox` varchar(255) NOT NULL, + `origin` varchar(255) NOT NULL DEFAULT '', + `ns` varchar(255) NOT NULL DEFAULT '', + `mbox` varchar(255) NOT NULL DEFAULT '', `serial` int(11) unsigned NOT NULL default '1', `refresh` int(11) unsigned NOT NULL default '28800', `retry` int(11) unsigned NOT NULL default '7200', `expire` int(11) unsigned NOT NULL default '604800', `minimum` int(11) unsigned NOT NULL default '86400', `ttl` int(11) unsigned NOT NULL default '86400', - `active` enum('N','Y') NOT NULL, - `xfer` varchar(255) NOT NULL, + `active` enum('N','Y') NOT NULL DEFAULT 'N', + `xfer` varchar(255) NOT NULL DEFAULT '', `also_notify` varchar(255) default NULL, `update_acl` varchar(255) default NULL, PRIMARY KEY (`id`), @@ -637,12 +678,30 @@ `sys_perm_group` varchar(5) NOT NULL default '', `sys_perm_other` varchar(5) NOT NULL default '', `server_id` int(11) NOT NULL default '0', - `source` varchar(255) NOT NULL, - `access` varchar(255) NOT NULL, - `type` set('recipient','sender','client') NOT NULL, + `source` varchar(255) NOT NULL DEFAULT '', + `access` varchar(255) NOT NULL DEFAULT '', + `type` set('recipient','sender','client') NOT NULL DEFAULT 'recipient', `active` enum('n','y') NOT NULL default 'y', PRIMARY KEY (`access_id`), KEY `server_id` (`server_id`,`source`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `mail_backup` +-- + +CREATE TABLE `mail_backup` ( + `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `server_id` int(10) unsigned NOT NULL DEFAULT '0', + `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0', + `mailuser_id` int(10) unsigned NOT NULL DEFAULT '0', + `backup_mode` varchar(64) NOT NULL DEFAULT '', + `tstamp` int(10) unsigned NOT NULL DEFAULT '0', + `filename` varchar(255) NOT NULL DEFAULT '', + `filesize` VARCHAR(10) NOT NULL DEFAULT '', + PRIMARY KEY (`backup_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -682,7 +741,11 @@ `sys_perm_other` varchar(5) NOT NULL default '', `server_id` int(11) unsigned NOT NULL default '0', `domain` varchar(255) NOT NULL default '', - `active` enum('n','y') NOT NULL, + `dkim` ENUM( 'n', 'y' ) NOT NULL default 'n', + `dkim_selector` varchar(63) NOT NULL DEFAULT 'default', + `dkim_private` mediumtext NULL, + `dkim_public` mediumtext NULL, + `active` enum('n','y') NOT NULL DEFAULT 'n', PRIMARY KEY (`domain_id`), KEY `server_id` (`server_id`,`domain`), KEY `domain_active` (`domain`,`active`) @@ -702,10 +765,10 @@ `sys_perm_group` varchar(5) NOT NULL default '', `sys_perm_other` varchar(5) NOT NULL default '', `server_id` int(11) unsigned NOT NULL default '0', - `source` varchar(255) NOT NULL, + `source` varchar(255) NOT NULL DEFAULT '', `destination` text, `type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias', - `active` enum('n','y') NOT NULL, + `active` enum('n','y') NOT NULL DEFAULT 'n', PRIMARY KEY (`forwarding_id`), KEY `server_id` (`server_id`,`source`), KEY `type` (`type`) @@ -746,14 +809,14 @@ `mailinglist_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) NOT NULL, - `sys_perm_group` varchar(5) NOT NULL, - `sys_perm_other` varchar(5) NOT NULL, + `sys_perm_user` varchar(5) NOT NULL DEFAULT '', + `sys_perm_group` varchar(5) NOT NULL DEFAULT '', + `sys_perm_other` varchar(5) NOT NULL DEFAULT '', `server_id` int(11) unsigned NOT NULL default '0', - `domain` varchar(255) NOT NULL, - `listname` varchar(255) NOT NULL, - `email` varchar(255) NOT NULL, - `password` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL DEFAULT '', + `listname` varchar(255) NOT NULL DEFAULT '', + `email` varchar(255) NOT NULL DEFAULT '', + `password` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`mailinglist_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -785,9 +848,9 @@ CREATE TABLE `mail_traffic` ( `traffic_id` int(11) unsigned NOT NULL auto_increment, - `mailuser_id` int(11) unsigned NOT NULL, - `month` char(7) NOT NULL, - `traffic` bigint(20) unsigned NOT NULL, + `mailuser_id` int(11) unsigned NOT NULL DEFAULT '0', + `month` char(7) NOT NULL DEFAULT '', + `traffic` bigint(20) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`traffic_id`), KEY `mailuser_id` (`mailuser_id`,`month`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -807,9 +870,9 @@ `sys_perm_other` varchar(5) NOT NULL default '', `server_id` int(11) unsigned NOT NULL default '0', `domain` varchar(255) NOT NULL default '', - `transport` varchar(255) NOT NULL, + `transport` varchar(255) NOT NULL DEFAULT '', `sort_order` int(11) unsigned NOT NULL default '5', - `active` enum('n','y') NOT NULL, + `active` enum('n','y') NOT NULL DEFAULT 'n', PRIMARY KEY (`transport_id`), KEY `server_id` (`server_id`,`transport`), KEY `server_id_2` (`server_id`,`domain`) @@ -830,15 +893,15 @@ `sys_perm_other` varchar(5) NOT NULL default '', `server_id` int(11) unsigned NOT NULL default '0', `email` varchar(255) NOT NULL default '', - `login` varchar(255) NOT NULL, - `password` varchar(255) NOT NULL, + `login` varchar(255) NOT NULL default '', + `password` varchar(255) NOT NULL default '', `name` varchar(255) NOT NULL default '', `uid` int(11) unsigned NOT NULL default '5000', `gid` int(11) unsigned NOT NULL default '5000', `maildir` varchar(255) NOT NULL default '', `quota` bigint(20) NOT NULL default '-1', `cc` varchar(255) NOT NULL default '', - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NOT NULL default '', `autoresponder` enum('n','y') NOT NULL default 'n', `autoresponder_start_date` datetime NOT NULL default '0000-00-00 00:00:00', `autoresponder_end_date` datetime NOT NULL default '0000-00-00 00:00:00', @@ -846,16 +909,20 @@ `autoresponder_text` mediumtext NULL, `move_junk` enum('n','y') NOT NULL default 'n', `custom_mailfilter` mediumtext, - `postfix` enum('n','y') NOT NULL, - `access` enum('n','y') NOT NULL, + `postfix` enum('n','y') NOT NULL default 'y', + `access` enum('n','y') NOT NULL default 'y', `disableimap` enum('n','y') NOT NULL default 'n', `disablepop3` enum('n','y') NOT NULL default 'n', `disabledeliver` enum('n','y') NOT NULL default 'n', `disablesmtp` enum('n','y') NOT NULL default 'n', `disablesieve` enum('n','y') NOT NULL default 'n', + `disablesieve-filter` enum('n','y') NOT NULL default 'n', `disablelda` enum('n','y') NOT NULL default 'n', + `disablelmtp` enum('n','y') NOT NULL default 'n', `disabledoveadm` enum('n','y') NOT NULL default 'n', `last_quota_notification` date NULL default NULL, + `backup_interval` VARCHAR( 255 ) NOT NULL default 'none', + `backup_copies` INT NOT NULL DEFAULT '1', PRIMARY KEY (`mailuser_id`), KEY `server_id` (`server_id`,`email`), KEY `email_access` (`email`,`access`) @@ -892,10 +959,10 @@ -- CREATE TABLE `monitor_data` ( - `server_id` int(11) unsigned NOT NULL, - `type` varchar(255) NOT NULL, - `created` int(11) unsigned NOT NULL, - `data` mediumtext NOT NULL, + `server_id` int(11) unsigned NOT NULL default '0', + `type` varchar(255) NOT NULL default '', + `created` int(11) unsigned NOT NULL default '0', + `data` mediumtext, `state` enum('no_state','unknown','ok','info','warning','critical','error') NOT NULL DEFAULT 'unknown', PRIMARY KEY (`server_id`,`type`,`created`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -938,7 +1005,7 @@ `sys_perm_group` varchar(5) DEFAULT NULL, `sys_perm_other` varchar(5) DEFAULT NULL, `template_name` varchar(255) DEFAULT NULL, - `template_file` varchar(255) NOT NULL, + `template_file` varchar(255) NOT NULL DEFAULT '', `server_id` int(11) NOT NULL DEFAULT '0', `allservers` varchar(255) NOT NULL DEFAULT 'y', `active` varchar(255) NOT NULL DEFAULT 'y', @@ -950,7 +1017,7 @@ -- Dumping data for table `openvz_ostemplate` -- -INSERT INTO `openvz_ostemplate` (`ostemplate_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `template_file`, `server_id`, `allservers`, `active`, `description`) VALUES(1, 1, 1, 'riud', 'riud', '', 'Debian minimal', 'debian-minimal-x86', 1, 'y', 'y', 'Debain minmal image.'); +INSERT INTO `openvz_ostemplate` (`ostemplate_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `template_file`, `server_id`, `allservers`, `active`, `description`) VALUES(1, 1, 1, 'riud', 'riud', '', 'Debian minimal', 'debian-minimal-x86', 1, 'y', 'y', 'Debian minimal image.'); -- -------------------------------------------------------- @@ -1019,8 +1086,8 @@ -- CREATE TABLE IF NOT EXISTS `openvz_traffic` ( - `veid` int(11) NOT NULL, - `traffic_date` date NOT NULL, + `veid` int(11) NOT NULL DEFAULT '0', + `traffic_date` date NOT NULL DEFAULT '0000-00-00', `traffic_bytes` bigint(32) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`veid`,`traffic_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -1044,15 +1111,15 @@ `sys_perm_group` varchar(5) DEFAULT NULL, `sys_perm_other` varchar(5) DEFAULT NULL, `server_id` int(11) NOT NULL DEFAULT '0', - `veid` int(10) unsigned NOT NULL, + `veid` int(10) unsigned NOT NULL DEFAULT '0', `ostemplate_id` int(11) NOT NULL DEFAULT '0', `template_id` int(11) NOT NULL DEFAULT '0', - `ip_address` varchar(255) NOT NULL, + `ip_address` varchar(255) NOT NULL DEFAULT '', `hostname` varchar(255) DEFAULT NULL, `vm_password` varchar(255) DEFAULT NULL, `start_boot` varchar(255) NOT NULL DEFAULT 'y', `active` varchar(255) NOT NULL DEFAULT 'y', - `active_until_date` date NOT NULL, + `active_until_date` date NOT NULL DEFAULT '0000-00-00', `description` text, `diskspace` int(11) NOT NULL DEFAULT '0', `traffic` int(11) NOT NULL DEFAULT '-1', @@ -1065,8 +1132,8 @@ `io_priority` int(11) NOT NULL DEFAULT '4', `nameserver` varchar(255) NOT NULL DEFAULT '8.8.8.8 8.8.4.4', `create_dns` varchar(1) NOT NULL DEFAULT 'n', - `capability` text NOT NULL, - `config` mediumtext NOT NULL, + `capability` text, + `config` mediumtext, PRIMARY KEY (`vm_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -1081,11 +1148,11 @@ -- CREATE TABLE `remote_session` ( - `remote_session` varchar(64) NOT NULL, - `remote_userid` int(11) unsigned NOT NULL, - `remote_functions` text NOT NULL, + `remote_session` varchar(64) NOT NULL DEFAULT '', + `remote_userid` int(11) unsigned NOT NULL DEFAULT '0', + `remote_functions` text, `client_login` tinyint(1) unsigned NOT NULL default '0', - `tstamp` int(10) unsigned NOT NULL, + `tstamp` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`remote_session`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -1102,9 +1169,9 @@ `sys_perm_user` varchar(5) default NULL, `sys_perm_group` varchar(5) default NULL, `sys_perm_other` varchar(5) default NULL, - `remote_username` varchar(64) NOT NULL, - `remote_password` varchar(64) NOT NULL, - `remote_functions` text NOT NULL, + `remote_username` varchar(64) NOT NULL DEFAULT '', + `remote_password` varchar(64) NOT NULL DEFAULT '', + `remote_functions` text, PRIMARY KEY (`remote_userid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1130,7 +1197,7 @@ `vserver_server` tinyint(1) NOT NULL default '0', `proxy_server` tinyint(1) NOT NULL default '0', `firewall_server` tinyint(1) NOT NULL default '0', - `config` text NOT NULL, + `config` text, `updated` bigint(20) unsigned NOT NULL default '0', `mirror_server_id` int(11) unsigned NOT NULL default '0', `dbversion` int(11) unsigned NOT NULL default '1', @@ -1209,8 +1276,8 @@ `pgroup` varchar(255) default NULL, `shell` varchar(255) NOT NULL default '/bin/bash', `dir` varchar(255) default NULL, - `chroot` varchar(255) NOT NULL, - `ssh_rsa` text NOT NULL, + `chroot` varchar(255) NOT NULL DEFAULT '', + `ssh_rsa` text, PRIMARY KEY (`shell_user_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1222,16 +1289,16 @@ CREATE TABLE `software_package` ( `package_id` int(11) unsigned NOT NULL auto_increment, - `software_repo_id` int(11) unsigned NOT NULL, - `package_name` varchar(64) NOT NULL, - `package_title` varchar(64) NOT NULL, + `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0', + `package_name` varchar(64) NOT NULL DEFAULT '', + `package_title` varchar(64) NOT NULL DEFAULT '', `package_description` text, `package_version` varchar(8) default NULL, `package_type` enum('ispconfig','app','web') NOT NULL default 'app', `package_installable` enum('yes','no','key') NOT NULL default 'yes', `package_requires_db` enum('no','mysql') NOT NULL default 'no', `package_remote_functions` text, - `package_key` varchar(255) NOT NULL, + `package_key` varchar(255) NOT NULL DEFAULT '', `package_config` text, PRIMARY KEY (`package_id`), UNIQUE KEY `package_name` (`package_name`) @@ -1266,12 +1333,12 @@ CREATE TABLE `software_update` ( `software_update_id` int(11) unsigned NOT NULL auto_increment, - `software_repo_id` int(11) unsigned NOT NULL, - `package_name` varchar(64) NOT NULL, - `update_url` varchar(255) NOT NULL, - `update_md5` varchar(255) NOT NULL, - `update_dependencies` varchar(255) NOT NULL, - `update_title` varchar(64) NOT NULL, + `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0', + `package_name` varchar(64) NOT NULL DEFAULT '', + `update_url` varchar(255) NOT NULL DEFAULT '', + `update_md5` varchar(255) NOT NULL DEFAULT '', + `update_dependencies` varchar(255) NOT NULL DEFAULT '', + `update_title` varchar(64) NOT NULL DEFAULT '', `v1` tinyint(1) NOT NULL default '0', `v2` tinyint(1) NOT NULL default '0', `v3` tinyint(1) NOT NULL default '0', @@ -1289,8 +1356,8 @@ CREATE TABLE `software_update_inst` ( `software_update_inst_id` int(11) unsigned NOT NULL auto_increment, `software_update_id` int(11) unsigned NOT NULL default '0', - `package_name` varchar(64) NOT NULL, - `server_id` int(11) unsigned NOT NULL, + `package_name` varchar(64) NOT NULL DEFAULT '', + `server_id` int(11) unsigned NOT NULL DEFAULT '0', `status` enum('none','installing','installed','deleting','deleted','failed') NOT NULL default 'none', PRIMARY KEY (`software_update_inst_id`), UNIQUE KEY `software_update_id` (`software_update_id`,`package_name`,`server_id`) @@ -1304,11 +1371,11 @@ CREATE TABLE `spamfilter_policy` ( `id` int(11) unsigned NOT NULL auto_increment, - `sys_userid` int(11) unsigned NOT NULL, - `sys_groupid` int(11) unsigned NOT NULL, - `sys_perm_user` varchar(5) NOT NULL, - `sys_perm_group` varchar(5) NOT NULL, - `sys_perm_other` varchar(5) NOT NULL, + `sys_userid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_perm_user` varchar(5) NOT NULL DEFAULT '', + `sys_perm_group` varchar(5) NOT NULL DEFAULT '', + `sys_perm_other` varchar(5) NOT NULL DEFAULT '', `policy_name` varchar(64) default NULL, `virus_lover` enum('N','Y') default NULL, `spam_lover` enum('N','Y') default NULL, @@ -1346,6 +1413,11 @@ `spam_subject_tag2` varchar(64) default NULL, `message_size_limit` int(11) unsigned default NULL, `banned_rulenames` varchar(64) default NULL, + `policyd_quota_in` int(11) NOT NULL DEFAULT '-1', + `policyd_quota_in_period` int(11) NOT NULL DEFAULT '24', + `policyd_quota_out` int(11) NOT NULL DEFAULT '-1', + `policyd_quota_out_period` int(11) NOT NULL DEFAULT '24', + `policyd_greylist` ENUM( 'Y', 'N' ) NOT NULL DEFAULT 'N', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1357,15 +1429,15 @@ CREATE TABLE `spamfilter_users` ( `id` int(11) unsigned NOT NULL auto_increment, - `sys_userid` int(11) unsigned NOT NULL, - `sys_groupid` int(11) unsigned NOT NULL, - `sys_perm_user` varchar(5) NOT NULL, - `sys_perm_group` varchar(5) NOT NULL, - `sys_perm_other` varchar(5) NOT NULL, - `server_id` int(11) unsigned NOT NULL, + `sys_userid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_perm_user` varchar(5) NOT NULL DEFAULT '', + `sys_perm_group` varchar(5) NOT NULL DEFAULT '', + `sys_perm_other` varchar(5) NOT NULL DEFAULT '', + `server_id` int(11) unsigned NOT NULL DEFAULT '0', `priority` tinyint(3) unsigned NOT NULL default '7', `policy_id` int(11) unsigned NOT NULL default '1', - `email` varchar(255) NOT NULL, + `email` varchar(255) NOT NULL DEFAULT '', `fullname` varchar(64) default NULL, `local` varchar(1) default NULL, PRIMARY KEY (`id`), @@ -1380,16 +1452,16 @@ CREATE TABLE `spamfilter_wblist` ( `wblist_id` int(11) unsigned NOT NULL auto_increment, - `sys_userid` int(11) unsigned NOT NULL, - `sys_groupid` int(11) unsigned NOT NULL, - `sys_perm_user` varchar(5) NOT NULL, - `sys_perm_group` varchar(5) NOT NULL, - `sys_perm_other` varchar(5) NOT NULL, - `server_id` int(11) unsigned NOT NULL, + `sys_userid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0', + `sys_perm_user` varchar(5) NOT NULL DEFAULT '', + `sys_perm_group` varchar(5) NOT NULL DEFAULT '', + `sys_perm_other` varchar(5) NOT NULL DEFAULT '', + `server_id` int(11) unsigned NOT NULL DEFAULT '0', `wb` enum('W','B') NOT NULL default 'W', - `rid` int(11) unsigned NOT NULL, - `email` varchar(255) NOT NULL, - `priority` tinyint(3) unsigned NOT NULL, + `rid` int(11) unsigned NOT NULL DEFAULT '0', + `email` varchar(255) NOT NULL DEFAULT '', + `priority` tinyint(3) unsigned NOT NULL DEFAULT '0', `active` enum('y','n') NOT NULL default 'y', PRIMARY KEY (`wblist_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1422,11 +1494,12 @@ -- CREATE TABLE `sys_config` ( - `config_id` int(11) unsigned NOT NULL, - `group` varchar(64) NOT NULL, - `name` varchar(64) NOT NULL, - `value` varchar(255) NOT NULL + `group` varchar(64) NOT NULL DEFAULT '', + `name` varchar(64) NOT NULL DEFAULT '', + `value` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`group`, `name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + -- -------------------------------------------------------- @@ -1435,7 +1508,7 @@ -- CREATE TABLE IF NOT EXISTS `sys_cron` ( - `name` varchar(50) NOT NULL, + `name` varchar(50) NOT NULL DEFAULT '', `last_run` datetime NULL DEFAULT NULL, `next_run` datetime NULL DEFAULT NULL, `running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0', @@ -1445,19 +1518,19 @@ -- -------------------------------------------------------- --- +-- -- Table structure for table `sys_datalog` --- +-- CREATE TABLE `sys_datalog` ( `datalog_id` int(11) unsigned NOT NULL auto_increment, - `server_id` int(11) unsigned NOT NULL, + `server_id` int(11) unsigned NOT NULL DEFAULT '0', `dbtable` varchar(255) NOT NULL default '', `dbidx` varchar(255) NOT NULL default '', `action` char(1) NOT NULL default '', `tstamp` int(11) NOT NULL default '0', `user` varchar(255) NOT NULL default '', - `data` longtext NOT NULL, + `data` longtext, `status` set('pending','ok','warning','error') NOT NULL default 'ok', `error` mediumtext, PRIMARY KEY (`datalog_id`), @@ -1517,7 +1590,7 @@ CREATE TABLE `sys_group` ( `groupid` int(11) unsigned NOT NULL auto_increment, `name` varchar(64) NOT NULL default '', - `description` text NOT NULL, + `description` text, `client_id` int(11) unsigned NOT NULL default '0', PRIMARY KEY (`groupid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1530,7 +1603,7 @@ CREATE TABLE `sys_ini` ( `sysini_id` int(11) unsigned NOT NULL auto_increment, - `config` longtext NOT NULL, + `config` longtext, PRIMARY KEY (`sysini_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1545,7 +1618,7 @@ `server_id` int(11) unsigned NOT NULL default '0', `datalog_id` int(11) unsigned NOT NULL default '0', `loglevel` tinyint(4) NOT NULL default '0', - `tstamp` int(11) unsigned NOT NULL, + `tstamp` int(11) unsigned NOT NULL DEFAULT '0', `message` text, PRIMARY KEY (`syslog_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1558,12 +1631,12 @@ CREATE TABLE `sys_remoteaction` ( `action_id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `server_id` int(11) unsigned NOT NULL, - `tstamp` int(11) NOT NULL, - `action_type` varchar(20) NOT NULL, - `action_param` mediumtext NOT NULL, - `action_state` enum('pending','ok','warning','error') NOT NULL, - `response` mediumtext NOT NULL, + `server_id` int(11) unsigned NOT NULL DEFAULT '0', + `tstamp` int(11) NOT NULL DEFAULT '0', + `action_type` varchar(20) NOT NULL DEFAULT '', + `action_param` mediumtext, + `action_state` enum('pending','ok','warning','error') NOT NULL DEFAULT 'pending', + `response` mediumtext, PRIMARY KEY (`action_id`), KEY `server_id` (`server_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1578,6 +1651,7 @@ `session_id` varchar(64) NOT NULL DEFAULT '', `date_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `last_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `permanent` enum('n','y') NOT NULL DEFAULT 'n', `session_data` longtext, PRIMARY KEY (`session_id`), KEY `last_updated` (`last_updated`) @@ -1596,9 +1670,9 @@ `sys_perm_group` varchar(5) DEFAULT NULL, `sys_perm_other` varchar(5) DEFAULT NULL, `var_id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `tpl_name` varchar(32) NOT NULL, - `username` varchar(64) NOT NULL, - `logo_url` varchar(255) NOT NULL, + `tpl_name` varchar(32) NOT NULL DEFAULT '', + `username` varchar(64) NOT NULL DEFAULT '', + `logo_url` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`var_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -1623,11 +1697,11 @@ `typ` varchar(16) NOT NULL default 'user', `active` tinyint(1) NOT NULL default '1', `language` varchar(2) NOT NULL default 'en', - `groups` TEXT NOT NULL default '', + `groups` TEXT, `default_group` int(11) unsigned NOT NULL default '0', `client_id` int(11) unsigned NOT NULL default '0', `id_rsa` VARCHAR( 2000 ) NOT NULL default '', - `ssh_rsa` VARCHAR( 600 ) NOT NULL default '', + `ssh_rsa` VARCHAR( 600 ) NOT NULL default '', PRIMARY KEY (`userid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1662,12 +1736,13 @@ CREATE TABLE `web_backup` ( `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `server_id` int(10) unsigned NOT NULL, - `parent_domain_id` int(10) unsigned NOT NULL, - `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web', + `server_id` int(10) unsigned NOT NULL DEFAULT '0', + `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0', + `backup_type` enum('web','mysql','mongodb') NOT NULL DEFAULT 'web', `backup_mode` varchar(64) NOT NULL DEFAULT '', - `tstamp` int(10) unsigned NOT NULL, - `filename` varchar(255) NOT NULL, + `tstamp` int(10) unsigned NOT NULL DEFAULT '0', + `filename` varchar(255) NOT NULL DEFAULT '', + `filesize` VARCHAR(10) NOT NULL DEFAULT '', PRIMARY KEY (`backup_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1689,11 +1764,13 @@ `type` varchar(16) NOT NULL DEFAULT 'y', `database_name` varchar(64) DEFAULT NULL, `database_name_prefix` varchar(50) NOT NULL default '', + `database_quota` int(11) unsigned DEFAULT NULL, + `last_quota_notification` date NULL default NULL, `database_user_id` int(11) unsigned DEFAULT NULL, `database_ro_user_id` int(11) unsigned DEFAULT NULL, `database_charset` varchar(64) DEFAULT NULL, `remote_access` enum('n','y') NOT NULL DEFAULT 'y', - `remote_ips` text NOT NULL, + `remote_ips` text, `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none', `backup_copies` INT NOT NULL DEFAULT '1', `active` enum('n','y') NOT NULL DEFAULT 'y', @@ -1719,6 +1796,7 @@ `database_user` varchar(64) DEFAULT NULL, `database_user_prefix` varchar(50) NOT NULL default '', `database_password` varchar(64) DEFAULT NULL, + `database_password_mongo` varchar(32) DEFAULT NULL, PRIMARY KEY (`database_user_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1778,7 +1856,7 @@ `allow_override` varchar(255) NOT NULL default 'All', `apache_directives` mediumtext, `nginx_directives` mediumtext, - `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'n', + `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'y', `pm` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic', `pm_max_children` int(11) NOT NULL DEFAULT '10', `pm_start_servers` int(11) NOT NULL DEFAULT '2', @@ -1790,13 +1868,17 @@ `custom_php_ini` mediumtext, `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none', `backup_copies` INT NOT NULL DEFAULT '1', + `backup_excludes` mediumtext, `active` enum('n','y') NOT NULL default 'y', `traffic_quota_lock` enum('n','y') NOT NULL default 'n', `fastcgi_php_version` varchar(255) DEFAULT NULL, `proxy_directives` mediumtext, `last_quota_notification` date NULL default NULL, `rewrite_rules` mediumtext, - PRIMARY KEY (`domain_id`) + `added_date` date NOT NULL DEFAULT '0000-00-00', + `added_by` varchar(255) DEFAULT NULL, + PRIMARY KEY (`domain_id`), + UNIQUE KEY `serverdomain` ( `server_id` , `domain` ) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -1856,8 +1938,8 @@ -- CREATE TABLE `web_traffic` ( - `hostname` varchar(255) NOT NULL, - `traffic_date` date NOT NULL, + `hostname` varchar(255) NOT NULL DEFAULT '', + `traffic_date` date NOT NULL DEFAULT '0000-00-00', `traffic_bytes` bigint(32) unsigned NOT NULL default '0', PRIMARY KEY (`hostname`,`traffic_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -1882,247 +1964,247 @@ -- Dumping data for table `country` -- -INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`) VALUES -('AF', 'AFGHANISTAN', 'Afghanistan', 'AFG', 4), -('AL', 'ALBANIA', 'Albania', 'ALB', 8), -('DZ', 'ALGERIA', 'Algeria', 'DZA', 12), -('AS', 'AMERICAN SAMOA', 'American Samoa', 'ASM', 16), -('AD', 'ANDORRA', 'Andorra', 'AND', 20), -('AO', 'ANGOLA', 'Angola', 'AGO', 24), -('AI', 'ANGUILLA', 'Anguilla', 'AIA', 660), -('AQ', 'ANTARCTICA', 'Antarctica', NULL, NULL), -('AG', 'ANTIGUA AND BARBUDA', 'Antigua and Barbuda', 'ATG', 28), -('AR', 'ARGENTINA', 'Argentina', 'ARG', 32), -('AM', 'ARMENIA', 'Armenia', 'ARM', 51), -('AW', 'ARUBA', 'Aruba', 'ABW', 533), -('AU', 'AUSTRALIA', 'Australia', 'AUS', 36), -('AT', 'AUSTRIA', 'Austria', 'AUT', 40), -('AZ', 'AZERBAIJAN', 'Azerbaijan', 'AZE', 31), -('BS', 'BAHAMAS', 'Bahamas', 'BHS', 44), -('BH', 'BAHRAIN', 'Bahrain', 'BHR', 48), -('BD', 'BANGLADESH', 'Bangladesh', 'BGD', 50), -('BB', 'BARBADOS', 'Barbados', 'BRB', 52), -('BY', 'BELARUS', 'Belarus', 'BLR', 112), -('BE', 'BELGIUM', 'Belgium', 'BEL', 56), -('BZ', 'BELIZE', 'Belize', 'BLZ', 84), -('BJ', 'BENIN', 'Benin', 'BEN', 204), -('BM', 'BERMUDA', 'Bermuda', 'BMU', 60), -('BT', 'BHUTAN', 'Bhutan', 'BTN', 64), -('BO', 'BOLIVIA', 'Bolivia', 'BOL', 68), -('BA', 'BOSNIA AND HERZEGOVINA', 'Bosnia and Herzegovina', 'BIH', 70), -('BW', 'BOTSWANA', 'Botswana', 'BWA', 72), -('BV', 'BOUVET ISLAND', 'Bouvet Island', NULL, NULL), -('BR', 'BRAZIL', 'Brazil', 'BRA', 76), -('IO', 'BRITISH INDIAN OCEAN TERRITORY', 'British Indian Ocean Territory', NULL, NULL), -('BN', 'BRUNEI DARUSSALAM', 'Brunei Darussalam', 'BRN', 96), -('BG', 'BULGARIA', 'Bulgaria', 'BGR', 100), -('BF', 'BURKINA FASO', 'Burkina Faso', 'BFA', 854), -('BI', 'BURUNDI', 'Burundi', 'BDI', 108), -('KH', 'CAMBODIA', 'Cambodia', 'KHM', 116), -('CM', 'CAMEROON', 'Cameroon', 'CMR', 120), -('CA', 'CANADA', 'Canada', 'CAN', 124), -('CV', 'CAPE VERDE', 'Cape Verde', 'CPV', 132), -('KY', 'CAYMAN ISLANDS', 'Cayman Islands', 'CYM', 136), -('CF', 'CENTRAL AFRICAN REPUBLIC', 'Central African Republic', 'CAF', 140), -('TD', 'CHAD', 'Chad', 'TCD', 148), -('CL', 'CHILE', 'Chile', 'CHL', 152), -('CN', 'CHINA', 'China', 'CHN', 156), -('CX', 'CHRISTMAS ISLAND', 'Christmas Island', NULL, NULL), -('CC', 'COCOS (KEELING) ISLANDS', 'Cocos (Keeling) Islands', NULL, NULL), -('CO', 'COLOMBIA', 'Colombia', 'COL', 170), -('KM', 'COMOROS', 'Comoros', 'COM', 174), -('CG', 'CONGO', 'Congo', 'COG', 178), -('CD', 'CONGO, THE DEMOCRATIC REPUBLIC OF THE', 'Congo, the Democratic Republic of the', 'COD', 180), -('CK', 'COOK ISLANDS', 'Cook Islands', 'COK', 184), -('CR', 'COSTA RICA', 'Costa Rica', 'CRI', 188), -('CI', 'COTE D''IVOIRE', 'Cote D''Ivoire', 'CIV', 384), -('HR', 'CROATIA', 'Croatia', 'HRV', 191), -('CU', 'CUBA', 'Cuba', 'CUB', 192), -('CY', 'CYPRUS', 'Cyprus', 'CYP', 196), -('CZ', 'CZECH REPUBLIC', 'Czech Republic', 'CZE', 203), -('DK', 'DENMARK', 'Denmark', 'DNK', 208), -('DJ', 'DJIBOUTI', 'Djibouti', 'DJI', 262), -('DM', 'DOMINICA', 'Dominica', 'DMA', 212), -('DO', 'DOMINICAN REPUBLIC', 'Dominican Republic', 'DOM', 214), -('EC', 'ECUADOR', 'Ecuador', 'ECU', 218), -('EG', 'EGYPT', 'Egypt', 'EGY', 818), -('SV', 'EL SALVADOR', 'El Salvador', 'SLV', 222), -('GQ', 'EQUATORIAL GUINEA', 'Equatorial Guinea', 'GNQ', 226), -('ER', 'ERITREA', 'Eritrea', 'ERI', 232), -('EE', 'ESTONIA', 'Estonia', 'EST', 233), -('ET', 'ETHIOPIA', 'Ethiopia', 'ETH', 231), -('FK', 'FALKLAND ISLANDS (MALVINAS)', 'Falkland Islands (Malvinas)', 'FLK', 238), -('FO', 'FAROE ISLANDS', 'Faroe Islands', 'FRO', 234), -('FJ', 'FIJI', 'Fiji', 'FJI', 242), -('FI', 'FINLAND', 'Finland', 'FIN', 246), -('FR', 'FRANCE', 'France', 'FRA', 250), -('GF', 'FRENCH GUIANA', 'French Guiana', 'GUF', 254), -('PF', 'FRENCH POLYNESIA', 'French Polynesia', 'PYF', 258), -('TF', 'FRENCH SOUTHERN TERRITORIES', 'French Southern Territories', NULL, NULL), -('GA', 'GABON', 'Gabon', 'GAB', 266), -('GM', 'GAMBIA', 'Gambia', 'GMB', 270), -('GE', 'GEORGIA', 'Georgia', 'GEO', 268), -('DE', 'GERMANY', 'Germany', 'DEU', 276), -('GH', 'GHANA', 'Ghana', 'GHA', 288), -('GI', 'GIBRALTAR', 'Gibraltar', 'GIB', 292), -('GR', 'GREECE', 'Greece', 'GRC', 300), -('GL', 'GREENLAND', 'Greenland', 'GRL', 304), -('GD', 'GRENADA', 'Grenada', 'GRD', 308), -('GP', 'GUADELOUPE', 'Guadeloupe', 'GLP', 312), -('GU', 'GUAM', 'Guam', 'GUM', 316), -('GT', 'GUATEMALA', 'Guatemala', 'GTM', 320), -('GN', 'GUINEA', 'Guinea', 'GIN', 324), -('GW', 'GUINEA-BISSAU', 'Guinea-Bissau', 'GNB', 624), -('GY', 'GUYANA', 'Guyana', 'GUY', 328), -('HT', 'HAITI', 'Haiti', 'HTI', 332), -('HM', 'HEARD ISLAND AND MCDONALD ISLANDS', 'Heard Island and Mcdonald Islands', NULL, NULL), -('VA', 'HOLY SEE (VATICAN CITY STATE)', 'Holy See (Vatican City State)', 'VAT', 336), -('HN', 'HONDURAS', 'Honduras', 'HND', 340), -('HK', 'HONG KONG', 'Hong Kong', 'HKG', 344), -('HU', 'HUNGARY', 'Hungary', 'HUN', 348), -('IS', 'ICELAND', 'Iceland', 'ISL', 352), -('IN', 'INDIA', 'India', 'IND', 356), -('ID', 'INDONESIA', 'Indonesia', 'IDN', 360), -('IR', 'IRAN, ISLAMIC REPUBLIC OF', 'Iran, Islamic Republic of', 'IRN', 364), -('IQ', 'IRAQ', 'Iraq', 'IRQ', 368), -('IE', 'IRELAND', 'Ireland', 'IRL', 372), -('IL', 'ISRAEL', 'Israel', 'ISR', 376), -('IT', 'ITALY', 'Italy', 'ITA', 380), -('JM', 'JAMAICA', 'Jamaica', 'JAM', 388), -('JP', 'JAPAN', 'Japan', 'JPN', 392), -('JO', 'JORDAN', 'Jordan', 'JOR', 400), -('KZ', 'KAZAKHSTAN', 'Kazakhstan', 'KAZ', 398), -('KE', 'KENYA', 'Kenya', 'KEN', 404), -('KI', 'KIRIBATI', 'Kiribati', 'KIR', 296), -('KP', 'KOREA, DEMOCRATIC PEOPLE''S REPUBLIC OF', 'Korea, Democratic People''s Republic of', 'PRK', 408), -('KR', 'KOREA, REPUBLIC OF', 'Korea, Republic of', 'KOR', 410), -('KW', 'KUWAIT', 'Kuwait', 'KWT', 414), -('KG', 'KYRGYZSTAN', 'Kyrgyzstan', 'KGZ', 417), -('LA', 'LAO PEOPLE''S DEMOCRATIC REPUBLIC', 'Lao People''s Democratic Republic', 'LAO', 418), -('LV', 'LATVIA', 'Latvia', 'LVA', 428), -('LB', 'LEBANON', 'Lebanon', 'LBN', 422), -('LS', 'LESOTHO', 'Lesotho', 'LSO', 426), -('LR', 'LIBERIA', 'Liberia', 'LBR', 430), -('LY', 'LIBYAN ARAB JAMAHIRIYA', 'Libyan Arab Jamahiriya', 'LBY', 434), -('LI', 'LIECHTENSTEIN', 'Liechtenstein', 'LIE', 438), -('LT', 'LITHUANIA', 'Lithuania', 'LTU', 440), -('LU', 'LUXEMBOURG', 'Luxembourg', 'LUX', 442), -('MO', 'MACAO', 'Macao', 'MAC', 446), -('MK', 'MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF', 'Macedonia, the Former Yugoslav Republic of', 'MKD', 807), -('MG', 'MADAGASCAR', 'Madagascar', 'MDG', 450), -('MW', 'MALAWI', 'Malawi', 'MWI', 454), -('MY', 'MALAYSIA', 'Malaysia', 'MYS', 458), -('MV', 'MALDIVES', 'Maldives', 'MDV', 462), -('ML', 'MALI', 'Mali', 'MLI', 466), -('MT', 'MALTA', 'Malta', 'MLT', 470), -('MH', 'MARSHALL ISLANDS', 'Marshall Islands', 'MHL', 584), -('MQ', 'MARTINIQUE', 'Martinique', 'MTQ', 474), -('MR', 'MAURITANIA', 'Mauritania', 'MRT', 478), -('MU', 'MAURITIUS', 'Mauritius', 'MUS', 480), -('YT', 'MAYOTTE', 'Mayotte', NULL, NULL), -('MX', 'MEXICO', 'Mexico', 'MEX', 484), -('FM', 'MICRONESIA, FEDERATED STATES OF', 'Micronesia, Federated States of', 'FSM', 583), -('MD', 'MOLDOVA, REPUBLIC OF', 'Moldova, Republic of', 'MDA', 498), -('MC', 'MONACO', 'Monaco', 'MCO', 492), -('MN', 'MONGOLIA', 'Mongolia', 'MNG', 496), -('MS', 'MONTSERRAT', 'Montserrat', 'MSR', 500), -('MA', 'MOROCCO', 'Morocco', 'MAR', 504), -('MZ', 'MOZAMBIQUE', 'Mozambique', 'MOZ', 508), -('MM', 'MYANMAR', 'Myanmar', 'MMR', 104), -('NA', 'NAMIBIA', 'Namibia', 'NAM', 516), -('NR', 'NAURU', 'Nauru', 'NRU', 520), -('NP', 'NEPAL', 'Nepal', 'NPL', 524), -('NL', 'NETHERLANDS', 'Netherlands', 'NLD', 528), -('AN', 'NETHERLANDS ANTILLES', 'Netherlands Antilles', 'ANT', 530), -('NC', 'NEW CALEDONIA', 'New Caledonia', 'NCL', 540), -('NZ', 'NEW ZEALAND', 'New Zealand', 'NZL', 554), -('NI', 'NICARAGUA', 'Nicaragua', 'NIC', 558), -('NE', 'NIGER', 'Niger', 'NER', 562), -('NG', 'NIGERIA', 'Nigeria', 'NGA', 566), -('NU', 'NIUE', 'Niue', 'NIU', 570), -('NF', 'NORFOLK ISLAND', 'Norfolk Island', 'NFK', 574), -('MP', 'NORTHERN MARIANA ISLANDS', 'Northern Mariana Islands', 'MNP', 580), -('NO', 'NORWAY', 'Norway', 'NOR', 578), -('OM', 'OMAN', 'Oman', 'OMN', 512), -('PK', 'PAKISTAN', 'Pakistan', 'PAK', 586), -('PW', 'PALAU', 'Palau', 'PLW', 585), -('PS', 'PALESTINIAN TERRITORY, OCCUPIED', 'Palestinian Territory, Occupied', NULL, NULL), -('PA', 'PANAMA', 'Panama', 'PAN', 591), -('PG', 'PAPUA NEW GUINEA', 'Papua New Guinea', 'PNG', 598), -('PY', 'PARAGUAY', 'Paraguay', 'PRY', 600), -('PE', 'PERU', 'Peru', 'PER', 604), -('PH', 'PHILIPPINES', 'Philippines', 'PHL', 608), -('PN', 'PITCAIRN', 'Pitcairn', 'PCN', 612), -('PL', 'POLAND', 'Poland', 'POL', 616), -('PT', 'PORTUGAL', 'Portugal', 'PRT', 620), -('PR', 'PUERTO RICO', 'Puerto Rico', 'PRI', 630), -('QA', 'QATAR', 'Qatar', 'QAT', 634), -('RE', 'REUNION', 'Reunion', 'REU', 638), -('RO', 'ROMANIA', 'Romania', 'ROM', 642), -('RU', 'RUSSIAN FEDERATION', 'Russian Federation', 'RUS', 643), -('RW', 'RWANDA', 'Rwanda', 'RWA', 646), -('SH', 'SAINT HELENA', 'Saint Helena', 'SHN', 654), -('KN', 'SAINT KITTS AND NEVIS', 'Saint Kitts and Nevis', 'KNA', 659), -('LC', 'SAINT LUCIA', 'Saint Lucia', 'LCA', 662), -('PM', 'SAINT PIERRE AND MIQUELON', 'Saint Pierre and Miquelon', 'SPM', 666), -('VC', 'SAINT VINCENT AND THE GRENADINES', 'Saint Vincent and the Grenadines', 'VCT', 670), -('WS', 'SAMOA', 'Samoa', 'WSM', 882), -('SM', 'SAN MARINO', 'San Marino', 'SMR', 674), -('ST', 'SAO TOME AND PRINCIPE', 'Sao Tome and Principe', 'STP', 678), -('SA', 'SAUDI ARABIA', 'Saudi Arabia', 'SAU', 682), -('SN', 'SENEGAL', 'Senegal', 'SEN', 686), -('RS', 'SERBIA', 'Serbia', 'SRB', 381), -('SC', 'SEYCHELLES', 'Seychelles', 'SYC', 690), -('SL', 'SIERRA LEONE', 'Sierra Leone', 'SLE', 694), -('SG', 'SINGAPORE', 'Singapore', 'SGP', 702), -('SK', 'SLOVAKIA', 'Slovakia', 'SVK', 703), -('SI', 'SLOVENIA', 'Slovenia', 'SVN', 705), -('SB', 'SOLOMON ISLANDS', 'Solomon Islands', 'SLB', 90), -('SO', 'SOMALIA', 'Somalia', 'SOM', 706), -('ZA', 'SOUTH AFRICA', 'South Africa', 'ZAF', 710), -('GS', 'SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS', 'South Georgia and the South Sandwich Islands', NULL, NULL), -('ES', 'SPAIN', 'Spain', 'ESP', 724), -('LK', 'SRI LANKA', 'Sri Lanka', 'LKA', 144), -('SD', 'SUDAN', 'Sudan', 'SDN', 736), -('SR', 'SURINAME', 'Suriname', 'SUR', 740), -('SJ', 'SVALBARD AND JAN MAYEN', 'Svalbard and Jan Mayen', 'SJM', 744), -('SZ', 'SWAZILAND', 'Swaziland', 'SWZ', 748), -('SE', 'SWEDEN', 'Sweden', 'SWE', 752), -('CH', 'SWITZERLAND', 'Switzerland', 'CHE', 756), -('SY', 'SYRIAN ARAB REPUBLIC', 'Syrian Arab Republic', 'SYR', 760), -('TW', 'TAIWAN, PROVINCE OF CHINA', 'Taiwan, Province of China', 'TWN', 158), -('TJ', 'TAJIKISTAN', 'Tajikistan', 'TJK', 762), -('TZ', 'TANZANIA, UNITED REPUBLIC OF', 'Tanzania, United Republic of', 'TZA', 834), -('TH', 'THAILAND', 'Thailand', 'THA', 764), -('TL', 'TIMOR-LESTE', 'Timor-Leste', NULL, NULL), -('TG', 'TOGO', 'Togo', 'TGO', 768), -('TK', 'TOKELAU', 'Tokelau', 'TKL', 772), -('TO', 'TONGA', 'Tonga', 'TON', 776), -('TT', 'TRINIDAD AND TOBAGO', 'Trinidad and Tobago', 'TTO', 780), -('TN', 'TUNISIA', 'Tunisia', 'TUN', 788), -('TR', 'TURKEY', 'Turkey', 'TUR', 792), -('TM', 'TURKMENISTAN', 'Turkmenistan', 'TKM', 795), -('TC', 'TURKS AND CAICOS ISLANDS', 'Turks and Caicos Islands', 'TCA', 796), -('TV', 'TUVALU', 'Tuvalu', 'TUV', 798), -('UG', 'UGANDA', 'Uganda', 'UGA', 800), -('UA', 'UKRAINE', 'Ukraine', 'UKR', 804), -('AE', 'UNITED ARAB EMIRATES', 'United Arab Emirates', 'ARE', 784), -('GB', 'UNITED KINGDOM', 'United Kingdom', 'GBR', 826), -('US', 'UNITED STATES', 'United States', 'USA', 840), -('UM', 'UNITED STATES MINOR OUTLYING ISLANDS', 'United States Minor Outlying Islands', NULL, NULL), -('UY', 'URUGUAY', 'Uruguay', 'URY', 858), -('UZ', 'UZBEKISTAN', 'Uzbekistan', 'UZB', 860), -('VU', 'VANUATU', 'Vanuatu', 'VUT', 548), -('VE', 'VENEZUELA', 'Venezuela', 'VEN', 862), -('VN', 'VIET NAM', 'Viet Nam', 'VNM', 704), -('VG', 'VIRGIN ISLANDS, BRITISH', 'Virgin Islands, British', 'VGB', 92), -('VI', 'VIRGIN ISLANDS, U.S.', 'Virgin Islands, U.s.', 'VIR', 850), -('WF', 'WALLIS AND FUTUNA', 'Wallis and Futuna', 'WLF', 876), -('EH', 'WESTERN SAHARA', 'Western Sahara', 'ESH', 732), -('YE', 'YEMEN', 'Yemen', 'YEM', 887), -('ZM', 'ZAMBIA', 'Zambia', 'ZMB', 894), -('ZW', 'ZIMBABWE', 'Zimbabwe', 'ZWE', 716), -('ME', 'MONTENEGRO', 'Montenegro', 'MNE', 382); +INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`, `eu`) VALUES +('AF', 'AFGHANISTAN', 'Afghanistan', 'AFG', 4, 'n'), +('AL', 'ALBANIA', 'Albania', 'ALB', 8, 'n'), +('DZ', 'ALGERIA', 'Algeria', 'DZA', 12, 'n'), +('AS', 'AMERICAN SAMOA', 'American Samoa', 'ASM', 16, 'n'), +('AD', 'ANDORRA', 'Andorra', 'AND', 20, 'n'), +('AO', 'ANGOLA', 'Angola', 'AGO', 24, 'n'), +('AI', 'ANGUILLA', 'Anguilla', 'AIA', 660, 'n'), +('AQ', 'ANTARCTICA', 'Antarctica', NULL, NULL, 'n'), +('AG', 'ANTIGUA AND BARBUDA', 'Antigua and Barbuda', 'ATG', 28, 'n'), +('AR', 'ARGENTINA', 'Argentina', 'ARG', 32, 'n'), +('AM', 'ARMENIA', 'Armenia', 'ARM', 51, 'n'), +('AW', 'ARUBA', 'Aruba', 'ABW', 533, 'n'), +('AU', 'AUSTRALIA', 'Australia', 'AUS', 36, 'n'), +('AT', 'AUSTRIA', 'Austria', 'AUT', 40, 'y'), +('AZ', 'AZERBAIJAN', 'Azerbaijan', 'AZE', 31, 'n'), +('BS', 'BAHAMAS', 'Bahamas', 'BHS', 44, 'n'), +('BH', 'BAHRAIN', 'Bahrain', 'BHR', 48, 'n'), +('BD', 'BANGLADESH', 'Bangladesh', 'BGD', 50, 'n'), +('BB', 'BARBADOS', 'Barbados', 'BRB', 52, 'n'), +('BY', 'BELARUS', 'Belarus', 'BLR', 112, 'n'), +('BE', 'BELGIUM', 'Belgium', 'BEL', 56, 'y'), +('BZ', 'BELIZE', 'Belize', 'BLZ', 84, 'n'), +('BJ', 'BENIN', 'Benin', 'BEN', 204, 'n'), +('BM', 'BERMUDA', 'Bermuda', 'BMU', 60, 'n'), +('BT', 'BHUTAN', 'Bhutan', 'BTN', 64, 'n'), +('BO', 'BOLIVIA', 'Bolivia', 'BOL', 68, 'n'), +('BA', 'BOSNIA AND HERZEGOVINA', 'Bosnia and Herzegovina', 'BIH', 70, 'n'), +('BW', 'BOTSWANA', 'Botswana', 'BWA', 72, 'n'), +('BV', 'BOUVET ISLAND', 'Bouvet Island', NULL, NULL, 'n'), +('BR', 'BRAZIL', 'Brazil', 'BRA', 76, 'n'), +('IO', 'BRITISH INDIAN OCEAN TERRITORY', 'British Indian Ocean Territory', NULL, NULL, 'n'), +('BN', 'BRUNEI DARUSSALAM', 'Brunei Darussalam', 'BRN', 96, 'n'), +('BG', 'BULGARIA', 'Bulgaria', 'BGR', 100, 'y'), +('BF', 'BURKINA FASO', 'Burkina Faso', 'BFA', 854, 'n'), +('BI', 'BURUNDI', 'Burundi', 'BDI', 108, 'n'), +('KH', 'CAMBODIA', 'Cambodia', 'KHM', 116, 'n'), +('CM', 'CAMEROON', 'Cameroon', 'CMR', 120, 'n'), +('CA', 'CANADA', 'Canada', 'CAN', 124, 'n'), +('CV', 'CAPE VERDE', 'Cape Verde', 'CPV', 132, 'n'), +('KY', 'CAYMAN ISLANDS', 'Cayman Islands', 'CYM', 136, 'n'), +('CF', 'CENTRAL AFRICAN REPUBLIC', 'Central African Republic', 'CAF', 140, 'n'), +('TD', 'CHAD', 'Chad', 'TCD', 148, 'n'), +('CL', 'CHILE', 'Chile', 'CHL', 152, 'n'), +('CN', 'CHINA', 'China', 'CHN', 156, 'n'), +('CX', 'CHRISTMAS ISLAND', 'Christmas Island', NULL, NULL, 'n'), +('CC', 'COCOS (KEELING) ISLANDS', 'Cocos (Keeling) Islands', NULL, NULL, 'n'), +('CO', 'COLOMBIA', 'Colombia', 'COL', 170, 'n'), +('KM', 'COMOROS', 'Comoros', 'COM', 174, 'n'), +('CG', 'CONGO', 'Congo', 'COG', 178, 'n'), +('CD', 'CONGO, THE DEMOCRATIC REPUBLIC OF THE', 'Congo, the Democratic Republic of the', 'COD', 180, 'n'), +('CK', 'COOK ISLANDS', 'Cook Islands', 'COK', 184, 'n'), +('CR', 'COSTA RICA', 'Costa Rica', 'CRI', 188, 'n'), +('CI', 'COTE D''IVOIRE', 'Cote D''Ivoire', 'CIV', 384, 'n'), +('HR', 'CROATIA', 'Croatia', 'HRV', 191, 'y'), +('CU', 'CUBA', 'Cuba', 'CUB', 192, 'n'), +('CY', 'CYPRUS', 'Cyprus', 'CYP', 196, 'y'), +('CZ', 'CZECH REPUBLIC', 'Czech Republic', 'CZE', 203, 'y'), +('DK', 'DENMARK', 'Denmark', 'DNK', 208, 'y'), +('DJ', 'DJIBOUTI', 'Djibouti', 'DJI', 262, 'n'), +('DM', 'DOMINICA', 'Dominica', 'DMA', 212, 'n'), +('DO', 'DOMINICAN REPUBLIC', 'Dominican Republic', 'DOM', 214, 'n'), +('EC', 'ECUADOR', 'Ecuador', 'ECU', 218, 'n'), +('EG', 'EGYPT', 'Egypt', 'EGY', 818, 'n'), +('SV', 'EL SALVADOR', 'El Salvador', 'SLV', 222, 'n'), +('GQ', 'EQUATORIAL GUINEA', 'Equatorial Guinea', 'GNQ', 226, 'n'), +('ER', 'ERITREA', 'Eritrea', 'ERI', 232, 'n'), +('EE', 'ESTONIA', 'Estonia', 'EST', 233, 'y'), +('ET', 'ETHIOPIA', 'Ethiopia', 'ETH', 231, 'n'), +('FK', 'FALKLAND ISLANDS (MALVINAS)', 'Falkland Islands (Malvinas)', 'FLK', 238, 'n'), +('FO', 'FAROE ISLANDS', 'Faroe Islands', 'FRO', 234, 'n'), +('FJ', 'FIJI', 'Fiji', 'FJI', 242, 'n'), +('FI', 'FINLAND', 'Finland', 'FIN', 246, 'y'), +('FR', 'FRANCE', 'France', 'FRA', 250, 'y'), +('GF', 'FRENCH GUIANA', 'French Guiana', 'GUF', 254, 'n'), +('PF', 'FRENCH POLYNESIA', 'French Polynesia', 'PYF', 258, 'n'), +('TF', 'FRENCH SOUTHERN TERRITORIES', 'French Southern Territories', NULL, NULL, 'n'), +('GA', 'GABON', 'Gabon', 'GAB', 266, 'n'), +('GM', 'GAMBIA', 'Gambia', 'GMB', 270, 'n'), +('GE', 'GEORGIA', 'Georgia', 'GEO', 268, 'n'), +('DE', 'GERMANY', 'Germany', 'DEU', 276, 'y'), +('GH', 'GHANA', 'Ghana', 'GHA', 288, 'n'), +('GI', 'GIBRALTAR', 'Gibraltar', 'GIB', 292, 'n'), +('GR', 'GREECE', 'Greece', 'GRC', 300, 'y'), +('GL', 'GREENLAND', 'Greenland', 'GRL', 304, 'n'), +('GD', 'GRENADA', 'Grenada', 'GRD', 308, 'n'), +('GP', 'GUADELOUPE', 'Guadeloupe', 'GLP', 312, 'n'), +('GU', 'GUAM', 'Guam', 'GUM', 316, 'n'), +('GT', 'GUATEMALA', 'Guatemala', 'GTM', 320, 'n'), +('GN', 'GUINEA', 'Guinea', 'GIN', 324, 'n'), +('GW', 'GUINEA-BISSAU', 'Guinea-Bissau', 'GNB', 624, 'n'), +('GY', 'GUYANA', 'Guyana', 'GUY', 328, 'n'), +('HT', 'HAITI', 'Haiti', 'HTI', 332, 'n'), +('HM', 'HEARD ISLAND AND MCDONALD ISLANDS', 'Heard Island and Mcdonald Islands', NULL, NULL, 'n'), +('VA', 'HOLY SEE (VATICAN CITY STATE)', 'Holy See (Vatican City State)', 'VAT', 336, 'n'), +('HN', 'HONDURAS', 'Honduras', 'HND', 340, 'n'), +('HK', 'HONG KONG', 'Hong Kong', 'HKG', 344, 'n'), +('HU', 'HUNGARY', 'Hungary', 'HUN', 348, 'y'), +('IS', 'ICELAND', 'Iceland', 'ISL', 352, 'n'), +('IN', 'INDIA', 'India', 'IND', 356, 'n'), +('ID', 'INDONESIA', 'Indonesia', 'IDN', 360, 'n'), +('IR', 'IRAN, ISLAMIC REPUBLIC OF', 'Iran, Islamic Republic of', 'IRN', 364, 'n'), +('IQ', 'IRAQ', 'Iraq', 'IRQ', 368, 'n'), +('IE', 'IRELAND', 'Ireland', 'IRL', 372, 'y'), +('IL', 'ISRAEL', 'Israel', 'ISR', 376, 'n'), +('IT', 'ITALY', 'Italy', 'ITA', 380, 'y'), +('JM', 'JAMAICA', 'Jamaica', 'JAM', 388, 'n'), +('JP', 'JAPAN', 'Japan', 'JPN', 392, 'n'), +('JO', 'JORDAN', 'Jordan', 'JOR', 400, 'n'), +('KZ', 'KAZAKHSTAN', 'Kazakhstan', 'KAZ', 398, 'n'), +('KE', 'KENYA', 'Kenya', 'KEN', 404, 'n'), +('KI', 'KIRIBATI', 'Kiribati', 'KIR', 296, 'n'), +('KP', 'KOREA, DEMOCRATIC PEOPLE''S REPUBLIC OF', 'Korea, Democratic People''s Republic of', 'PRK', 408, 'n'), +('KR', 'KOREA, REPUBLIC OF', 'Korea, Republic of', 'KOR', 410, 'n'), +('KW', 'KUWAIT', 'Kuwait', 'KWT', 414, 'n'), +('KG', 'KYRGYZSTAN', 'Kyrgyzstan', 'KGZ', 417, 'n'), +('LA', 'LAO PEOPLE''S DEMOCRATIC REPUBLIC', 'Lao People''s Democratic Republic', 'LAO', 418, 'n'), +('LV', 'LATVIA', 'Latvia', 'LVA', 428, 'y'), +('LB', 'LEBANON', 'Lebanon', 'LBN', 422, 'n'), +('LS', 'LESOTHO', 'Lesotho', 'LSO', 426, 'n'), +('LR', 'LIBERIA', 'Liberia', 'LBR', 430, 'n'), +('LY', 'LIBYAN ARAB JAMAHIRIYA', 'Libyan Arab Jamahiriya', 'LBY', 434, 'n'), +('LI', 'LIECHTENSTEIN', 'Liechtenstein', 'LIE', 438, 'n'), +('LT', 'LITHUANIA', 'Lithuania', 'LTU', 440, 'y'), +('LU', 'LUXEMBOURG', 'Luxembourg', 'LUX', 442, 'y'), +('MO', 'MACAO', 'Macao', 'MAC', 446, 'n'), +('MK', 'MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF', 'Macedonia, the Former Yugoslav Republic of', 'MKD', 807, 'n'), +('MG', 'MADAGASCAR', 'Madagascar', 'MDG', 450, 'n'), +('MW', 'MALAWI', 'Malawi', 'MWI', 454, 'n'), +('MY', 'MALAYSIA', 'Malaysia', 'MYS', 458, 'n'), +('MV', 'MALDIVES', 'Maldives', 'MDV', 462, 'n'), +('ML', 'MALI', 'Mali', 'MLI', 466, 'n'), +('MT', 'MALTA', 'Malta', 'MLT', 470, 'y'), +('MH', 'MARSHALL ISLANDS', 'Marshall Islands', 'MHL', 584, 'n'), +('MQ', 'MARTINIQUE', 'Martinique', 'MTQ', 474, 'n'), +('MR', 'MAURITANIA', 'Mauritania', 'MRT', 478, 'n'), +('MU', 'MAURITIUS', 'Mauritius', 'MUS', 480, 'n'), +('YT', 'MAYOTTE', 'Mayotte', NULL, NULL, 'n'), +('MX', 'MEXICO', 'Mexico', 'MEX', 484, 'n'), +('FM', 'MICRONESIA, FEDERATED STATES OF', 'Micronesia, Federated States of', 'FSM', 583, 'n'), +('MD', 'MOLDOVA, REPUBLIC OF', 'Moldova, Republic of', 'MDA', 498, 'n'), +('MC', 'MONACO', 'Monaco', 'MCO', 492, 'n'), +('MN', 'MONGOLIA', 'Mongolia', 'MNG', 496, 'n'), +('MS', 'MONTSERRAT', 'Montserrat', 'MSR', 500, 'n'), +('MA', 'MOROCCO', 'Morocco', 'MAR', 504, 'n'), +('MZ', 'MOZAMBIQUE', 'Mozambique', 'MOZ', 508, 'n'), +('MM', 'MYANMAR', 'Myanmar', 'MMR', 104, 'n'), +('NA', 'NAMIBIA', 'Namibia', 'NAM', 516, 'n'), +('NR', 'NAURU', 'Nauru', 'NRU', 520, 'n'), +('NP', 'NEPAL', 'Nepal', 'NPL', 524, 'n'), +('NL', 'NETHERLANDS', 'Netherlands', 'NLD', 528, 'y'), +('AN', 'NETHERLANDS ANTILLES', 'Netherlands Antilles', 'ANT', 530, 'n'), +('NC', 'NEW CALEDONIA', 'New Caledonia', 'NCL', 540, 'n'), +('NZ', 'NEW ZEALAND', 'New Zealand', 'NZL', 554, 'n'), +('NI', 'NICARAGUA', 'Nicaragua', 'NIC', 558, 'n'), +('NE', 'NIGER', 'Niger', 'NER', 562, 'n'), +('NG', 'NIGERIA', 'Nigeria', 'NGA', 566, 'n'), +('NU', 'NIUE', 'Niue', 'NIU', 570, 'n'), +('NF', 'NORFOLK ISLAND', 'Norfolk Island', 'NFK', 574, 'n'), +('MP', 'NORTHERN MARIANA ISLANDS', 'Northern Mariana Islands', 'MNP', 580, 'n'), +('NO', 'NORWAY', 'Norway', 'NOR', 578, 'n'), +('OM', 'OMAN', 'Oman', 'OMN', 512, 'n'), +('PK', 'PAKISTAN', 'Pakistan', 'PAK', 586, 'n'), +('PW', 'PALAU', 'Palau', 'PLW', 585, 'n'), +('PS', 'PALESTINIAN TERRITORY, OCCUPIED', 'Palestinian Territory, Occupied', NULL, NULL, 'n'), +('PA', 'PANAMA', 'Panama', 'PAN', 591, 'n'), +('PG', 'PAPUA NEW GUINEA', 'Papua New Guinea', 'PNG', 598, 'n'), +('PY', 'PARAGUAY', 'Paraguay', 'PRY', 600, 'n'), +('PE', 'PERU', 'Peru', 'PER', 604, 'n'), +('PH', 'PHILIPPINES', 'Philippines', 'PHL', 608, 'n'), +('PN', 'PITCAIRN', 'Pitcairn', 'PCN', 612, 'n'), +('PL', 'POLAND', 'Poland', 'POL', 616, 'y'), +('PT', 'PORTUGAL', 'Portugal', 'PRT', 620, 'y'), +('PR', 'PUERTO RICO', 'Puerto Rico', 'PRI', 630, 'n'), +('QA', 'QATAR', 'Qatar', 'QAT', 634, 'n'), +('RE', 'REUNION', 'Reunion', 'REU', 638, 'n'), +('RO', 'ROMANIA', 'Romania', 'ROM', 642, 'y'), +('RU', 'RUSSIAN FEDERATION', 'Russian Federation', 'RUS', 643, 'n'), +('RW', 'RWANDA', 'Rwanda', 'RWA', 646, 'n'), +('SH', 'SAINT HELENA', 'Saint Helena', 'SHN', 654, 'n'), +('KN', 'SAINT KITTS AND NEVIS', 'Saint Kitts and Nevis', 'KNA', 659, 'n'), +('LC', 'SAINT LUCIA', 'Saint Lucia', 'LCA', 662, 'n'), +('PM', 'SAINT PIERRE AND MIQUELON', 'Saint Pierre and Miquelon', 'SPM', 666, 'n'), +('VC', 'SAINT VINCENT AND THE GRENADINES', 'Saint Vincent and the Grenadines', 'VCT', 670, 'n'), +('WS', 'SAMOA', 'Samoa', 'WSM', 882, 'n'), +('SM', 'SAN MARINO', 'San Marino', 'SMR', 674, 'n'), +('ST', 'SAO TOME AND PRINCIPE', 'Sao Tome and Principe', 'STP', 678, 'n'), +('SA', 'SAUDI ARABIA', 'Saudi Arabia', 'SAU', 682, 'n'), +('SN', 'SENEGAL', 'Senegal', 'SEN', 686, 'n'), +('RS', 'SERBIA', 'Serbia', 'SRB', 381, 'n'), +('SC', 'SEYCHELLES', 'Seychelles', 'SYC', 690, 'n'), +('SL', 'SIERRA LEONE', 'Sierra Leone', 'SLE', 694, 'n'), +('SG', 'SINGAPORE', 'Singapore', 'SGP', 702, 'n'), +('SK', 'SLOVAKIA', 'Slovakia', 'SVK', 703, 'y'), +('SI', 'SLOVENIA', 'Slovenia', 'SVN', 705, 'y'), +('SB', 'SOLOMON ISLANDS', 'Solomon Islands', 'SLB', 90, 'n'), +('SO', 'SOMALIA', 'Somalia', 'SOM', 706, 'n'), +('ZA', 'SOUTH AFRICA', 'South Africa', 'ZAF', 710, 'n'), +('GS', 'SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS', 'South Georgia and the South Sandwich Islands', NULL, NULL, 'n'), +('ES', 'SPAIN', 'Spain', 'ESP', 724, 'y'), +('LK', 'SRI LANKA', 'Sri Lanka', 'LKA', 144, 'n'), +('SD', 'SUDAN', 'Sudan', 'SDN', 736, 'n'), +('SR', 'SURINAME', 'Suriname', 'SUR', 740, 'n'), +('SJ', 'SVALBARD AND JAN MAYEN', 'Svalbard and Jan Mayen', 'SJM', 744, 'n'), +('SZ', 'SWAZILAND', 'Swaziland', 'SWZ', 748, 'n'), +('SE', 'SWEDEN', 'Sweden', 'SWE', 752, 'y'), +('CH', 'SWITZERLAND', 'Switzerland', 'CHE', 756, 'n'), +('SY', 'SYRIAN ARAB REPUBLIC', 'Syrian Arab Republic', 'SYR', 760, 'n'), +('TW', 'TAIWAN, PROVINCE OF CHINA', 'Taiwan, Province of China', 'TWN', 158, 'n'), +('TJ', 'TAJIKISTAN', 'Tajikistan', 'TJK', 762, 'n'), +('TZ', 'TANZANIA, UNITED REPUBLIC OF', 'Tanzania, United Republic of', 'TZA', 834, 'n'), +('TH', 'THAILAND', 'Thailand', 'THA', 764, 'n'), +('TL', 'TIMOR-LESTE', 'Timor-Leste', NULL, NULL, 'n'), +('TG', 'TOGO', 'Togo', 'TGO', 768, 'n'), +('TK', 'TOKELAU', 'Tokelau', 'TKL', 772, 'n'), +('TO', 'TONGA', 'Tonga', 'TON', 776, 'n'), +('TT', 'TRINIDAD AND TOBAGO', 'Trinidad and Tobago', 'TTO', 780, 'n'), +('TN', 'TUNISIA', 'Tunisia', 'TUN', 788, 'n'), +('TR', 'TURKEY', 'Turkey', 'TUR', 792, 'n'), +('TM', 'TURKMENISTAN', 'Turkmenistan', 'TKM', 795, 'n'), +('TC', 'TURKS AND CAICOS ISLANDS', 'Turks and Caicos Islands', 'TCA', 796, 'n'), +('TV', 'TUVALU', 'Tuvalu', 'TUV', 798, 'n'), +('UG', 'UGANDA', 'Uganda', 'UGA', 800, 'n'), +('UA', 'UKRAINE', 'Ukraine', 'UKR', 804, 'n'), +('AE', 'UNITED ARAB EMIRATES', 'United Arab Emirates', 'ARE', 784, 'n'), +('GB', 'UNITED KINGDOM', 'United Kingdom', 'GBR', 826, 'y'), +('US', 'UNITED STATES', 'United States', 'USA', 840, 'n'), +('UM', 'UNITED STATES MINOR OUTLYING ISLANDS', 'United States Minor Outlying Islands', NULL, NULL, 'n'), +('UY', 'URUGUAY', 'Uruguay', 'URY', 858, 'n'), +('UZ', 'UZBEKISTAN', 'Uzbekistan', 'UZB', 860, 'n'), +('VU', 'VANUATU', 'Vanuatu', 'VUT', 548, 'n'), +('VE', 'VENEZUELA', 'Venezuela', 'VEN', 862, 'n'), +('VN', 'VIET NAM', 'Viet Nam', 'VNM', 704, 'n'), +('VG', 'VIRGIN ISLANDS, BRITISH', 'Virgin Islands, British', 'VGB', 92, 'n'), +('VI', 'VIRGIN ISLANDS, U.S.', 'Virgin Islands, U.s.', 'VIR', 850, 'n'), +('WF', 'WALLIS AND FUTUNA', 'Wallis and Futuna', 'WLF', 876, 'n'), +('EH', 'WESTERN SAHARA', 'Western Sahara', 'ESH', 732, 'n'), +('YE', 'YEMEN', 'Yemen', 'YEM', 887, 'n'), +('ZM', 'ZAMBIA', 'Zambia', 'ZMB', 894, 'n'), +('ZW', 'ZIMBABWE', 'Zimbabwe', 'ZWE', 716, 'n'), +('ME', 'MONTENEGRO', 'Montenegro', 'MNE', 382, 'n'); -- -------------------------------------------------------- @@ -2209,7 +2291,7 @@ -- Dumping data for table `sys_config` -- -INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.3'); -INSERT INTO sys_config VALUES ('2','interface','session_timeout','0'); +INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4p1'); +INSERT INTO sys_config VALUES ('interface','session_timeout','0'); -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; -- Gitblit v1.9.1