From bb857dacee945e2b04802cc258017d80ed169fef Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Wed, 26 Dec 2007 11:23:38 +0000 Subject: [PATCH] Owner column cannot be NONE any longer, so transform NONE into empty string when indexing. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18517 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_mysql_innodb/z_catalog_object_list.xml | 4 ++-- bt5/erp5_banking_core/bt/revision | 2 +- .../erp5_mysql_innodb/z_catalog_object_list.xml | 17 ++++++++--------- .../erp5_mysql_innodb_catalog/bt/revision | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml index cac7ab4c33..223be9bcec 100644 --- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml +++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml @@ -272,7 +272,7 @@ VALUES\n <dtml-sqlvar expr="uid[loop_item]" type="int">, \n <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n - <dtml-sqlvar expr="getViewPermissionOwner[loop_item]" type="string" optional>,\n + <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or \'\'" type="string" optional>,\n <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n @@ -346,7 +346,7 @@ VALUES\n <dtml-sqlvar expr="uid[loop_item]" type="int">, \n <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n - <dtml-sqlvar expr="getViewPermissionOwner[loop_item]" type="string" optional>,\n + <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or \'\'" type="string" optional>,\n <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index ffe78b01d3..50b04dff0e 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -401 \ No newline at end of file +402 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml index deaaf6e141..82d0225769 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ZSQLMethods.SQL</string> - <string>SQL</string> - </tuple> - <none/> + <global name="SQL" module="Products.ZSQLMethods.SQL"/> + <tuple/> </tuple> </pickle> <pickle> @@ -354,7 +351,7 @@ VALUES\n (\n <dtml-sqlvar expr="uid[loop_item]" type="int">, \n <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n - <dtml-sqlvar expr="getViewPermissionOwner[loop_item]" type="string" optional>,\n + <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or \'\'" type="string" optional>,\n <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n @@ -395,9 +392,11 @@ VALUES\n <value> <object> <klass> - <global name="SQL" module="Shared.DC.ZRDB.DA"/> + <global name="__newobj__" module="copy_reg"/> </klass> - <none/> + <tuple> + <global name="SQL" module="Shared.DC.ZRDB.DA"/> + </tuple> <state> <dictionary> <item> @@ -436,7 +435,7 @@ VALUES\n (\n <dtml-sqlvar expr="uid[loop_item]" type="int">, \n <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n - <dtml-sqlvar expr="getViewPermissionOwner[loop_item]" type="string" optional>,\n + <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or \'\'" type="string" optional>,\n <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision index 9f72858795..7730ef7f3e 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -88 \ No newline at end of file +89 \ No newline at end of file -- 2.30.9