View | Details | Raw Unified | Return to bug 39075
Collapse All | Expand All

(-)a/installer/data/mysql/db_revs/241200015.pl (-2 / +2 lines)
Lines 12-18 return { Link Here
12
            if ( column_exists( 'erm_counter_files', 'date_uploaded' ) ) {
12
            if ( column_exists( 'erm_counter_files', 'date_uploaded' ) ) {
13
                $dbh->do(
13
                $dbh->do(
14
                    q{
14
                    q{
15
                    ALTER TABLE erm_counter_files CHANGE COLUMN date_uploaded date_uploaded timestamp DEFAULT current_timestamp() COMMENT 'counter file upload date'
15
                    ALTER TABLE erm_counter_files CHANGE COLUMN date_uploaded date_uploaded timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'counter file upload date'
16
                }
16
                }
17
                );
17
                );
18
                say_success(
18
                say_success(
Lines 26-32 return { Link Here
26
            if ( column_exists( 'erm_counter_logs', 'importdate' ) ) {
26
            if ( column_exists( 'erm_counter_logs', 'importdate' ) ) {
27
                $dbh->do(
27
                $dbh->do(
28
                    q{
28
                    q{
29
                    ALTER TABLE erm_counter_logs CHANGE COLUMN importdate importdate timestamp DEFAULT current_timestamp() COMMENT 'counter file import date'
29
                    ALTER TABLE erm_counter_logs CHANGE COLUMN importdate importdate timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'counter file import date'
30
                }
30
                }
31
                );
31
                );
32
                say_success( $out, "Successfully corrected incorrect default value for 'erm_counter_logs.importdate" );
32
                say_success( $out, "Successfully corrected incorrect default value for 'erm_counter_logs.importdate" );
(-)a/installer/data/mysql/kohastructure.sql (-3 / +2 lines)
Lines 3042-3048 CREATE TABLE `erm_counter_files` ( Link Here
3042
  `type` varchar(80) DEFAULT NULL COMMENT 'type of counter file',
3042
  `type` varchar(80) DEFAULT NULL COMMENT 'type of counter file',
3043
  `filename` varchar(80) DEFAULT NULL COMMENT 'name of the counter file',
3043
  `filename` varchar(80) DEFAULT NULL COMMENT 'name of the counter file',
3044
  `file_content` longblob DEFAULT NULL COMMENT 'content of the counter file',
3044
  `file_content` longblob DEFAULT NULL COMMENT 'content of the counter file',
3045
  `date_uploaded` timestamp NULL DEFAULT current_timestamp() COMMENT 'counter file upload date',
3045
  `date_uploaded` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'counter file upload date',
3046
  PRIMARY KEY (`erm_counter_files_id`),
3046
  PRIMARY KEY (`erm_counter_files_id`),
3047
  KEY `erm_counter_files_ibfk_1` (`usage_data_provider_id`),
3047
  KEY `erm_counter_files_ibfk_1` (`usage_data_provider_id`),
3048
  CONSTRAINT `erm_counter_files_ibfk_1` FOREIGN KEY (`usage_data_provider_id`) REFERENCES `erm_usage_data_providers` (`erm_usage_data_provider_id`) ON DELETE CASCADE ON UPDATE CASCADE
3048
  CONSTRAINT `erm_counter_files_ibfk_1` FOREIGN KEY (`usage_data_provider_id`) REFERENCES `erm_usage_data_providers` (`erm_usage_data_provider_id`) ON DELETE CASCADE ON UPDATE CASCADE
Lines 3061-3067 CREATE TABLE `erm_counter_logs` ( Link Here
3061
  `borrowernumber` int(11) DEFAULT NULL COMMENT 'foreign key to borrowers',
3061
  `borrowernumber` int(11) DEFAULT NULL COMMENT 'foreign key to borrowers',
3062
  `counter_files_id` int(11) DEFAULT NULL COMMENT 'foreign key to erm_counter_files',
3062
  `counter_files_id` int(11) DEFAULT NULL COMMENT 'foreign key to erm_counter_files',
3063
  `usage_data_provider_id` int(11) DEFAULT NULL COMMENT 'foreign key to erm_usage_data_providers',
3063
  `usage_data_provider_id` int(11) DEFAULT NULL COMMENT 'foreign key to erm_usage_data_providers',
3064
  `importdate` timestamp NULL DEFAULT current_timestamp() COMMENT 'counter file import date',
3064
  `importdate` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'counter file import date',
3065
  `filename` varchar(80) DEFAULT NULL COMMENT 'name of the counter file',
3065
  `filename` varchar(80) DEFAULT NULL COMMENT 'name of the counter file',
3066
  `logdetails` longtext DEFAULT NULL COMMENT 'details from the counter log',
3066
  `logdetails` longtext DEFAULT NULL COMMENT 'details from the counter log',
3067
  PRIMARY KEY (`erm_counter_log_id`),
3067
  PRIMARY KEY (`erm_counter_log_id`),
3068
- 

Return to bug 39075