goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #253 from Manawyrm/utf8mb4

浏览代码 
Changed DB layout to UTF8mb4
这个提交包含在：
Peter Goodhall 2019-02-25 16:45:14 +00:00 提交者 GitHub
当前提交 b6502bc2ef
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 12 个文件被更改，包括 22 次插入 和 22 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

4
application/config/database.sample.php
查看文件

@ -87,8 +87,8 @@ $db['default'] = array(
'db_debug' => (ENVIRONMENT !== 'production'),
'cache_on' => FALSE,
'cachedir' => '',
'char_set' => 'utf8',
'dbcollat' => 'utf8_general_ci',
'char_set' => 'utf8mb4',
'dbcollat' => 'utf8mb4_general_ci',
'swap_pre' => '',
'encrypt' => FALSE,
'compress' => FALSE,

4
install/config/database.php
查看文件

@ -87,8 +87,8 @@ $db['default'] = array(
'db_debug' => (ENVIRONMENT !== 'production'),
'cache_on' => FALSE,
'cachedir' => '',
'char_set' => 'utf8',
'dbcollat' => 'utf8_general_ci',
'char_set' => 'utf8mb4',
'dbcollat' => 'utf8mb4_general_ci',
'swap_pre' => '',
'encrypt' => FALSE,
'compress' => FALSE,

2
sql/tables/cat.sql
查看文件

@ -5,6 +5,6 @@ CREATE TABLE IF NOT EXISTS `cat` (
`mode` varchar(10) NOT NULL,
`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ;
ALTER TABLE `cat` ADD `downlink_freq` INT(11) DEFAULT NULL AFTER `mode`, ADD `uplink_freq` INT(11) DEFAULT NULL AFTER `downlink_freq`, ADD `downlink_mode` VARCHAR(255) DEFAULT NULL AFTER `uplink_freq`, ADD `uplink_mode` VARCHAR(255) DEFAULT NULL AFTER `downlink_mode`, ADD `sat_name` VARCHAR(255) DEFAULT NULL AFTER `uplink_mode`;

2
sql/tables/config.sql
查看文件

@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS `config` (
`eqsl_download_url` varchar(244) DEFAULT NULL,
`eqsl_rcvd_mark` varchar(1) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
) ENGINE=InnoDB DEFAULT CHARSET=utfmb4 AUTO_INCREMENT=2 ;
--
-- Dumping data for table `config`

2
sql/tables/contest_template.sql
查看文件

@ -45,7 +45,7 @@ CREATE TABLE `contest_template` (
`scoring` varchar(255) NOT NULL,
PRIMARY KEY (`id`),
KEY `name` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utfmb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--

2
sql/tables/contests.sql
查看文件

@ -30,7 +30,7 @@ CREATE TABLE `contests` (
`template` int(11) NOT NULL,
`serial_num` tinyint(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utfmb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--

6
sql/tables/dxcc.sql
查看文件

@ -13,7 +13,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
/*!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 */;
/*!40101 SET NAMES utfmb4 */;
--
-- Database: `hrd_2e0sql`
@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS `dxcc` (
`lat` float NOT NULL,
PRIMARY KEY (`prefix`),
KEY `prefix` (`prefix`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
) ENGINE=MyISAM DEFAULT CHARSET=utfmb4;
--
-- Dumping data for table `dxcc`
@ -3291,7 +3291,7 @@ CREATE TABLE IF NOT EXISTS `dxccexceptions` (
`start` datetime NOT NULL,
`end` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=166 ;
) ENGINE=InnoDB DEFAULT CHARSET=utfmb4 AUTO_INCREMENT=166 ;
--
-- Dumping data for table `dxccexceptions`

4
sql/tables/log.sql
查看文件

@ -13,7 +13,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
/*!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 */;
/*!40101 SET NAMES utfmb4 */;
--
-- Database: `2e0sql_log`
@ -153,7 +153,7 @@ CREATE TABLE IF NOT EXISTS `TABLE_HRD_CONTACTS_V01` (
KEY `HRD_IDX_COL_MODE` (`COL_MODE`),
KEY `HRD_IDX_COL_PFX` (`COL_PFX`),
KEY `HRD_IDX_COL_TIME_ON` (`COL_TIME_ON`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=utfmb4;
ALTER TABLE `TABLE_HRD_CONTACTS_V01` ADD `COL_ADDRESS_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_CREDIT_SUBMITTED`, ADD `COL_AWARD_GRANTED` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_ADDRESS_INTL`, ADD `COL_AWARD_SUMMITED` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_AWARD_GRANTED`, ADD `COL_CLUBLOG_QSO_UPLOAD_DATE` DATETIME NULL DEFAULT NULL AFTER `COL_AWARD_SUMMITED`, ADD `COL_CLUBLOG_QSO_UPLOAD_STATUS` VARCHAR(20) NULL DEFAULT NULL AFTER `COL_CLUBLOG_QSO_UPLOAD_DATE`, ADD `COL_COMMENT_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_CLUBLOG_QSO_UPLOAD_STATUS`, ADD `COL_COUNTRY_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_COMMENT_INTL`, ADD `COL_SILENT_KEY` VARCHAR(2) NULL DEFAULT NULL AFTER `COL_COUNTRY_INTL`, ADD `COL_SKCC` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_SILENT_KEY`, ADD `COL_DARC_DOK` VARCHAR(10) NULL DEFAULT NULL AFTER `COL_SKCC`, ADD `COL_FISTS` INT(10) NULL DEFAULT NULL AFTER `COL_DARC_DOK`, ADD `COL_FISTS_CC` INT(10) NULL DEFAULT NULL AFTER `COL_FISTS`, ADD `COL_HRDLOG_QSO_UPLOAD_DATE` DATETIME NULL DEFAULT NULL AFTER `COL_FISTS_CC`, ADD `COL_HRDLOG_QSO_UPLOAD_STATUS` VARCHAR(10) NULL DEFAULT NULL AFTER `COL_HRDLOG_QSO_UPLOAD_DATE`, ADD `COL_MY_ANTENNA` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_HRDLOG_QSO_UPLOAD_STATUS`, ADD `COL_MY_ANTENNA_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_ANTENNA`, ADD `COL_MY_CITY_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_ANTENNA_INTL`, ADD `COL_MY_COUNTRY_INTL` INT(6) NULL DEFAULT NULL AFTER `COL_MY_CITY_INTL`, ADD `COL_MY_DXCC` INT(6) NULL DEFAULT NULL AFTER `COL_MY_COUNTRY_INTL`, ADD `COL_MY_FISTS` INT(10) NULL DEFAULT NULL AFTER `COL_MY_DXCC`, ADD `COL_MY_IOTA_ISLAND_ID` VARCHAR(10) NULL DEFAULT NULL AFTER `COL_MY_FISTS`, ADD `COL_MY_NAME_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_IOTA_ISLAND_ID`, ADD `COL_MY_POSTCODE_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_NAME_INTL`, ADD `COL_MY_RIG_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_POSTCODE_INTL`, ADD `COL_MY_SIG_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_RIG_INTL`, ADD `COL_MY_SIG_INFO_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_SIG_INTL`, ADD `COL_MY_SOTA_REF` VARCHAR(50) NULL DEFAULT NULL AFTER `COL_MY_SIG_INFO_INTL`, ADD `COL_MY_STREET_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_SOTA_REF`, ADD `COL_MY_USACA_COUNTIES` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_STREET_INTL`, ADD `COL_MY_VUCC_GRIDS` VARCHAR(50) NULL DEFAULT NULL AFTER `COL_MY_USACA_COUNTIES`, ADD `COL_NAME_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_VUCC_GRIDS`, ADD `COL_NOTES_INTL` LONGTEXT NULL DEFAULT NULL AFTER `COL_NAME_INTL`, ADD `COL_QRZCOM_QSO_UPLOAD_DATE` DATETIME NULL DEFAULT NULL AFTER `COL_NOTES_INTL`, ADD `COL_QRZCOM_QSO_UPLOAD_STATUS` VARCHAR(10) NULL DEFAULT NULL AFTER `COL_QRZCOM_QSO_UPLOAD_DATE`, ADD `COL_QSO_DATE` DATE NULL DEFAULT NULL AFTER `COL_QRZCOM_QSO_UPLOAD_STATUS`, ADD `COL_QSO_DATE_OFF` DATE NULL DEFAULT NULL AFTER `COL_QSO_DATE`, ADD `COL_QTH_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_QSO_DATE_OFF`, ADD `COL_REGION` VARCHAR(25) NULL DEFAULT NULL AFTER `COL_QTH_INTL`, ADD `COL_RIG_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_REGION`, ADD `COL_SIG_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_RIG_INTL`, ADD `COL_SIG_INFO_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_SIG_INTL`;

4
sql/tables/notes.sql
查看文件

@ -13,7 +13,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
/*!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 */;
/*!40101 SET NAMES utfmb4 */;
--
-- Database: `hrd_2e0sql`
@ -31,4 +31,4 @@ CREATE TABLE IF NOT EXISTS `notes` (
`title` varchar(255) NOT NULL,
`note` text NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
) ENGINE=InnoDB DEFAULT CHARSET=utfmb4 AUTO_INCREMENT=2 ;

2
sql/tables/station_profile.sql
查看文件

@ -11,7 +11,7 @@ CREATE TABLE `station_profile` (
`station_cnty` varchar(200) DEFAULT NULL,
`station_cq` int(5) DEFAULT NULL,
`station_itu` int(5) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utfmb4;
ALTER TABLE `station_profile`
MODIFY COLUMN `station_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT FIRST ,

6
sql/tables/timezones.sql
查看文件

@ -7,7 +7,7 @@
/*!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 */;
/*!40101 SET NAMES utfmb4 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@ -21,13 +21,13 @@
DROP TABLE IF EXISTS `timezones`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utfmb4 */;
CREATE TABLE `timezones` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`offset` decimal(3,1) NOT NULL,
`name` varchar(120) COLLATE utf8_bin NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=151 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
) ENGINE=MyISAM AUTO_INCREMENT=151 DEFAULT CHARSET=utfmb4 COLLATE=utf8_bin;
/*!40101 SET character_set_client = @saved_cs_client */;
--

6
sql/tables/users.sql
查看文件

@ -7,7 +7,7 @@
/*!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 */;
/*!40101 SET NAMES utfmb4 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@ -21,7 +21,7 @@
DROP TABLE IF EXISTS `users`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utfmb4 */;
CREATE TABLE `users` (
`user_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Unique user ID',
`user_name` varchar(32) NOT NULL COMMENT 'Username',
@ -41,7 +41,7 @@ CREATE TABLE `users` (
PRIMARY KEY (`user_id`),
UNIQUE KEY `user_name` (`user_name`),
UNIQUE KEY `user_email` (`user_email`)
) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utfmb4;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;