Commit 33069fc8 authored by Romain Courteaud's avatar Romain Courteaud

slapos_mysql_innodb_catalog: drop subscription_security_uid

parent 9263374d
REPLACE INTO REPLACE INTO
catalog catalog
(`uid`, `security_uid`, `function_security_uid`, `group_security_uid`, `shadow_security_uid`, `computer_security_uid`,`user_security_uid`, `subscription_security_uid`, (`uid`, `security_uid`, `function_security_uid`, `group_security_uid`, `shadow_security_uid`, `computer_security_uid`,`user_security_uid`,
`project_security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`, `project_security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,
`portal_type`, `opportunity_state`, `corporate_registration_code`, `ean13_code`, `validation_state`, `simulation_state`, `portal_type`, `opportunity_state`, `corporate_registration_code`, `ean13_code`, `validation_state`, `simulation_state`,
`causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`, `grouping_date`, `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`, `grouping_date`,
...@@ -16,7 +16,6 @@ VALUES ...@@ -16,7 +16,6 @@ VALUES
<dtml-sqlvar expr="shadow_security_uid[loop_item]" type="int" optional>, <dtml-sqlvar expr="shadow_security_uid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="computer_security_uid[loop_item]" type="int" optional>, <dtml-sqlvar expr="computer_security_uid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="user_security_uid[loop_item]" type="int" optional>, <dtml-sqlvar expr="user_security_uid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="subscription_security_uid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="project_security_uid[loop_item]" type="int" optional>, <dtml-sqlvar expr="project_security_uid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="getOwnerInfo[loop_item]['id']" type="string">, <dtml-sqlvar expr="getOwnerInfo[loop_item]['id']" type="string">,
<dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or ''" type="string" optional>, <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or ''" type="string" optional>,
......
...@@ -19,7 +19,6 @@ group_security_uid\n ...@@ -19,7 +19,6 @@ group_security_uid\n
shadow_security_uid\n shadow_security_uid\n
computer_security_uid\n computer_security_uid\n
user_security_uid\n user_security_uid\n
subscription_security_uid\n
project_security_uid\n project_security_uid\n
getOwnerInfo\n getOwnerInfo\n
getViewPermissionOwner\n getViewPermissionOwner\n
......
...@@ -10,7 +10,6 @@ CREATE TABLE `catalog` ( ...@@ -10,7 +10,6 @@ CREATE TABLE `catalog` (
`shadow_security_uid` INT UNSIGNED, `shadow_security_uid` INT UNSIGNED,
`computer_security_uid` INT UNSIGNED, `computer_security_uid` INT UNSIGNED,
`user_security_uid` INT UNSIGNED, `user_security_uid` INT UNSIGNED,
`subscription_security_uid` INT UNSIGNED,
`project_security_uid` INT UNSIGNED, `project_security_uid` INT UNSIGNED,
`owner` varbinary(255) NOT NULL default '', `owner` varbinary(255) NOT NULL default '',
`viewable_owner` varbinary(255) NOT NULL default '', `viewable_owner` varbinary(255) NOT NULL default '',
...@@ -50,7 +49,6 @@ CREATE TABLE `catalog` ( ...@@ -50,7 +49,6 @@ CREATE TABLE `catalog` (
KEY `shadow_security_uid` (`shadow_security_uid`), KEY `shadow_security_uid` (`shadow_security_uid`),
KEY `computer_security_uid` (`computer_security_uid`), KEY `computer_security_uid` (`computer_security_uid`),
KEY `user_security_uid` (`user_security_uid`), KEY `user_security_uid` (`user_security_uid`),
KEY `subscription_security_uid` (`subscription_security_uid`),
KEY `owner` (`owner`), KEY `owner` (`owner`),
KEY `viewable_owner` (`viewable_owner`), KEY `viewable_owner` (`viewable_owner`),
KEY `Parent` (`parent_uid`), KEY `Parent` (`parent_uid`),
......
...@@ -4,6 +4,5 @@ ...@@ -4,6 +4,5 @@
<key>group | group_security_uid</key> <key>group | group_security_uid</key>
<key>project | project_security_uid</key> <key>project | project_security_uid</key>
<key>shadow | shadow_security_uid</key> <key>shadow | shadow_security_uid</key>
<key>subscription | subscription_security_uid</key>
<key>user | user_security_uid</key> <key>user | user_security_uid</key>
</key_list> </key_list>
\ No newline at end of file
...@@ -3,5 +3,4 @@ group | group_security_uid ...@@ -3,5 +3,4 @@ group | group_security_uid
shadow | shadow_security_uid shadow | shadow_security_uid
computer | computer_security_uid computer | computer_security_uid
user | user_security_uid user | user_security_uid
subscription | subscription_security_uid
project | project_security_uid project | project_security_uid
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment