From c04d435668093bba4662e9af93758c8cd16840c8 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Tue, 26 Apr 2005 20:26:29 +0000 Subject: [PATCH] Use datetime instead of string where appropriate. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2953 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../activity/SQLDict_processMessage.zsql | 2 +- .../skins/activity/SQLDict_readMessage.zsql | 2 +- .../activity/SQLDict_readMessageList.zsql | 2 +- .../skins/activity/SQLDict_readUidList.zsql | 2 +- .../skins/activity/SQLDict_setPriority.zsql | 2 +- .../skins/activity/SQLDict_writeMessage.zsql | 2 +- .../activity/SQLDict_writeMessageList.zsql | 2 +- .../activity/SQLQueue_processMessage.zsql | 2 +- .../skins/activity/SQLQueue_readMessage.zsql | 2 +- .../skins/activity/SQLQueue_readUidList.zsql | 2 +- .../skins/activity/SQLQueue_setPriority.zsql | 2 +- .../skins/activity/SQLQueue_writeMessage.zsql | 2 +- .../z_produce_reserved_uid_list.zsql | 10 ++++++---- .../erp5_mysql/z_catalog_compatibility.zsql | 20 +++++++++---------- .../z_catalog_compatibility_list.zsql | 20 +++++++++---------- .../sql/erp5_mysql/z_catalog_item.zsql | 2 +- .../sql/erp5_mysql/z_catalog_item_list.zsql | 2 +- .../sql/erp5_mysql/z_catalog_movement.zsql | 8 ++++---- .../erp5_mysql/z_catalog_movement_list.zsql | 8 ++++---- .../sql/erp5_mysql/z_catalog_object_list.zsql | 2 +- .../sql/erp5_mysql/z_catalog_stock.zsql | 6 +++--- .../sql/erp5_mysql/z_catalog_stock_list.zsql | 2 +- .../sql/erp5_mysql/z_update_delivery.zsql | 4 ++-- .../sql/erp5_mysql/z_update_object.zsql | 2 +- 24 files changed, 56 insertions(+), 54 deletions(-) diff --git a/product/CMFActivity/skins/activity/SQLDict_processMessage.zsql b/product/CMFActivity/skins/activity/SQLDict_processMessage.zsql index ab5cff8c26..df69c0b848 100755 --- a/product/CMFActivity/skins/activity/SQLDict_processMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_processMessage.zsql @@ -10,7 +10,7 @@ class_file: <params>uid</params> UPDATE message SET - processing_date = <dtml-sqlvar "_.DateTime()" type="string">, + processing_date = <dtml-sqlvar "_.DateTime()" type="datetime">, processing = 1 WHERE <dtml-in uid>uid = <dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> diff --git a/product/CMFActivity/skins/activity/SQLDict_readMessage.zsql b/product/CMFActivity/skins/activity/SQLDict_readMessage.zsql index ae36a841ce..153b869051 100755 --- a/product/CMFActivity/skins/activity/SQLDict_readMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_readMessage.zsql @@ -17,7 +17,7 @@ WHERE processing <> 1 <dtml-if processing_node> AND processing_node = <dtml-sqlvar processing_node type="int"> </dtml-if> <dtml-if priority> AND priority = <dtml-sqlvar priority type="int"> </dtml-if> -<dtml-if to_date>AND date <= <dtml-sqlvar to_date type="string"> </dtml-if> +<dtml-if to_date>AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if> ORDER BY priority, date diff --git a/product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql b/product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql index 3a2556374b..e5bb6c54f4 100755 --- a/product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_readMessageList.zsql @@ -18,7 +18,7 @@ SET WHERE processing = 1 AND - processing_date < <dtml-sqlvar to_processing_date type="string"> + processing_date < <dtml-sqlvar to_processing_date type="datetime"> <dtml-var "'\0'"> diff --git a/product/CMFActivity/skins/activity/SQLDict_readUidList.zsql b/product/CMFActivity/skins/activity/SQLDict_readUidList.zsql index 672d81bde8..968f89cc4b 100755 --- a/product/CMFActivity/skins/activity/SQLDict_readUidList.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_readUidList.zsql @@ -18,4 +18,4 @@ WHERE <dtml-if processing_node> AND processing_node = <dtml-sqlvar processing_node type="int"> </dtml-if> <dtml-if method_id>AND method_id = <dtml-sqlvar method_id type="string"> </dtml-if> <dtml-if path>AND path = <dtml-sqlvar path type="string"> </dtml-if> -<dtml-if to_date>AND date <= <dtml-sqlvar to_date type="string"> </dtml-if> +<dtml-if to_date>AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if> diff --git a/product/CMFActivity/skins/activity/SQLDict_setPriority.zsql b/product/CMFActivity/skins/activity/SQLDict_setPriority.zsql index 03048000b8..ec47f52b94 100755 --- a/product/CMFActivity/skins/activity/SQLDict_setPriority.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_setPriority.zsql @@ -15,7 +15,7 @@ UPDATE SET priority = <dtml-sqlvar priority type="int">, processing = 0, - date = <dtml-sqlvar date type="string"> + date = <dtml-sqlvar date type="datetime"> WHERE <dtml-in uid>uid = <dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if></dtml-in> diff --git a/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql b/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql index 7b3a8d709e..4905f47b0e 100755 --- a/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_writeMessage.zsql @@ -17,7 +17,7 @@ processing_node=-1</params> INSERT INTO message SET path = <dtml-sqlvar path type="string">, - <dtml-if date>date = <dtml-sqlvar date type="string">, <dtml-else>date = <dtml-sqlvar "_.DateTime()" type="string">, </dtml-if> + <dtml-if date>date = <dtml-sqlvar date type="string">, <dtml-else>date = <dtml-sqlvar "_.DateTime()" type="datetime">, </dtml-if> method_id = <dtml-sqlvar method_id type="string">, processing_node = <dtml-sqlvar processing_node type="int">, processing = -1, diff --git a/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql b/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql index 72ed827235..13fe00c08d 100755 --- a/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_writeMessageList.zsql @@ -21,7 +21,7 @@ VALUES <dtml-if sequence-start><dtml-else>,</dtml-if> ( <dtml-sqlvar expr="path_list[loop_item]" type="string">, - <dtml-if date_list><dtml-sqlvar expr="date_list[loop_item]" type="string"><dtml-else><dtml-sqlvar "_.DateTime()" type="string"></dtml-if>, + <dtml-if date_list><dtml-sqlvar expr="date_list[loop_item]" type="string"><dtml-else><dtml-sqlvar "_.DateTime()" type="datetime"></dtml-if>, <dtml-sqlvar expr="method_id_list[loop_item]" type="string">, <dtml-if processing_node_list><dtml-sqlvar expr="processing_node_list[loop_item]" type="int"><dtml-else>-1</dtml-if>, -1, diff --git a/product/CMFActivity/skins/activity/SQLQueue_processMessage.zsql b/product/CMFActivity/skins/activity/SQLQueue_processMessage.zsql index 048a303b0b..2503b6dc50 100755 --- a/product/CMFActivity/skins/activity/SQLQueue_processMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_processMessage.zsql @@ -11,7 +11,7 @@ class_file: UPDATE message_queue SET - processing_date = <dtml-sqlvar "_.DateTime()" type="string">, + processing_date = <dtml-sqlvar "_.DateTime()" type="datetime">, processing=1 WHERE uid = <dtml-sqlvar uid type="int"> diff --git a/product/CMFActivity/skins/activity/SQLQueue_readMessage.zsql b/product/CMFActivity/skins/activity/SQLQueue_readMessage.zsql index b0891d75ed..083cf87a1b 100755 --- a/product/CMFActivity/skins/activity/SQLQueue_readMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_readMessage.zsql @@ -16,7 +16,7 @@ WHERE processing <> 1 <dtml-if processing_node> AND processing_node = <dtml-sqlvar processing_node type="int"></dtml-if> <dtml-if priority> AND priority = <dtml-sqlvar priority type="int"> </dtml-if> -<dtml-if to_date> AND date <= <dtml-sqlvar to_date type="string"> </dtml-if> +<dtml-if to_date> AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if> ORDER BY priority, date diff --git a/product/CMFActivity/skins/activity/SQLQueue_readUidList.zsql b/product/CMFActivity/skins/activity/SQLQueue_readUidList.zsql index 6fda1864d5..db763c0ad8 100755 --- a/product/CMFActivity/skins/activity/SQLQueue_readUidList.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_readUidList.zsql @@ -17,4 +17,4 @@ WHERE processing <> 1 <dtml-if processing_node> AND processing_node = <dtml-sqlvar processing_node type="int"></dtml-if> <dtml-if path>AND path = <dtml-sqlvar path type="string"></dtml-if> -<dtml-if to_date>AND date <= <dtml-sqlvar to_date type="string"> </dtml-if> +<dtml-if to_date>AND date <= <dtml-sqlvar to_date type="datetime"> </dtml-if> diff --git a/product/CMFActivity/skins/activity/SQLQueue_setPriority.zsql b/product/CMFActivity/skins/activity/SQLQueue_setPriority.zsql index 623e46177a..8d1195061b 100755 --- a/product/CMFActivity/skins/activity/SQLQueue_setPriority.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_setPriority.zsql @@ -15,6 +15,6 @@ UPDATE SET priority = <dtml-sqlvar priority type="int">, processing = 0, - date = <dtml-sqlvar date type="string"> + date = <dtml-sqlvar date type="datetime"> WHERE uid = <dtml-sqlvar uid type="int"> diff --git a/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql b/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql index 2600808db4..a782c2b1e5 100755 --- a/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_writeMessage.zsql @@ -17,7 +17,7 @@ date</params> INSERT INTO message_queue SET path = <dtml-sqlvar path type="string">, - <dtml-if date>date = <dtml-sqlvar date type="string">, <dtml-else>date = <dtml-sqlvar "_.DateTime()" type="string">, </dtml-if> + <dtml-if date>date = <dtml-sqlvar date type="string">, <dtml-else>date = <dtml-sqlvar "_.DateTime()" type="datetime">, </dtml-if> method_id = <dtml-sqlvar method_id type="string">, processing_node = <dtml-sqlvar processing_node type="int">, broadcast = <dtml-sqlvar broadcast type="int">, diff --git a/product/ERP5Catalog/sql/common_mysql/z_produce_reserved_uid_list.zsql b/product/ERP5Catalog/sql/common_mysql/z_produce_reserved_uid_list.zsql index be5384721a..a092deb97f 100755 --- a/product/ERP5Catalog/sql/common_mysql/z_produce_reserved_uid_list.zsql +++ b/product/ERP5Catalog/sql/common_mysql/z_produce_reserved_uid_list.zsql @@ -1,7 +1,7 @@ <dtml-comment> title: connection_id:erp5_sql_connection -max_rows:10000 +max_rows:0 max_cache:0 cache_time:0 </dtml-comment> @@ -12,9 +12,9 @@ INSERT INTO catalog (id, path, CreationDate) VALUES <dtml-in "_.range(0,count)"> -( <dtml-sqlvar thread_id type="string"> , 'reserved', <dtml-sqlvar date type="string"> ) , +( <dtml-sqlvar thread_id type="string"> , 'reserved', <dtml-sqlvar date type="datetime"> ) , </dtml-in> -( <dtml-sqlvar thread_id type="string"> , 'reserved', <dtml-sqlvar date type="string"> ); +( <dtml-sqlvar thread_id type="string"> , 'reserved', <dtml-sqlvar date type="datetime"> ); <dtml-var "'\0'"> @@ -27,4 +27,6 @@ WHERE AND id = <dtml-sqlvar thread_id type="string"> AND - CreationDate = <dtml-sqlvar date type="string"> \ No newline at end of file + CreationDate = <dtml-sqlvar date type="datetime"> +LIMIT + 10000 diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_compatibility.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_compatibility.zsql index fe62c3dc5d..f1cefcf0ab 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_compatibility.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_compatibility.zsql @@ -29,20 +29,20 @@ summary INSERT INTO compatibility VALUES ( <dtml-sqlvar uid type="int">, <dtml-sqlvar Creator type="string" optional>, - <dtml-sqlvar Date type="string" optional>, + <dtml-sqlvar Date type="datetime" optional>, <dtml-sqlvar PrincipiaSearchSource type="string" optional>, <dtml-sqlvar SearchableText type="string" optional>, - <dtml-sqlvar EffectiveDate type="string" optional>, - <dtml-sqlvar ExpiresDate type="string" optional>, - <dtml-sqlvar ModificationDate type="string" optional>, + <dtml-sqlvar EffectiveDate type="datetime" optional>, + <dtml-sqlvar ExpiresDate type="datetime" optional>, + <dtml-sqlvar ModificationDate type="datetime" optional>, <dtml-sqlvar Type type="string" optional>, - <dtml-sqlvar bobobase_modification_time type="string" optional>, - <dtml-sqlvar created type="string" optional>, - <dtml-sqlvar effective type="string" optional>, - <dtml-sqlvar expires type="string" optional>, + <dtml-sqlvar bobobase_modification_time type="datetime" optional>, + <dtml-sqlvar created type="datetime" optional>, + <dtml-sqlvar effective type="datetime" optional>, + <dtml-sqlvar expires type="datetime" optional>, <dtml-sqlvar getIcon type="string" optional>, <dtml-sqlvar in_reply_to type="string" optional>, - <dtml-sqlvar modified type="string" optional>, + <dtml-sqlvar modified type="datetime" optional>, <dtml-sqlvar review_state type="string" optional>, <dtml-sqlvar summary type="string" optional> -); \ No newline at end of file +); diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_compatibility_list.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_compatibility_list.zsql index 83db1ff9ee..accc1b2702 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_compatibility_list.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_compatibility_list.zsql @@ -32,21 +32,21 @@ VALUES <dtml-in prefix="loop" expr="_.range(_.len(uid))"> ( <dtml-sqlvar expr="uid[loop_item]" type="int">, - <dtml-sqlvar expr="Creator[loop_item]" type="string" optional>, - <dtml-sqlvar expr="Date[loop_item]" type="string" optional>, + <dtml-sqlvar expr="Creator[loop_item]" type="datetime" optional>, + <dtml-sqlvar expr="Date[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="PrincipiaSearchSource[loop_item]" type="string" optional>, <dtml-sqlvar expr="SearchableText[loop_item]" type="string" optional>, - <dtml-sqlvar expr="EffectiveDate[loop_item]" type="string" optional>, - <dtml-sqlvar expr="ExpiresDate[loop_item]" type="string" optional>, - <dtml-sqlvar expr="ModificationDate[loop_item]" type="string" optional>, + <dtml-sqlvar expr="EffectiveDate[loop_item]" type="datetime" optional>, + <dtml-sqlvar expr="ExpiresDate[loop_item]" type="datetime" optional>, + <dtml-sqlvar expr="ModificationDate[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="Type[loop_item]" type="string" optional>, - <dtml-sqlvar expr="bobobase_modification_time[loop_item]" type="string" optional>, - <dtml-sqlvar expr="created[loop_item]" type="string" optional>, - <dtml-sqlvar expr="effective[loop_item]" type="string" optional>, - <dtml-sqlvar expr="expires[loop_item]" type="string" optional>, + <dtml-sqlvar expr="bobobase_modification_time[loop_item]" type="datetime" optional>, + <dtml-sqlvar expr="created[loop_item]" type="datetime" optional>, + <dtml-sqlvar expr="effective[loop_item]" type="datetime" optional>, + <dtml-sqlvar expr="expires[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="getIcon[loop_item]" type="string" optional>, <dtml-sqlvar expr="in_reply_to[loop_item]" type="string" optional>, - <dtml-sqlvar expr="modified[loop_item]" type="string" optional>, + <dtml-sqlvar expr="modified[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="review_state[loop_item]" type="string" optional>, <dtml-sqlvar expr="summary[loop_item]" type="string" optional> ) diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_item.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_item.zsql index a63ef653bb..a4eb46f8be 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_item.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_item.zsql @@ -20,7 +20,7 @@ getVariationText</params> <dtml-if getAggregateUidList> INSERT INTO item VALUES <dtml-in getAggregateUidList>( <dtml-sqlvar uid type="int">, - <dtml-sqlvar getStopDate type="string" optional>, + <dtml-sqlvar getStopDate type="datetime" optional>, <dtml-sqlvar getDestinationUid type="int" optional>, <dtml-sqlvar getDestinationSectionUid type="int" optional>, <dtml-sqlvar getResourceUid type="int" optional>, diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_item_list.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_item_list.zsql index e9da92627e..20ba4fdaac 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_item_list.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_item_list.zsql @@ -29,7 +29,7 @@ VALUES <dtml-if getAggregateUidList><dtml-in getAggregateUidList> ( <dtml-sqlvar expr="uid[loop_item]" type="int">, - <dtml-sqlvar expr="getStopDate[loop_item]" type="string" optional>, + <dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="getDestinationUid[loop_item]" type="int" optional>, <dtml-sqlvar expr="getDestinationSectionUid[loop_item]" type="int" optional>, <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>, diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement.zsql index e76c9a7519..5fbc268870 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement.zsql @@ -37,11 +37,11 @@ INSERT INTO movement VALUES ( <dtml-if getResourceUid><dtml-sqlvar getResourceUid type="int"><dtml-else>NULL</dtml-if>, <dtml-if getNetConvertedQuantity><dtml-sqlvar getNetConvertedQuantity type="float"><dtml-else>NULL</dtml-if>, NULL, - <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>, - <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>, + <dtml-if getStartDate><dtml-sqlvar getStartDate type="datetime"><dtml-else>NULL</dtml-if>, + <dtml-if getStopDate><dtml-sqlvar getStopDate type="datetime"><dtml-else>NULL</dtml-if>, <dtml-if getNetConvertedTargetQuantity><dtml-sqlvar getNetConvertedTargetQuantity type="float"><dtml-else>NULL</dtml-if>, - <dtml-if getTargetStartDate><dtml-sqlvar getTargetStartDate type="string"><dtml-else>NULL</dtml-if>, - <dtml-if getTargetStopDate><dtml-sqlvar getTargetStopDate type="string"><dtml-else>NULL</dtml-if>, + <dtml-if getTargetStartDate><dtml-sqlvar getTargetStartDate type="datetime"><dtml-else>NULL</dtml-if>, + <dtml-if getTargetStopDate><dtml-sqlvar getTargetStopDate type="datetime"><dtml-else>NULL</dtml-if>, <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>, <dtml-if getTotalPrice><dtml-sqlvar getTotalPrice type="float"><dtml-else>NULL</dtml-if>, <dtml-if getTargetTotalPrice><dtml-sqlvar getTargetTotalPrice type="float"><dtml-else>NULL</dtml-if>, diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement_list.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement_list.zsql index 090698f2a5..0e2c32b26f 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement_list.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_movement_list.zsql @@ -47,11 +47,11 @@ VALUES <dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>, <dtml-sqlvar expr="getNetConvertedQuantity[loop_item]" type="float" optional>, NULL, - <dtml-sqlvar expr="getInventoriatedStartDate[loop_item]" type="string" optional>, - <dtml-sqlvar expr="getInventoriatedStopDate[loop_item]" type="string" optional>, + <dtml-sqlvar expr="getInventoriatedStartDate[loop_item]" type="datetime" optional>, + <dtml-sqlvar expr="getInventoriatedStopDate[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="getNetConvertedTargetQuantity[loop_item]" type="float" optional>, - <dtml-sqlvar expr="getTargetStartDate[loop_item]" type="string" optional>, - <dtml-sqlvar expr="getTargetStopDate[loop_item]" type="string" optional>, + <dtml-sqlvar expr="getTargetStartDate[loop_item]" type="datetime" optional>, + <dtml-sqlvar expr="getTargetStopDate[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>, <dtml-sqlvar expr="getTotalPrice[loop_item]" type="float" optional>, <dtml-sqlvar expr="getTargetTotalPrice[loop_item]" type="float" optional>, diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_object_list.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_object_list.zsql index 07c27caf2e..f27048ba2d 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_object_list.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_object_list.zsql @@ -53,7 +53,7 @@ VALUES <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">, <dtml-sqlvar expr="getParentUid[loop_item]" type="int">, <dtml-sqlvar expr="id[loop_item]" type="string" optional>, - <dtml-sqlvar expr="CreationDate[loop_item]" type="string" optional>, + <dtml-sqlvar expr="CreationDate[loop_item]" type="datetime" optional>, <dtml-sqlvar expr="getDescription[loop_item]" type="string" optional>, <dtml-sqlvar expr="getTitle[loop_item]" type="string" optional>, <dtml-sqlvar expr="meta_type[loop_item]" type="string" optional>, diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_stock.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_stock.zsql index da95ca826e..9c92ff7bd0 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_stock.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_stock.zsql @@ -38,7 +38,7 @@ VALUES <dtml-if getSourceSectionUid><dtml-sqlvar getSourceSectionUid type="int"><dtml-else>NULL</dtml-if>, <dtml-sqlvar getResourceUid type="int">, <dtml-if getInventoriatedQuantity><dtml-sqlvar "getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, - <dtml-if getStopDate><dtml-sqlvar getStopDate type="string"><dtml-else>NULL</dtml-if>, + <dtml-if getStopDate><dtml-sqlvar getStopDate type="datetime"><dtml-else>NULL</dtml-if>, <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>, <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>, <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>, @@ -55,7 +55,7 @@ VALUES <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>, <dtml-sqlvar getResourceUid type="int">, <dtml-if getInventoriatedQuantity><dtml-sqlvar "-getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, - <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>, + <dtml-if getStartDate><dtml-sqlvar getStartDate type="datetime"><dtml-else>NULL</dtml-if>, <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>, <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>, <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>, @@ -76,7 +76,7 @@ VALUES <dtml-if getDestinationSectionUid><dtml-sqlvar getDestinationSectionUid type="int"><dtml-else>NULL</dtml-if>, <dtml-sqlvar getResourceUid type="int">, <dtml-if getInventoriatedQuantity><dtml-sqlvar "-getInventoriatedQuantity" type="float"><dtml-else>NULL</dtml-if>, - <dtml-if getStartDate><dtml-sqlvar getStartDate type="string"><dtml-else>NULL</dtml-if>, + <dtml-if getStartDate><dtml-sqlvar getStartDate type="datetime"><dtml-else>NULL</dtml-if>, <dtml-if getPrice><dtml-sqlvar getPrice type="float"><dtml-else>NULL</dtml-if>, <dtml-if isAccountable><dtml-sqlvar isAccountable type="int"><dtml-else>NULL</dtml-if>, <dtml-if getPortalType><dtml-sqlvar getPortalType type="string"><dtml-else>NULL</dtml-if>, diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_stock_list.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_stock_list.zsql index 4d787661d9..1159446c55 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_catalog_stock_list.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_catalog_stock_list.zsql @@ -51,7 +51,7 @@ VALUES <dtml-sqlvar expr="row_item[4]" type="int" optional>, <dtml-sqlvar expr="row_item[5]" type="int">, <dtml-sqlvar expr="row_item[6]" type="float" optional>, - <dtml-sqlvar expr="row_item[7]" type="string" optional> + <dtml-sqlvar expr="row_item[7]" type="datetime" optional> <dtml-sqlvar expr="row_item[8]" type="float" optional> <dtml-sqlvar expr="row_item[9]" type="int" optional> <dtml-sqlvar expr="row_item[10]" type="string" optional> diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_update_delivery.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_update_delivery.zsql index 29eb426f0b..4c1d09737f 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_update_delivery.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_update_delivery.zsql @@ -31,7 +31,7 @@ UPDATE delivery SET source_section_uid=<dtml-sqlvar getSourceSectionUid type="int" optional>, destination_section_uid=<dtml-sqlvar getDestinationSectionUid type="int" optional>, resource_uid=<dtml-sqlvar getResourceUid type="int" optional>, - start_date=<dtml-sqlvar getStartDate type="string" optional>, - stop_date=<dtml-sqlvar getStopDate type="string" optional> + start_date=<dtml-sqlvar getStartDate type="datetime" optional>, + stop_date=<dtml-sqlvar getStopDate type="datetime" optional> WHERE <dtml-sqltest uid op=eq type=int> </dtml-if> diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql index 7b0617f5fe..8e193406ac 100755 --- a/product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql +++ b/product/ERP5Catalog/sql/erp5_mysql/z_update_object.zsql @@ -55,7 +55,7 @@ UPDATE catalog SET uid=<dtml-sqlvar uid type="int">, relative_url=<dtml-sqlvar getRelativeUrl type="string">, parent_uid=<dtml-sqlvar getParentUid type="int" optional>, id=<dtml-sqlvar id type="string" optional>, - CreationDate=<dtml-sqlvar CreationDate type="string" optional>, + CreationDate=<dtml-sqlvar CreationDate type="datetime" optional>, description=<dtml-sqlvar getDescription type="string" optional>, title=<dtml-sqlvar getTitle type="string" optional>, meta_type=<dtml-sqlvar meta_type type="string" optional>, -- 2.30.9