From 7cde24a43985bf0d2bbe5be24e179b21ef115340 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Fri, 3 Mar 2017 18:53:11 +0100 Subject: [PATCH] Protected again sql error. Return better sql error message for sqlite3 storage. --- .../sqlite3/src/cms_storage_sqlite3.e | 6 +++++- .../blog/persistence/cms_blog_storage_sql.e | 8 ++++---- .../persistence/cms_comments_storage_sql.e | 2 +- .../node/persistence/cms_node_storage_sql.e | 18 +++++++++--------- .../submodules/page/cms_page_storage_sql.e | 4 ++-- .../persistence/cms_oauth_20_storage_sql.e | 2 +- .../openid/persitence/cms_openid_storage_sql.e | 2 +- .../persistence/cms_taxonomy_storage_sql.e | 4 ++-- src/persistence/core/cms_core_storage_sql_i.e | 2 +- src/persistence/user/cms_user_storage_sql_i.e | 6 +++--- 10 files changed, 29 insertions(+), 25 deletions(-) diff --git a/library/persistence/sqlite3/src/cms_storage_sqlite3.e b/library/persistence/sqlite3/src/cms_storage_sqlite3.e index 9ada533..1ab1f6e 100644 --- a/library/persistence/sqlite3/src/cms_storage_sqlite3.e +++ b/library/persistence/sqlite3/src/cms_storage_sqlite3.e @@ -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") diff --git a/modules/blog/persistence/cms_blog_storage_sql.e b/modules/blog/persistence/cms_blog_storage_sql.e index 59f535d..e474c8b 100644 --- a/modules/blog/persistence/cms_blog_storage_sql.e +++ b/modules/blog/persistence/cms_blog_storage_sql.e @@ -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) diff --git a/modules/comments/persistence/cms_comments_storage_sql.e b/modules/comments/persistence/cms_comments_storage_sql.e index 0d53f6d..1927513 100644 --- a/modules/comments/persistence/cms_comments_storage_sql.e +++ b/modules/comments/persistence/cms_comments_storage_sql.e @@ -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) diff --git a/modules/node/persistence/cms_node_storage_sql.e b/modules/node/persistence/cms_node_storage_sql.e index 512b664..2dcce8f 100644 --- a/modules/node/persistence/cms_node_storage_sql.e +++ b/modules/node/persistence/cms_node_storage_sql.e @@ -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 diff --git a/modules/node/submodules/page/cms_page_storage_sql.e b/modules/node/submodules/page/cms_page_storage_sql.e index 0ac0a87..993dac1 100644 --- a/modules/node/submodules/page/cms_page_storage_sql.e +++ b/modules/node/submodules/page/cms_page_storage_sql.e @@ -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) diff --git a/modules/oauth20/persistence/cms_oauth_20_storage_sql.e b/modules/oauth20/persistence/cms_oauth_20_storage_sql.e index e0b3abf..f7fbfe0 100644 --- a/modules/oauth20/persistence/cms_oauth_20_storage_sql.e +++ b/modules/oauth20/persistence/cms_oauth_20_storage_sql.e @@ -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) diff --git a/modules/openid/persitence/cms_openid_storage_sql.e b/modules/openid/persitence/cms_openid_storage_sql.e index 460b35c..9239205 100644 --- a/modules/openid/persitence/cms_openid_storage_sql.e +++ b/modules/openid/persitence/cms_openid_storage_sql.e @@ -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) diff --git a/modules/taxonomy/persistence/cms_taxonomy_storage_sql.e b/modules/taxonomy/persistence/cms_taxonomy_storage_sql.e index 15cad57..74ef30f 100644 --- a/modules/taxonomy/persistence/cms_taxonomy_storage_sql.e +++ b/modules/taxonomy/persistence/cms_taxonomy_storage_sql.e @@ -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) diff --git a/src/persistence/core/cms_core_storage_sql_i.e b/src/persistence/core/cms_core_storage_sql_i.e index 6e5a877..7f96523 100644 --- a/src/persistence/core/cms_core_storage_sql_i.e +++ b/src/persistence/core/cms_core_storage_sql_i.e @@ -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) diff --git a/src/persistence/user/cms_user_storage_sql_i.e b/src/persistence/user/cms_user_storage_sql_i.e index d160371..f6a8902 100644 --- a/src/persistence/user/cms_user_storage_sql_i.e +++ b/src/persistence/user/cms_user_storage_sql_i.e @@ -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)