diff --git a/core/src/plugins/conf.sql/class.AJXP_SqlUser.php b/core/src/plugins/conf.sql/class.AJXP_SqlUser.php index d6c38321b9..bb80586f4c 100755 --- a/core/src/plugins/conf.sql/class.AJXP_SqlUser.php +++ b/core/src/plugins/conf.sql/class.AJXP_SqlUser.php @@ -191,7 +191,7 @@ public function setPref($prefName, $prefValue) // Update an existing rights row, because only some of the rights have changed. } else { - dibi::query('UPDATE [ajxp_user_prefs] SET ', Array('val'=>$prefValue), 'WHERE [login] = %s AND [name] = %s', $this->getId(), $prefName); + dibi::query('UPDATE [ajxp_user_prefs] SET [val] = %bin WHERE [login] = %s AND [name] = %s', $prefValue, $this->getId(), $prefName); $this->log('UPDATE PREFERENCE: [Login]: '.$this->getId().' [Preference]:'.$prefName.' [Value]:'.$prefValue); $this->prefs[$prefName] = $prefValue; diff --git a/core/src/plugins/conf.sql/class.sqlConfDriver.php b/core/src/plugins/conf.sql/class.sqlConfDriver.php index 41f19fc238..7016cec857 100644 --- a/core/src/plugins/conf.sql/class.sqlConfDriver.php +++ b/core/src/plugins/conf.sql/class.sqlConfDriver.php @@ -94,9 +94,9 @@ public function _savePluginConfig($pluginId, $options) { $res_opts = dibi::query('SELECT COUNT(*) FROM [ajxp_plugin_configs] WHERE [id] = %s', $pluginId); if ($res_opts->fetchSingle()) { - dibi::query('UPDATE [ajxp_plugin_configs] SET [configs] = %s WHERE [id] = %s', serialize($options), $pluginId); + dibi::query('UPDATE [ajxp_plugin_configs] SET [configs] = %bin WHERE [id] = %s', serialize($options), $pluginId); } else { - dibi::query('INSERT INTO [ajxp_plugin_configs]', array('id' => $pluginId, 'configs' => serialize($options))); + dibi::query('INSERT INTO [ajxp_plugin_configs] ([id],[configs]) VALUES (%s,%bin)', $pluginId, serialize($options)); } } diff --git a/core/src/plugins/conf.sql/create.mysql b/core/src/plugins/conf.sql/create.mysql index 512b488747..ff986da19d 100644 --- a/core/src/plugins/conf.sql/create.mysql +++ b/core/src/plugins/conf.sql/create.mysql @@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS ajxp_user_prefs ( rid INTEGER PRIMARY KEY AUTO_INCREMENT, login VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, - val VARCHAR(2000) + val BLOB ); CREATE TABLE IF NOT EXISTS ajxp_user_bookmarks ( @@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS ajxp_repo_options ( oid INTEGER PRIMARY KEY AUTO_INCREMENT, uuid VARCHAR(33) NOT NULL, name VARCHAR(50) NOT NULL, - val VARCHAR(2000), + val BLOB, INDEX (uuid) ); @@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS ajxp_groups ( CREATE TABLE IF NOT EXISTS ajxp_plugin_configs ( id VARCHAR(50) NOT NULL, - configs LONGTEXT NOT NULL, + configs LONGBLOB NOT NULL, PRIMARY KEY (id) ); diff --git a/core/src/plugins/conf.sql/create.pgsql b/core/src/plugins/conf.sql/create.pgsql index 844b33d8d2..114c8ae891 100644 --- a/core/src/plugins/conf.sql/create.pgsql +++ b/core/src/plugins/conf.sql/create.pgsql @@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS ajxp_user_prefs ( rid serial PRIMARY KEY, login varchar(255) NOT NULL, name varchar(255) NOT NULL, - val varchar(2000) + val bytea ); CREATE TABLE IF NOT EXISTS ajxp_user_bookmarks ( @@ -48,7 +48,7 @@ CREATE TABLE IF NOT EXISTS ajxp_repo_options ( oid serial PRIMARY KEY, uuid varchar(33) NOT NULL, name varchar(50) NOT NULL, - val varchar(2000) + val bytea ); CREATE INDEX ajxp_repo_options_uuid_idx ON ajxp_repo_options (uuid); @@ -66,7 +66,7 @@ CREATE TABLE IF NOT EXISTS ajxp_groups ( CREATE TABLE IF NOT EXISTS ajxp_plugin_configs ( id varchar(50) PRIMARY KEY, - configs text NOT NULL + configs bytea NOT NULL ); CREATE TABLE IF NOT EXISTS ajxp_simple_store ( diff --git a/core/src/plugins/conf.sql/create.sqlite b/core/src/plugins/conf.sql/create.sqlite index d5f5a37d1d..ed68f6e965 100644 --- a/core/src/plugins/conf.sql/create.sqlite +++ b/core/src/plugins/conf.sql/create.sqlite @@ -64,7 +64,7 @@ CREATE TABLE IF NOT EXISTS ajxp_groups ( CREATE TABLE IF NOT EXISTS ajxp_plugin_configs ( id text NOT NULL, - configs longtext NOT NULL + configs longblob NOT NULL ); CREATE TABLE IF NOT EXISTS ajxp_simple_store ( diff --git a/core/src/plugins/mq.sql/create.mysql b/core/src/plugins/mq.sql/create.mysql index ccf6d25cb0..cd20629687 100644 --- a/core/src/plugins/mq.sql/create.mysql +++ b/core/src/plugins/mq.sql/create.mysql @@ -1,8 +1,8 @@ CREATE TABLE IF NOT EXISTS ajxp_simple_store ( object_id VARCHAR(255) NOT NULL, store_id VARCHAR(50) NOT NULL, - serialized_data LONGTEXT NULL, + serialized_data LONGBLOB NULL, binary_data LONGBLOB NULL, related_object_id VARCHAR(255) NULL, PRIMARY KEY(object_id, store_id) -); \ No newline at end of file +); diff --git a/core/src/plugins/mq.sql/create.pgsql b/core/src/plugins/mq.sql/create.pgsql index 4c47a7bbf6..b33164340a 100644 --- a/core/src/plugins/mq.sql/create.pgsql +++ b/core/src/plugins/mq.sql/create.pgsql @@ -1,7 +1,7 @@ CREATE TABLE IF NOT EXISTS ajxp_simple_store ( object_id varchar(255) NOT NULL, store_id varchar(50) NOT NULL, - serialized_data text, + serialized_data bytea, binary_data bytea, related_object_id varchar(255), PRIMARY KEY(object_id, store_id) diff --git a/core/src/plugins/mq.sql/create.sqlite b/core/src/plugins/mq.sql/create.sqlite index 0858981812..de1c183205 100644 --- a/core/src/plugins/mq.sql/create.sqlite +++ b/core/src/plugins/mq.sql/create.sqlite @@ -1,7 +1,7 @@ CREATE TABLE IF NOT EXISTS ajxp_simple_store ( object_id text NOT NULL, store_id text NOT NULL, - serialized_data longtext, + serialized_data blob, binary_data blob, related_object_id text DEFAULT NULL );