Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joshua
erp5
Commits
117346e0
Commit
117346e0
authored
Jun 14, 2017
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysql_innodb_catalog: use consistent query separator
<dtml-var sql_delimiter> without ;
parent
27a88c96
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
16 deletions
+15
-16
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.sql
.../portal_catalog/erp5_mysql_innodb/z_catalog_item_list.sql
+1
-2
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_measure_list.sql
...rtal_catalog/erp5_mysql_innodb/z_catalog_measure_list.sql
+1
-1
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_category_list.sql
...og/erp5_mysql_innodb/z_catalog_movement_category_list.sql
+3
-2
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_non_movement_category_list.sql
...rp5_mysql_innodb/z_catalog_non_movement_category_list.sql
+3
-2
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_category_list.sql
...g/erp5_mysql_innodb/z_catalog_predicate_category_list.sql
+1
-2
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.sql
..._mysql_innodb/z_catalog_quantity_unit_conversion_list.sql
+1
-2
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.sql
...portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.sql
+2
-2
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_transformation_list.sql
...talog/erp5_mysql_innodb/z_catalog_transformation_list.sql
+1
-1
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_produce_reserved_uid_list.sql
...catalog/erp5_mysql_innodb/z_produce_reserved_uid_list.sql
+2
-2
No files found.
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.sql
View file @
117346e0
...
@@ -2,9 +2,8 @@ DELETE FROM
...
@@ -2,9 +2,8 @@ DELETE FROM
item
item
WHERE
WHERE
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
;
<
dtml
-
var
"'
\0
'"
>
<
dtml
-
var
sql_delimiter
>
<
dtml
-
let
movement_list
=
"[]"
uid_dict
=
"{}"
>
<
dtml
-
let
movement_list
=
"[]"
uid_dict
=
"{}"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_measure_list.sql
View file @
117346e0
DELETE
FROM
`measure`
WHERE
DELETE
FROM
`measure`
WHERE
<
dtml
-
sqltest
uid
column
=
"resource_uid"
type
=
"int"
multiple
>
;
<
dtml
-
sqltest
uid
column
=
"resource_uid"
type
=
"int"
multiple
>
<
dtml
-
let
measure_list
=
"[]"
>
<
dtml
-
let
measure_list
=
"[]"
>
<
dtml
-
in
getMeasureRowList
prefix
=
"loop"
>
<
dtml
-
in
getMeasureRowList
prefix
=
"loop"
>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_category_list.sql
View file @
117346e0
...
@@ -2,8 +2,9 @@ DELETE FROM
...
@@ -2,8 +2,9 @@ DELETE FROM
category
category
WHERE
WHERE
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
;
<
dtml
-
var
"'
\0
'"
>
<
dtml
-
var
sql_delimiter
>
<
dtml
-
let
category_list
=
"[]"
getCategoryParentUidList
=
"portal_categories.getCategoryParentUidList"
>
<
dtml
-
let
category_list
=
"[]"
getCategoryParentUidList
=
"portal_categories.getCategoryParentUidList"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
<
dtml
-
if
expr
=
"getCategoryList[loop_item]"
>
<
dtml
-
if
expr
=
"getCategoryList[loop_item]"
>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_non_movement_category_list.sql
View file @
117346e0
...
@@ -2,8 +2,9 @@ DELETE FROM
...
@@ -2,8 +2,9 @@ DELETE FROM
category
category
WHERE
WHERE
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
;
<
dtml
-
var
"'
\0
'"
>
<
dtml
-
var
sql_delimiter
>
<
dtml
-
let
category_list
=
"[]"
getCategoryParentUidList
=
"portal_categories.getCategoryParentUidList"
>
<
dtml
-
let
category_list
=
"[]"
getCategoryParentUidList
=
"portal_categories.getCategoryParentUidList"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
<
dtml
-
if
expr
=
"getAcquiredCategoryList[loop_item]"
>
<
dtml
-
if
expr
=
"getAcquiredCategoryList[loop_item]"
>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_predicate_category_list.sql
View file @
117346e0
...
@@ -2,9 +2,8 @@ DELETE FROM
...
@@ -2,9 +2,8 @@ DELETE FROM
predicate_category
predicate_category
WHERE
WHERE
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
;
<
dtml
-
var
"'
\0
'"
>
<
dtml
-
var
sql_delimiter
>
<
dtml
-
let
predicate_list
=
"[]"
>
<
dtml
-
let
predicate_list
=
"[]"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.sql
View file @
117346e0
...
@@ -13,8 +13,7 @@
...
@@ -13,8 +13,7 @@
<
dtml
-
if
quantity_unit_conversion_dict
>
<
dtml
-
if
quantity_unit_conversion_dict
>
DELETE
FROM
`quantity_unit_conversion`
WHERE
DELETE
FROM
`quantity_unit_conversion`
WHERE
<
dtml
-
sqltest
"quantity_unit_conversion_dict.keys()"
column
=
"resource_uid"
type
=
"int"
multiple
>
;
<
dtml
-
sqltest
"quantity_unit_conversion_dict.keys()"
column
=
"resource_uid"
type
=
"int"
multiple
>
<
dtml
-
var
sql_delimiter
>
<
dtml
-
var
sql_delimiter
>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.sql
View file @
117346e0
...
@@ -2,9 +2,9 @@ DELETE FROM
...
@@ -2,9 +2,9 @@ DELETE FROM
stock
stock
WHERE
WHERE
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
<
dtml
-
sqltest
uid
type
=
"int"
multiple
>
;
<
dtml
-
var
"'
\0
'"
>
<
dtml
-
var
sql_delimiter
>
<
dtml
-
let
row_list
=
"[]"
uid_dict
=
"{}"
>
<
dtml
-
let
row_list
=
"[]"
uid_dict
=
"{}"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
<
dtml
-
in
prefix
=
"loop"
expr
=
"_.range(_.len(uid))"
>
<
dtml
-
if
"not(isInventoryMovement[loop_item]) and isMovement[loop_item] and getResourceUid[loop_item]"
>
<
dtml
-
if
"not(isInventoryMovement[loop_item]) and isMovement[loop_item] and getResourceUid[loop_item]"
>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_transformation_list.sql
View file @
117346e0
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
DELETE
FROM
`transformation`
WHERE
DELETE
FROM
`transformation`
WHERE
<
dtml
-
sqltest
expr
=
"outer_item['uid']"
column
=
"uid"
type
=
"int"
>
<
dtml
-
sqltest
expr
=
"outer_item['uid']"
column
=
"uid"
type
=
"int"
>
AND
AND
<
dtml
-
sqltest
expr
=
"outer_item['variation_text']"
column
=
"variation_text"
type
=
"string"
>
;
<
dtml
-
sqltest
expr
=
"outer_item['variation_text']"
column
=
"variation_text"
type
=
"string"
>
<
dtml
-
var
sql_delimiter
>
<
dtml
-
var
sql_delimiter
>
<
dtml
-
call
"row_list.extend(outer_item['row_dict_list'])"
>
<
dtml
-
call
"row_list.extend(outer_item['row_dict_list'])"
>
</
dtml
-
in
>
</
dtml
-
in
>
...
...
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_produce_reserved_uid_list.sql
View file @
117346e0
...
@@ -4,9 +4,9 @@ VALUES
...
@@ -4,9 +4,9 @@ VALUES
<
dtml
-
in
"_.range(count - 1)"
>
<
dtml
-
in
"_.range(count - 1)"
>
(
<
dtml
-
sqlvar
instance_id
type
=
"string"
>
,
'reserved'
)
,
(
<
dtml
-
sqlvar
instance_id
type
=
"string"
>
,
'reserved'
)
,
</
dtml
-
in
>
</
dtml
-
in
>
(
<
dtml
-
sqlvar
instance_id
type
=
"string"
>
,
'reserved'
)
;
(
<
dtml
-
sqlvar
instance_id
type
=
"string"
>
,
'reserved'
)
<
dtml
-
var
"'
\0
'"
>
<
dtml
-
var
sql_delimiter
>
SELECT
SELECT
uid
uid
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment