Added missing sql_finalize which is used to cleanup as early as possible the last statement when it is not needed anymore.

This commit is contained in:
2015-10-19 23:33:17 +02:00
parent f51ddc9796
commit 782e9397a3
10 changed files with 50 additions and 10 deletions

View File

@@ -38,6 +38,7 @@ feature -- URL aliases
end
else
sql_insert (sql_insert_path_alias, l_parameters)
sql_finalize
end
end
@@ -64,6 +65,7 @@ feature -- URL aliases
l_parameters.put (a_alias, "alias")
sql_modify (sql_update_path_alias, l_parameters)
sql_finalize
end
end
@@ -80,6 +82,7 @@ feature -- URL aliases
create l_parameters.make (1)
l_parameters.put (a_alias, "alias")
sql_modify (sql_delete_path_alias, l_parameters)
sql_finalize
else
error_handler.add_custom_error (0, "alias mismatch", "Path alias %"" + a_alias + "%" is not related to source %"" + a_source + "%"!")
end
@@ -171,6 +174,7 @@ feature -- Logs
end
l_parameters.put (now, "date")
sql_insert (sql_insert_log, l_parameters)
sql_finalize
end
sql_insert_log: STRING = "INSERT INTO logs (category, level, uid, message, info, link, date) VALUES (:category, :level, :uid, :message, :info, :link, :date);"
@@ -198,9 +202,11 @@ feature -- Misc
-- already up to date
else
sql_modify (sql_update_custom_value, l_parameters)
sql_finalize
end
else
sql_insert (sql_insert_custom_value, l_parameters)
sql_finalize
end
end
@@ -219,6 +225,7 @@ feature -- Misc
end
l_parameters.put (a_name, "name")
sql_modify (sql_delete_custom_value, l_parameters)
sql_finalize
end
custom_value (a_name: READABLE_STRING_GENERAL; a_type: detachable READABLE_STRING_8): detachable READABLE_STRING_32

View File

@@ -207,6 +207,7 @@ feature -- Helper
else
sql_commit_transaction
end
sql_finalize
end
sql_table_exists (a_table_name: READABLE_STRING_8): BOOLEAN
@@ -216,6 +217,7 @@ feature -- Helper
sql_query ("SELECT count(*) FROM " + a_table_name + " ;", Void)
Result := not has_error
-- FIXME: find better solution
sql_finalize
reset_error
end
@@ -227,6 +229,7 @@ feature -- Helper
if not has_error then
Result := sql_read_integer_64 (1)
end
sql_finalize
end
feature -- Access

View File

@@ -275,6 +275,7 @@ feature -- Change: user
l_parameters.put (a_user.status, "status")
sql_modify (sql_update_user, l_parameters)
sql_finalize
if not error_handler.has_error then
update_user_roles (a_user)
end
@@ -402,9 +403,8 @@ feature -- Access: roles and permissions
if Result /= Void and not has_error then
fill_user_role (Result)
end
else
sql_finalize
end
sql_finalize
end
user_role_by_name (a_name: READABLE_STRING_GENERAL): detachable CMS_USER_ROLE
@@ -425,9 +425,8 @@ feature -- Access: roles and permissions
if Result /= Void and not has_error then
fill_user_role (Result)
end
else
sql_finalize
end
sql_finalize
end
user_roles_for (a_user: CMS_USER): LIST [CMS_USER_ROLE]
@@ -575,6 +574,7 @@ feature -- Change: roles and permissions
l_parameters.put (a_user_role.id, "rid")
l_parameters.put (a_user_role.name, "name")
sql_modify (sql_update_user_role, l_parameters)
sql_finalize
end
if not a_user_role.permissions.is_empty then
-- FIXME: check if this is non set permissions,or none ...
@@ -621,16 +621,14 @@ feature -- Change: roles and permissions
create l_parameters.make (1)
l_parameters.put (a_user_role.name, "name")
sql_insert (sql_insert_user_role, l_parameters)
sql_finalize
if not error_handler.has_error then
a_user_role.set_id (last_inserted_user_role_id)
sql_finalize
across
a_user_role.permissions as ic
loop
set_permission_for_role_id (ic.item, a_user_role.id)
end
else
sql_finalize
end
end
end
@@ -691,6 +689,7 @@ feature -- Change: roles and permissions
create l_parameters.make (1)
l_parameters.put (a_role.id, "rid")
sql_modify (sql_delete_role_permissions_by_role_id, l_parameters)
sql_finalize
sql_modify (sql_delete_role_by_id, l_parameters)
sql_commit_transaction
sql_finalize