aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2022-05-23 10:45:44 +0200
committerGravatar GitHub <noreply@github.com> 2022-05-23 10:45:44 +0200
commit8668ca7230e9198981e33f9882a6030c1733e7f3 (patch)
tree0952cff3106b609e8f5b4653a930eefa7279535c
parent2ac92b2d7c8221bc48b884640bb0c1090af7f756 (diff)
Fix MySQL/MariaDB types (#4387)
#fix https://github.com/FreshRSS/FreshRSS/issues/4386 Forgotten from https://github.com/FreshRSS/FreshRSS/pull/4347
-rw-r--r--app/SQL/install.sql.mysql.php6
-rw-r--r--app/SQL/install.sql.sqlite.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php
index 4e4b9ee58..2009e09d4 100644
--- a/app/SQL/install.sql.mysql.php
+++ b/app/SQL/install.sql.mysql.php
@@ -5,7 +5,7 @@ SQL;
$GLOBALS['SQL_CREATE_TABLES'] = <<<'SQL'
CREATE TABLE IF NOT EXISTS `_category` (
- `id` SMALLINT NOT NULL AUTO_INCREMENT, -- v0.7
+ `id` INT NOT NULL AUTO_INCREMENT, -- v0.7
`name` VARCHAR(191) NOT NULL, -- Max index length for Unicode is 191 characters (767 bytes) FreshRSS_DatabaseDAO::LENGTH_INDEX_UNICODE
`attributes` TEXT, -- v1.15.0
PRIMARY KEY (`id`),
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `_category` (
ENGINE = INNODB;
CREATE TABLE IF NOT EXISTS `_feed` (
- `id` SMALLINT NOT NULL AUTO_INCREMENT, -- v0.7
+ `id` INT NOT NULL AUTO_INCREMENT, -- v0.7
`url` VARCHAR(511) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
`kind` SMALLINT DEFAULT 0, -- 1.20.0
`category` INT DEFAULT 0, -- 1.20.0
@@ -94,7 +94,7 @@ SQL;
$GLOBALS['SQL_CREATE_TABLE_TAGS'] = <<<'SQL'
CREATE TABLE IF NOT EXISTS `_tag` ( -- v1.12
- `id` SMALLINT NOT NULL AUTO_INCREMENT,
+ `id` INT NOT NULL AUTO_INCREMENT,
`name` VARCHAR(63) NOT NULL,
`attributes` TEXT,
PRIMARY KEY (`id`),
diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php
index 6fe90c559..c0f5ae0b0 100644
--- a/app/SQL/install.sql.sqlite.php
+++ b/app/SQL/install.sql.sqlite.php
@@ -5,14 +5,14 @@ SQL;
$GLOBALS['SQL_CREATE_TABLES'] = <<<'SQL'
CREATE TABLE IF NOT EXISTS `category` (
- `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ `id` INT PRIMARY KEY AUTOINCREMENT NOT NULL,
`name` VARCHAR(255) NOT NULL,
`attributes` TEXT, -- v1.15.0
UNIQUE (`name`)
);
CREATE TABLE IF NOT EXISTS `feed` (
- `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ `id` INT PRIMARY KEY AUTOINCREMENT NOT NULL,
`url` VARCHAR(511) NOT NULL,
`kind` SMALLINT DEFAULT 0, -- 1.20.0
`category` INT DEFAULT 0, -- 1.20.0
@@ -88,7 +88,7 @@ SQL;
$GLOBALS['SQL_CREATE_TABLE_TAGS'] = <<<'SQL'
CREATE TABLE IF NOT EXISTS `tag` ( -- v1.12
- `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ `id` INT PRIMARY KEY AUTOINCREMENT NOT NULL,
`name` VARCHAR(63) NOT NULL,
`attributes` TEXT,
UNIQUE (`name`)