TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia into coupon

Browse Source 
# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml
This commit is contained in:
gmorel
2013-08-28 18:19:38 +02:00
parent 6c2dbb0152 0361cd1ff2
commit 71a91ff60f
53 changed files with 6375 additions and 5245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/insert.sql
View File

@@ -40,7 +40,7 @@ VALUES
(1, 'en_EN', 'euro'),
(2, 'fr_FR', 'dollar'),
(2, 'en_EN', 'dollar'),
(3, 'fr_FR', 'livre');
(3, 'fr_FR', 'livre'),
(3, 'en_EN', 'pound');

92
install/thelia.sql
View File

@@ -1028,49 +1028,6 @@ CREATE TABLE `message`
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
-- rewriting
-- ---------------------------------------------------------------------
DROP TABLE IF EXISTS `rewriting`;
CREATE TABLE `rewriting`
(
`id` INTEGER NOT NULL,
`url` VARCHAR(255) NOT NULL,
`product_id` INTEGER,
`category_id` INTEGER,
`folder_id` INTEGER,
`content_id` INTEGER,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_rewriting_product_id` (`product_id`),
INDEX `idx_rewriting_category_id` (`category_id`),
INDEX `idx_rewriting_folder_id` (`folder_id`),
INDEX `idx_rewriting_content_id` (`content_id`),
CONSTRAINT `fk_rewriting_product_id`
FOREIGN KEY (`product_id`)
REFERENCES `product` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE,
CONSTRAINT `fk_rewriting_category_id`
FOREIGN KEY (`category_id`)
REFERENCES `category` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE,
CONSTRAINT `fk_rewriting_folder_id`
FOREIGN KEY (`folder_id`)
REFERENCES `folder` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE,
CONSTRAINT `fk_rewriting_content_id`
FOREIGN KEY (`content_id`)
REFERENCES `content` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
-- coupon
-- ---------------------------------------------------------------------
@@ -1476,6 +1433,55 @@ CREATE TABLE `category_associated_content`
ON DELETE CASCADE
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
-- rewriting_url
-- ---------------------------------------------------------------------
DROP TABLE IF EXISTS `rewriting_url`;
CREATE TABLE `rewriting_url`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`url` VARCHAR(255) NOT NULL,
`view` VARCHAR(255),
`view_id` VARCHAR(255),
`view_locale` VARCHAR(255),
`redirected` INTEGER,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `url_UNIQUE` (`url`),
INDEX `idx_view_id` (`view_id`),
INDEX `idx_rewriting_url_redirected` (`redirected`),
CONSTRAINT `fk_rewriting_url_redirected`
FOREIGN KEY (`redirected`)
REFERENCES `rewriting_url` (`id`)
ON UPDATE RESTRICT
ON DELETE RESTRICT
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
-- rewriting_argument
-- ---------------------------------------------------------------------
DROP TABLE IF EXISTS `rewriting_argument`;
CREATE TABLE `rewriting_argument`
(
`rewriting_url_id` INTEGER NOT NULL,
`parameter` VARCHAR(255) NOT NULL,
`value` VARCHAR(255) NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`rewriting_url_id`,`parameter`,`value`),
INDEX `fk_rewriting_argument_rewirting_url_id` (`rewriting_url_id`),
CONSTRAINT `fk_rewriting_argument_rewirting_url_id`
FOREIGN KEY (`rewriting_url_id`)
REFERENCES `rewriting_url` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
-- category_i18n
-- ---------------------------------------------------------------------