diff --git a/db/Makefile.am b/db/Makefile.am index a3fd4dd96..06e8a4514 100644 --- a/db/Makefile.am +++ b/db/Makefile.am @@ -1,3 +1,3 @@ AUTOMAKE_OPTIONS = gnu -EXTRA_DIST = zmschema.sql.z zmalter-0.0.1.sql zmalter-0.9.7.sql +EXTRA_DIST = zmschema.sql.z zmalter-0.0.1.sql zmalter-0.9.7.sql zmalter-0.9.8.sql diff --git a/db/Makefile.in b/db/Makefile.in index ba8e112b8..7d4ad4895 100644 --- a/db/Makefile.in +++ b/db/Makefile.in @@ -73,7 +73,7 @@ bindir = @bindir@ AUTOMAKE_OPTIONS = gnu -EXTRA_DIST = zmschema.sql.z zmalter-0.0.1.sql zmalter-0.9.7.sql +EXTRA_DIST = zmschema.sql.z zmalter-0.0.1.sql zmalter-0.9.7.sql zmalter-0.9.8.sql mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/db/zmalter-0.0.1.sql b/db/zmalter-0.0.1.sql index 428cba4b5..373afd273 100644 --- a/db/zmalter-0.0.1.sql +++ b/db/zmalter-0.0.1.sql @@ -1,5 +1,5 @@ -- --- This updates a 0.0.1 database to 0.9.8 +-- This updates a 0.0.1 database to 0.9.7 -- alter table Monitors modify Device tinyint unsigned NOT NULL default '0'; alter table Monitors modify Format tinyint unsigned NOT NULL; @@ -27,8 +27,6 @@ alter table Events add column TotScore int unsigned not null default 0 after Ala update Events set TotScore = AlarmFrames * AvgScore where TotScore = 0; alter table Events modify column Archived tinyint unsigned not null default 0; alter table Events add column Uploaded tinyint unsigned not null default 0 after Archived; -alter table Events add column Emailed tinyint unsigned not null default 0 after Uploaded; -alter table Events add column Messaged tinyint unsigned not null default 0 after Emailed; alter table Events add column LearnState char(1) default '' after Uploaded; CREATE TABLE Filters ( Id int(10) unsigned NOT NULL auto_increment, @@ -37,8 +35,6 @@ Name varchar(64) NOT NULL default '', Query text NOT NULL, AutoDelete tinyint(4) unsigned NOT NULL default '0', AutoUpload tinyint(4) unsigned NOT NULL default '0', -AutoEmail tinyint(4) unsigned NOT NULL default '0', -AutoMessage tinyint(4) unsigned NOT NULL default '0', PRIMARY KEY (Id), UNIQUE KEY FilterIDX (MonitorId,Name) ) TYPE=MyISAM; diff --git a/db/zmalter-0.9.8.sql b/db/zmalter-0.9.8.sql new file mode 100644 index 000000000..26b05ae32 --- /dev/null +++ b/db/zmalter-0.9.8.sql @@ -0,0 +1,4 @@ +-- +-- This updates a 0.9.8 database to 0.9.9 +-- +update Monitors set Colours = Colours * 8;