Skip to content

Commit

Permalink
Merge /u/cpeel/dp/ branch new_release into master
Browse files Browse the repository at this point in the history 
https://sourceforge.net/p/dproofreaders/git/merge-requests/94/
  • Loading branch information
Casey Peel committed Jan 23, 2017
2 parents 0d072e8 + 500f33b commit 60b0aac
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 46 deletions.
3 changes: 2 additions & 1 deletion SETUP/change_log.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,10 @@
* various places: _() wrappers around strings to allow translation (lvl, cpeel)
* various places: Miscellaneous improvements (jmdyck, lmpryor, cpeel, donovang, mike_cie, rfarinha)

== Changes from R201601 to R?????? ==
== Changes from R201601 to R201701 ==
(Scripts supporting this upgrade are in SETUP/upgrade/09)

* MAJOR: New Format Preview functionality (rp31)
* MAJOR: Removed dependency on magic quotes allowing PHP 5.4 and later support (cpeel)

# vim: sw=4 ts=4 expandtab
83 changes: 42 additions & 41 deletions SETUP/db_schema.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CREATE TABLE `access_log` (
`action` varchar(16) NOT NULL default '',
`activity` varchar(10) NOT NULL default '',
KEY `subject_username` (`subject_username`,`timestamp`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -38,7 +38,7 @@ CREATE TABLE `authors` (
`enabled` tinytext NOT NULL,
`last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`author_id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -55,7 +55,7 @@ CREATE TABLE `best_tally_rank` (
`best_rank` int(6) NOT NULL default '0',
`best_rank_timestamp` int(10) unsigned NOT NULL default '0',
PRIMARY KEY (`tally_name`,`holder_type`,`holder_id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -71,7 +71,7 @@ CREATE TABLE `biographies` (
`bio` text NOT NULL,
`last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`bio_id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Contains biographies (see authors)';
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Contains biographies (see authors)';
# --------------------------------------------------------

#
Expand All @@ -87,7 +87,7 @@ CREATE TABLE `current_tallies` (
`holder_id` int(6) unsigned NOT NULL default '0',
`tally_value` int(8) NOT NULL default '0',
PRIMARY KEY (`tally_name`,`holder_type`,`holder_id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -111,7 +111,7 @@ CREATE TABLE `image_sources` (
`internal_comment` text,
UNIQUE KEY `code_name` (`code_name`),
UNIQUE KEY `display_name` (`display_name`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -126,7 +126,7 @@ CREATE TABLE `job_logs` (
`tracetime` int(12) unsigned NOT NULL default '0',
`event` varchar(20) NOT NULL default ''' ''',
`comments` varchar(255) default NULL
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -141,7 +141,7 @@ CREATE TABLE `marc_records` (
`original_array` text NOT NULL,
`updated_array` text NOT NULL,
PRIMARY KEY (`projectid`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -159,7 +159,7 @@ CREATE TABLE `news_items` (
`ordering` smallint(6) NOT NULL default '0',
`content` text NOT NULL,
PRIMARY KEY (`id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -173,7 +173,7 @@ CREATE TABLE `news_pages` (
`news_page_id` varchar(8) NOT NULL default '',
`t_last_change` int(11) NOT NULL default '0',
PRIMARY KEY (`news_page_id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -193,7 +193,7 @@ CREATE TABLE `non_activated_users` (
`u_intlang` varchar(25) default '',
`user_password` varchar(128) NOT NULL default '',
PRIMARY KEY (`username`)
) TYPE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Each row represents a not-yet-activated user, user_password ';
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Each row represents a not-yet-activated user, user_password ';
# --------------------------------------------------------

#
Expand All @@ -216,7 +216,7 @@ CREATE TABLE `page_events` (
KEY `username` (`username`,`round_id`),
KEY `projectid_username` (`projectid`,`username`),
KEY `username_projectid_round_time` (`username`,`projectid`,`round_id`,`timestamp`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -235,7 +235,7 @@ CREATE TABLE `past_tallies` (
`tally_value` int(8) NOT NULL default '0',
PRIMARY KEY (`tally_name`,`holder_type`,`holder_id`,`timestamp`),
KEY `tallyboard_time` (`tally_name`,`holder_type`,`timestamp`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -249,7 +249,7 @@ CREATE TABLE `pg_books` (
`etext_number` smallint(5) unsigned NOT NULL default '0',
`formats` tinytext NOT NULL,
PRIMARY KEY (`etext_number`)
) TYPE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Each row represents a different PG etext';
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Each row represents a different PG etext';
# --------------------------------------------------------

#
Expand All @@ -271,7 +271,7 @@ CREATE TABLE `project_events` (
PRIMARY KEY (`event_id`),
KEY `project` (`projectid`),
KEY `timestamp` (`timestamp`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -285,7 +285,7 @@ CREATE TABLE `project_holds` (
`projectid` varchar(22) NOT NULL,
`state` varchar(50) NOT NULL,
PRIMARY KEY (`projectid`,`state`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand Down Expand Up @@ -327,7 +327,7 @@ CREATE TABLE `project_pages` (
KEY `round2_time` (`round2_time`),
KEY `state` (`state`),
KEY `ProjectidStateIdx` (`projectid`,`state`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -348,7 +348,7 @@ CREATE TABLE `project_state_stats` (
`comments` varchar(255) default NULL,
KEY `date` (`date`),
KEY `state` (`state`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand Down Expand Up @@ -399,7 +399,7 @@ CREATE TABLE `projects` (
KEY `special_code` (`special_code`),
KEY `projectid_archived_state` (`projectid`,`archived`,`state`),
KEY `state_moddate` (`state`,`modifieddate`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -419,7 +419,7 @@ CREATE TABLE `queue_defns` (
`comment` text,
UNIQUE KEY `ordering` (`round_id`,`ordering`),
UNIQUE KEY `name` (`round_id`,`name`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -435,7 +435,7 @@ CREATE TABLE `quiz_passes` (
`quiz_page` varchar(15) NOT NULL default '',
`result` varchar(10) NOT NULL default '',
KEY `username` (`username`,`quiz_page`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -452,7 +452,7 @@ CREATE TABLE `rules` (
`subject` varchar(100) NOT NULL default '',
`rule` text NOT NULL,
PRIMARY KEY (`id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -466,9 +466,9 @@ CREATE TABLE `sessions` (
`sid` varchar(32) NOT NULL default '',
`expiration` int(11) NOT NULL default '0',
`value` text NOT NULL,
PRIMARY KEY (`sid`)
PRIMARY KEY (`sid`),
KEY `expiration` (`expiration`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -483,7 +483,7 @@ CREATE TABLE `site_tally_goals` (
`tally_name` char(2) NOT NULL default '',
`goal` int(6) NOT NULL default '0',
PRIMARY KEY (`date`,`tally_name`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -499,7 +499,7 @@ CREATE TABLE `smoothread` (
`committed` tinyint(4) NOT NULL default '0',
PRIMARY KEY (`projectid`,`user`),
KEY `user` (`user`)
) TYPE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Each row represents an association between a user and a proj';
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Each row represents an association between a user and a proj';
# --------------------------------------------------------

#
Expand All @@ -523,7 +523,7 @@ CREATE TABLE `special_days` (
`info_url` varchar(255) default NULL,
`image_url` varchar(255) default NULL,
UNIQUE KEY `spec_code` (`spec_code`)
) TYPE=MyISAM DEFAULT CHARSET=latin1 COMMENT='definitions of SPECIAL days';
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='definitions of SPECIAL days';
# --------------------------------------------------------

#
Expand Down Expand Up @@ -557,7 +557,7 @@ CREATE TABLE `tasks` (
`related_tasks` mediumtext NOT NULL,
`related_postings` mediumtext NOT NULL,
KEY `task_id` (`task_id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -571,8 +571,9 @@ CREATE TABLE `tasks_comments` (
`task_id` mediumint(9) NOT NULL default '0',
`u_id` mediumint(9) NOT NULL default '0',
`comment_date` int(11) NOT NULL default '0',
`comment` mediumtext NOT NULL
) TYPE=MyISAM DEFAULT CHARSET=latin1;
`comment` mediumtext NOT NULL,
PRIMARY KEY (`task_id`,`u_id`,`comment_date`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -590,7 +591,7 @@ CREATE TABLE `tasks_votes` (
`vote_browser` tinyint(1) NOT NULL default '0',
UNIQUE KEY `id` (`id`),
KEY `task_id` (`task_id`,`u_id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -606,7 +607,7 @@ CREATE TABLE `themes` (
`unixname` varchar(100) NOT NULL default '',
`created_by` varchar(25) NOT NULL default '',
KEY `theme_id` (`theme_id`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand Down Expand Up @@ -640,7 +641,7 @@ CREATE TABLE `uber_projects` (
`d_text_preparer` varchar(25) default NULL,
`d_extra_credits` tinytext,
PRIMARY KEY (`up_projectid`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -666,7 +667,7 @@ CREATE TABLE `user_active_log` (
`A_4wks` mediumint(8) unsigned default NULL,
`comments` varchar(255) default NULL,
KEY `timestamp_ndx` (`time_stamp`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -681,7 +682,7 @@ CREATE TABLE `user_filters` (
`filtertype` varchar(25) NOT NULL default '',
`value` text NOT NULL,
PRIMARY KEY (`username`,`filtertype`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand Down Expand Up @@ -719,7 +720,7 @@ CREATE TABLE `user_profiles` (
`h_twrap` tinyint(1) default '0',
PRIMARY KEY (`id`),
KEY `u_ref` (`u_ref`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -742,7 +743,7 @@ CREATE TABLE `user_project_info` (
`iste_posted` tinyint(1) NOT NULL default '0',
PRIMARY KEY (`username`,`projectid`),
KEY `projectid` (`projectid`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -769,7 +770,7 @@ CREATE TABLE `user_teams` (
`latestUser` mediumint(9) NOT NULL default '0',
PRIMARY KEY (`id`),
UNIQUE KEY `teamname` (`teamname`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand Down Expand Up @@ -811,7 +812,7 @@ CREATE TABLE `users` (
KEY `u_id` (`u_id`),
KEY `last_login` (`last_login`),
KEY `t_last_activity` (`t_last_activity`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -828,7 +829,7 @@ CREATE TABLE `usersettings` (
KEY `username_setting_val` (`username`,`setting`,`value`),
KEY `setting` (`setting`,`value`),
KEY `value` (`value`,`setting`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

#
Expand All @@ -849,6 +850,6 @@ CREATE TABLE `wordcheck_events` (
`corrections` text,
PRIMARY KEY (`check_id`),
KEY `pc_compound` (`projectid`,`timestamp`,`image`)
) TYPE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# --------------------------------------------------------

Loading

0 comments on commit 60b0aac

Please sign in to comment.