Merge pull request #704 from Robbt/fix-smartblock-multi-criteria

Fix smartblock multi criteria
This commit is contained in:
Robb 2019-02-09 11:22:29 -05:00 committed by GitHub
commit a4d0fcd8f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 857 additions and 220 deletions

View file

@ -299,7 +299,7 @@ CREATE TABLE "cc_block"
"creator_id" INTEGER,
"description" VARCHAR(512),
"length" interval DEFAULT '00:00:00',
"type" VARCHAR(7) DEFAULT 'dynamic',
"type" VARCHAR(7) DEFAULT 'static',
PRIMARY KEY ("id")
);
@ -337,6 +337,7 @@ CREATE TABLE "cc_blockcriteria"
"modifier" VARCHAR(16) NOT NULL,
"value" VARCHAR(512) NOT NULL,
"extra" VARCHAR(512),
"criteriagroup" INTEGER,
"block_id" INTEGER NOT NULL,
PRIMARY KEY ("id")
);