backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct implementation of node extension save operation.

Browse Source
This commit is contained in:
Jocelyn FIAT
2015-09-08 20:44:00 +02:00
parent 88bc52fffb
commit 5f4eb2cf10
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/blog/cms_node_storage_sql_blog_extension.e
View File

@@ -136,6 +136,8 @@ feature {NONE} -- Implementation
check unique_data: n = 0 end check unique_data: n = 0 end
end end
end end
ensure
accepted_revision: Result /= Void implies Result.revision <= a_node.revision
end end
feature -- SQL feature -- SQL

10
modules/node/persistence/cms_node_storage_sql_page_extension.e
View File

@@ -55,7 +55,7 @@ feature -- Persistence
error_handler.reset error_handler.reset
-- Check existing record, if any. -- Check existing record, if any.
if attached node_data (a_node) as d then if attached node_data (a_node) as d then
l_update := True l_update := a_node.revision = d.revision
l_previous_parent_id := d.parent_id l_previous_parent_id := d.parent_id
end end
if not has_error then if not has_error then
@@ -114,7 +114,7 @@ feature -- Persistence
feature {NONE} -- Implementation feature {NONE} -- Implementation
node_data (a_node: CMS_NODE): detachable TUPLE [parent_id: INTEGER_64] node_data (a_node: CMS_NODE): detachable TUPLE [revision: INTEGER_64; parent_id: INTEGER_64]
-- Node extension data for node `a_node' as tuple. -- Node extension data for node `a_node' as tuple.
local local
l_parameters: STRING_TABLE [ANY] l_parameters: STRING_TABLE [ANY]
@@ -129,16 +129,18 @@ feature {NONE} -- Implementation
n := sql_rows_count n := sql_rows_count
if n = 1 then if n = 1 then
-- nid, revision, parent -- nid, revision, parent
Result := [sql_read_integer_64 (3)] Result := [sql_read_integer_64 (2), sql_read_integer_64 (3)]
else else
check unique_data: n = 0 end check unique_data: n = 0 end
end end
end end
ensure
accepted_revision: Result /= Void implies Result.revision <= a_node.revision
end end
feature -- SQL feature -- SQL
sql_select_node_data: STRING = "SELECT nid, revision, parent FROM page_nodes WHERE nid =:nid AND revision =:revision ORDER BY revision DESC LIMIT 1;" sql_select_node_data: STRING = "SELECT nid, revision, parent FROM page_nodes WHERE nid=:nid AND revision<=:revision ORDER BY revision DESC LIMIT 1;"
sql_insert_node_data: STRING = "INSERT INTO page_nodes (nid, revision, parent) VALUES (:nid, :revision, :parent);" sql_insert_node_data: STRING = "INSERT INTO page_nodes (nid, revision, parent) VALUES (:nid, :revision, :parent);"
sql_update_node_data: STRING = "UPDATE page_nodes SET nid=:nid, revision=:revision, parent=:parent WHERE nid=:nid AND revision=:revision;" sql_update_node_data: STRING = "UPDATE page_nodes SET nid=:nid, revision=:revision, parent=:parent WHERE nid=:nid AND revision=:revision;"