Commit dfbd4bc4 authored by Romain Courteaud's avatar Romain Courteaud

slapos_mysql_innodb_catalog: drop organisation_security_uid

parent 629b217c
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`, `organisation_security_uid`, (`uid`, `security_uid`, `function_security_uid`, `group_security_uid`, `shadow_security_uid`, `computer_security_uid`,`user_security_uid`, `subscription_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`,
...@@ -17,7 +17,6 @@ VALUES ...@@ -17,7 +17,6 @@ VALUES
<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="subscription_security_uid[loop_item]" type="int" optional>,
<dtml-sqlvar expr="organisation_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>,
......
...@@ -20,7 +20,6 @@ shadow_security_uid\n ...@@ -20,7 +20,6 @@ shadow_security_uid\n
computer_security_uid\n computer_security_uid\n
user_security_uid\n user_security_uid\n
subscription_security_uid\n subscription_security_uid\n
organisation_security_uid\n
project_security_uid\n project_security_uid\n
getOwnerInfo\n getOwnerInfo\n
getViewPermissionOwner\n getViewPermissionOwner\n
......
...@@ -11,7 +11,6 @@ CREATE TABLE `catalog` ( ...@@ -11,7 +11,6 @@ CREATE TABLE `catalog` (
`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, `subscription_security_uid` INT UNSIGNED,
`organisation_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 '',
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<key>computer | computer_security_uid</key> <key>computer | computer_security_uid</key>
<key>function | function_security_uid</key> <key>function | function_security_uid</key>
<key>group | group_security_uid</key> <key>group | group_security_uid</key>
<key>organisation | organisation_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>subscription | subscription_security_uid</key>
......
...@@ -4,5 +4,4 @@ shadow | shadow_security_uid ...@@ -4,5 +4,4 @@ shadow | shadow_security_uid
computer | computer_security_uid computer | computer_security_uid
user | user_security_uid user | user_security_uid
subscription | subscription_security_uid subscription | subscription_security_uid
organisation | organisation_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