From f06f4b8424d33e1e06d9f99aa6f2cbc4b5f252e3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 08 Mar 2015 07:49:36 -0400
Subject: [PATCH] Fix storing signatures with big images in MySQL database (#1490306)
---
CHANGELOG | 1 +
SQL/mysql/2015030800.sql | 1 +
SQL/postgres/2015030800.sql | 1 +
SQL/mssql/2015030800.sql | 1 +
SQL/sqlite/2015030800.sql | 1 +
SQL/oracle/2015030800.sql | 1 +
SQL/postgres.initial.sql | 2 +-
SQL/mysql.initial.sql | 4 ++--
SQL/sqlite.initial.sql | 2 +-
SQL/mssql.initial.sql | 2 +-
SQL/oracle.initial.sql | 2 +-
11 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4376812..390168c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@
- Fix javascript error after creating a folder which is a subfolder of another one (#1490297)
- Fix bug where subject of sent/saved message was removed if mbstring wasn't installed (#1490295)
- Fix missing vcard_attachment icon on messages list (#1490303)
+- Fix storing signatures with big images in MySQL database (#1490306)
RELEASE 1.1.0
-------------
diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
index b45db10..8002170 100644
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -393,6 +393,6 @@
WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
GO
-INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2014042900')
+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2015030800')
GO
\ No newline at end of file
diff --git a/SQL/mssql/2015030800.sql b/SQL/mssql/2015030800.sql
new file mode 100644
index 0000000..fe6741a
--- /dev/null
+++ b/SQL/mssql/2015030800.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index f174dc5..721c839 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -162,7 +162,7 @@
`email` varchar(128) NOT NULL,
`reply-to` varchar(128) NOT NULL DEFAULT '',
`bcc` varchar(128) NOT NULL DEFAULT '',
- `signature` text,
+ `signature` longtext,
`html_signature` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY(`identity_id`),
CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
@@ -209,4 +209,4 @@
/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800');
diff --git a/SQL/mysql/2015030800.sql b/SQL/mysql/2015030800.sql
new file mode 100644
index 0000000..5ff6f14
--- /dev/null
+++ b/SQL/mysql/2015030800.sql
@@ -0,0 +1 @@
+ALTER TABLE `identities` CHANGE `signature` `signature` longtext;
diff --git a/SQL/oracle.initial.sql b/SQL/oracle.initial.sql
index d32cc92..0110abf 100644
--- a/SQL/oracle.initial.sql
+++ b/SQL/oracle.initial.sql
@@ -218,4 +218,4 @@
"value" long
);
-INSERT INTO "system" ("name", "value") VALUES ('roundcube-version', '2014042900');
+INSERT INTO "system" ("name", "value") VALUES ('roundcube-version', '2015030800');
diff --git a/SQL/oracle/2015030800.sql b/SQL/oracle/2015030800.sql
new file mode 100644
index 0000000..fe6741a
--- /dev/null
+++ b/SQL/oracle/2015030800.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index 238c3a6..ba53112 100644
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -290,4 +290,4 @@
value text
);
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800');
diff --git a/SQL/postgres/2015030800.sql b/SQL/postgres/2015030800.sql
new file mode 100644
index 0000000..fe6741a
--- /dev/null
+++ b/SQL/postgres/2015030800.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index 897e3af..a7426c1 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -201,4 +201,4 @@
value text NOT NULL
);
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800');
diff --git a/SQL/sqlite/2015030800.sql b/SQL/sqlite/2015030800.sql
new file mode 100644
index 0000000..fe6741a
--- /dev/null
+++ b/SQL/sqlite/2015030800.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
--
Gitblit v1.9.1