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

Merge branch 'master' into es17.01

Browse Source
This commit is contained in:
Jocelyn FIAT
2017-03-03 18:53:33 +01:00
parent c7222d5fcc 7cde24a439
commit 4dcd2693e3
10 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/persistence/sqlite3/src/cms_storage_sqlite3.e
View File

@@ -145,7 +145,11 @@ feature -- Operation
last_sqlite_result_cursor := st.execute_new
end
else
error_handler.add_custom_error (1, "invalid query", "query compilation failed!")
if attached st.last_exception as e then
error_handler.add_custom_error (1, "invalid query", {STRING_32} "query compilation failed! [" + e.tag + "]")
else
error_handler.add_custom_error (1, "invalid query", "query compilation failed!")
end
end
debug ("roc_storage")
print ("< sql_query (" +a_sql_statement + ").%N")

8
modules/blog/persistence/cms_blog_storage_sql.e
View File

@@ -57,7 +57,7 @@ feature -- Access
sql_query (sql_select_blogs_order_created_desc, Void)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -84,7 +84,7 @@ feature -- Access
sql_query (sql_blogs_limited, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -112,7 +112,7 @@ feature -- Access
sql_query (sql_blogs_from_user_limited, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -139,7 +139,7 @@ feature -- Access
sql_query (sql_blogs_from_user_with_title, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)

2
modules/comments/persistence/cms_comments_storage_sql.e
View File

@@ -47,7 +47,7 @@ feature -- Access
sql_query (sql_select_comments_for_content, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_comment as obj then
Result.force (obj)

18
modules/node/persistence/cms_node_storage_sql.e
View File

@@ -67,7 +67,7 @@ feature -- Access
sql_query (sql_select_nodes, Void)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -95,7 +95,7 @@ feature -- Access
sql_query (sql_select_node_revisions, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -125,7 +125,7 @@ feature -- Access
end
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -152,7 +152,7 @@ feature -- Access
sql_query (sql_select_recent_nodes, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -177,7 +177,7 @@ feature -- Access
sql_query (sql_select_recent_nodes_of_type, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -203,7 +203,7 @@ feature -- Access
sql_query (sql_select_recent_published_nodes_of_type, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -232,7 +232,7 @@ feature -- Access
sql_query (sql_select_recent_node_changes_before, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -335,7 +335,7 @@ feature -- Access
sql_query (sql_select_nodes_of_type, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
check expected_node_type: l_node.is_typed_as (a_node_type.name) end
@@ -363,7 +363,7 @@ feature -- Access
sql_query (sql_select_nodes_of_type_with_title, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
check expected_node_type: l_node.content_type.same_string (a_node_type.name) end

4
modules/node/submodules/page/cms_page_storage_sql.e
View File

@@ -32,7 +32,7 @@ feature -- Access
sql_query (sql_select_children_of_node, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)
@@ -58,7 +58,7 @@ feature -- Access
sql_query (sql_select_available_parents_for_node, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_node as l_node then
Result.force (l_node)

2
modules/oauth20/persistence/cms_oauth_20_storage_sql.e
View File

@@ -137,7 +137,7 @@ feature --Access: Consumers
from
sql_start
until
sql_after
sql_after or has_error
loop
if attached sql_read_string (1) as l_name then
Result.force (l_name)

2
modules/openid/persitence/cms_openid_storage_sql.e
View File

@@ -88,7 +88,7 @@ feature --Access: Consumers
from
sql_start
until
sql_after
sql_after or has_error
loop
if attached sql_read_string (1) as l_name then
Result.force (l_name)

4
modules/taxonomy/persistence/cms_taxonomy_storage_sql.e
View File

@@ -43,7 +43,7 @@ feature -- Access
sql_query (sql_select_terms, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_term as l_term then
Result.force (create {CMS_VOCABULARY}.make_from_term (l_term))
@@ -93,7 +93,7 @@ feature -- Access
-- sql_query (sql_select_terms_with_range, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_term as l_term then
Result.force (l_term)

2
src/persistence/core/cms_core_storage_sql_i.e
View File

@@ -255,7 +255,7 @@ feature -- Logs
sql_query (l_sql, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_log as l_log then
Result.force (l_log)

6
src/persistence/user/cms_user_storage_sql_i.e
View File

@@ -566,7 +566,7 @@ feature -- Access: roles and permissions
sql_query (select_role_permissions_by_role_id, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached sql_read_string (1) as l_permission then
Result.force (l_permission)
@@ -590,7 +590,7 @@ feature -- Access: roles and permissions
sql_query (select_role_permissions, Void)
sql_start
until
sql_after
sql_after or has_error
loop
if attached sql_read_string (1) as l_permission then
Result.force (l_permission)
@@ -1157,7 +1157,7 @@ feature -- Acess: Temp users
sql_query (sql_select_temp_recent_users, l_parameters)
sql_start
until
sql_after
sql_after or has_error
loop
if attached fetch_temp_user as l_user then
Result.force (l_user)