ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity

Merge pull request #522 from oxteam/oxteam-fix_gpdr_sql_backward_comp

Browse source 
Fix MySQL/MariaDB 5.5.x  backward compatibility issue with 'ea_consents' table (#518)
This commit is contained in:
Alex Tselegidis 2020-03-09 21:49:46 +01:00 committed by GitHub
commit bd45947a42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/application/migrations/012_legal_contents.php
View file

@ -25,9 +25,9 @@ class Migration_Legal_contents extends CI_Migration {
$this->db->query(' $this->db->query('
CREATE TABLE IF NOT EXISTS `ea_consents` ( CREATE TABLE IF NOT EXISTS `ea_consents` (
`id` INT(11) NOT NULL AUTO_INCREMENT, `id` INT(11) NOT NULL AUTO_INCREMENT,
`created` DATETIME DEFAULT CURRENT_TIMESTAMP, `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
`modified` DATETIME DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP, ON UPDATE CURRENT_TIMESTAMP,
`created` TIMESTAMP,
`first_name` VARCHAR(256), `first_name` VARCHAR(256),
`last_name` VARCHAR(256), `last_name` VARCHAR(256),
`email` VARCHAR(512), `email` VARCHAR(512),

1
src/application/models/Consents_model.php
View file

@ -74,6 +74,7 @@ class Consents_model extends CI_Model {
*/ */
protected function _insert($consent) protected function _insert($consent)
{ {
$this->db->set('created', 'NOW()', FALSE);
if ( ! $this->db->insert('ea_consents', $consent)) if ( ! $this->db->insert('ea_consents', $consent))
{ {
throw new Exception('Could not insert consent to the database.'); throw new Exception('Could not insert consent to the database.');

4
src/assets/sql/structure.sql
View file

@ -24,9 +24,9 @@ CREATE TABLE IF NOT EXISTS `ea_appointments` (
CREATE TABLE IF NOT EXISTS `ea_consents` ( CREATE TABLE IF NOT EXISTS `ea_consents` (
`id` INT(11) NOT NULL AUTO_INCREMENT, `id` INT(11) NOT NULL AUTO_INCREMENT,
`created` DATETIME DEFAULT CURRENT_TIMESTAMP, `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
`modified` DATETIME DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP, ON UPDATE CURRENT_TIMESTAMP,
`created` TIMESTAMP,
`first_name` VARCHAR(256), `first_name` VARCHAR(256),
`last_name` VARCHAR(256), `last_name` VARCHAR(256),
`email` VARCHAR(512), `email` VARCHAR(512),