Added persistence support for Eiffel sqlite3 wrapper.

Updated existing persistency solution to be more generic to any db solution.

modules/blog/cms_node_storage_sql_blog_extension.e

@@ -83,11 +83,11 @@ feature -- Persistence
 
 				if l_update then
 					if l_has_modif then
-						sql_change (sql_update_node_data, l_parameters)
+						sql_modify (sql_update_node_data, l_parameters)
 					end
 				else
 					if l_has_modif then
-						sql_change (sql_insert_node_data, l_parameters)
+						sql_insert (sql_insert_node_data, l_parameters)
 					else
 						-- no page data, means everything is empty.
 						-- FOR NOW: always record row
@@ -116,7 +116,7 @@ feature -- Persistence
 			if a_node.has_id then
 				create l_parameters.make (1)
 				l_parameters.put (a_node.id, "nid")
-				sql_change (sql_delete_node_data, l_parameters)
+				sql_modify (sql_delete_node_data, l_parameters)
 			end
 		end
 
@@ -136,18 +136,21 @@ feature {NONE} -- Implementation
 			l_parameters.put (a_node.revision, "revision")
 			sql_query (sql_select_node_data, l_parameters)
 			if not has_error then
-				n := sql_rows_count
-				if n = 1 then
+				if not sql_after then
 						-- nid, revision, tags
 					l_rev := sql_read_integer_64 (2)
 					l_tags := sql_read_string_32 (3)
 					if l_tags /= Void then
 						Result := [l_rev, l_tags]
 					end
-				else
-					check unique_data: n = 0 end
+					sql_forth
+					if not sql_after then
+						check unique_data: n = 0 end
+						Result := Void
+					end
 				end
 			end
+			sql_finalize
 		ensure
 			accepted_revision: Result /= Void implies Result.revision <= a_node.revision
 		end

modules/blog/persistence/cms_blog_storage_sql.e

@@ -23,9 +23,10 @@ feature -- Access
 			error_handler.reset
 			write_information_log (generator + ".blogs_count")
 			sql_query (sql_select_blog_count, Void)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := sql_read_integer_64 (1)
 			end
+			sql_finalize
 		end
 
 	blogs_count_from_user (a_user: CMS_USER) : INTEGER_64
@@ -38,9 +39,10 @@ feature -- Access
 			create l_parameters.make (2)
 			l_parameters.put (a_user.id, "user")
 			sql_query (sql_select_blog_count_from_user, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := sql_read_integer_64 (1)
 			end
+			sql_finalize
 		end
 
 	blogs: LIST [CMS_NODE]

modules/node/persistence/cms_node_storage_sql.e

@@ -28,9 +28,10 @@ feature -- Access
 			error_handler.reset
 			write_information_log (generator + ".nodes_count")
 			sql_query (sql_select_nodes_count, Void)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := sql_read_natural_64 (1)
 			end
+			sql_finalize
 		end
 
 
@@ -175,9 +176,10 @@ feature -- Access
 			create l_parameters.make (1)
 			l_parameters.put (a_id, "nid")
 			sql_query (sql_select_node_by_id, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_node
 			end
+			sql_finalize
 		end
 
 	node_by_id_and_revision (a_node_id, a_revision: INTEGER_64): detachable CMS_NODE
@@ -191,9 +193,10 @@ feature -- Access
 			l_parameters.put (a_node_id, "nid")
 			l_parameters.put (a_revision, "revision")
 			sql_query (sql_select_node_by_id_and_revision, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_node
 			end
+			sql_finalize
 		end
 
 	node_author (a_node: CMS_NODE): detachable CMS_USER
@@ -207,9 +210,10 @@ feature -- Access
 			l_parameters.put (a_node.id, "nid")
 			l_parameters.put (a_node.revision, "revision")
 			sql_query (Select_user_author, l_parameters)
-			if sql_rows_count >= 1 then
+			if not has_error and not sql_after then
 				Result := fetch_author
 			end
+			sql_finalize
 		end
 
 	last_inserted_node_id: INTEGER_64
@@ -218,9 +222,10 @@ feature -- Access
 			error_handler.reset
 			write_information_log (generator + ".last_inserted_node_id")
 			sql_query (Sql_last_insert_node_id, Void)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := sql_read_integer_64 (1)
 			end
+			sql_finalize
 		end
 
 	last_inserted_node_revision (a_node: detachable CMS_NODE): INTEGER_64
@@ -234,11 +239,16 @@ feature -- Access
 				create l_parameters.make (1)
 				l_parameters.force (a_node.id, "nid")
 				sql_query (Sql_last_insert_node_revision_for_nid, l_parameters)
-				if sql_rows_count = 1 then
+				if not has_error and not sql_after then
 					if sql_item (1) /= Void then
 						Result := sql_read_integer_64 (1)
 					end
+					sql_forth
+					if not sql_after then
+						check no_more_than_one: False end
+					end
 				end
+				sql_finalize
 			end
 --			if Result = 0 and not has_error then --| include the case a_node = Void
 --				sql_query (Sql_last_insert_node_revision, Void)
@@ -328,7 +338,7 @@ feature -- Change: Node
 			l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")
 			l_parameters.put ({CMS_NODE_API}.trashed, "status")
 			l_parameters.put (a_id, "nid")
-			sql_change (sql_trash_node, l_parameters)
+			sql_modify (sql_trash_node, l_parameters)
 		end
 
 	 delete_node_base (a_node: CMS_NODE)
@@ -343,11 +353,11 @@ feature -- Change: Node
 			error_handler.reset
 			create l_parameters.make (1)
 			l_parameters.put (a_node.id, "nid")
-			sql_change (sql_delete_node, l_parameters)
+			sql_modify (sql_delete_node, l_parameters)
 
 				-- we remove node_revisions and pages.
 				-- Check: maybe we need a transaction.
-			sql_change (sql_delete_node_revisions, l_parameters)
+			sql_modify (sql_delete_node_revisions, l_parameters)
 
 			if not error_handler.has_error then
 				extended_delete (a_node)
@@ -368,7 +378,7 @@ feature -- Change: Node
 			l_parameters.put (l_time, "changed")
 			l_parameters.put ({CMS_NODE_API}.not_published, "status")
 			l_parameters.put (a_id, "nid")
-			sql_change (sql_restore_node, l_parameters)
+			sql_modify (sql_restore_node, l_parameters)
 		end
 
 
@@ -412,7 +422,7 @@ feature {NONE} -- Implementation
 				create l_copy_parameters.make (2)
 				l_copy_parameters.force (a_node.id, "nid")
 --				l_copy_parameters.force (l_rev - 1, "revision")
-				sql_change (sql_copy_node_to_revision, l_copy_parameters)
+				sql_insert (sql_copy_node_to_revision, l_copy_parameters)
 
 				if not has_error then
 					a_node.set_revision (l_rev)
@@ -420,7 +430,7 @@ feature {NONE} -- Implementation
 						-- Update
 					l_parameters.put (a_node.id, "nid")
 					l_parameters.put (a_node.revision, "revision")
-					sql_change (sql_update_node, l_parameters)
+					sql_modify (sql_update_node, l_parameters)
 
 					if not error_handler.has_error then
 						a_node.set_modification_date (now)
@@ -431,7 +441,7 @@ feature {NONE} -- Implementation
 				l_parameters.put (a_node.creation_date, "created")
 				l_parameters.put (l_rev, "revision")
 
-				sql_change (sql_insert_node, l_parameters)
+				sql_insert (sql_insert_node, l_parameters)
 				if not error_handler.has_error then
 					a_node.set_modification_date (now)
 					a_node.set_id (last_inserted_node_id)

modules/node/persistence/cms_node_storage_sql_page_extension.e

@@ -73,15 +73,15 @@ feature -- Persistence
 
 				if l_update then
 					if l_has_modif then
-						sql_change (sql_update_node_data, l_parameters)
+						sql_modify (sql_update_node_data, l_parameters)
 					end
 				else
 					if l_has_modif then
-						sql_change (sql_insert_node_data, l_parameters)
+						sql_insert (sql_insert_node_data, l_parameters)
 					else
 						-- no page data, means everything is empty.
 						-- FOR NOW: always record row
-						sql_change (sql_insert_node_data, l_parameters)
+						sql_insert (sql_insert_node_data, l_parameters)
 					end
 				end
 			end
@@ -121,7 +121,7 @@ feature -- Persistence
 			if a_node.has_id then
 				create l_parameters.make (1)
 				l_parameters.put (a_node.id, "nid")
-				sql_change (sql_delete_node_data, l_parameters)
+				sql_modify (sql_delete_node_data, l_parameters)
 			end
 		end
 
@@ -139,10 +139,14 @@ feature {NONE} -- Implementation
 			l_parameters.put (a_node.revision, "revision")
 			sql_query (sql_select_node_data, l_parameters)
 			if not has_error then
-				n := sql_rows_count
-				if n = 1 then
+				if not sql_after then
 						-- nid, revision, parent
 					Result := [sql_read_integer_64 (2), sql_read_integer_64 (3)]
+					sql_forth
+					if not sql_after then
+						check unique_data: n = 0 end
+						Result := Void
+					end
 				else
 					check unique_data: n = 0 end
 				end

modules/oauth20/persistence/cms_oauth_20_storage_sql.e

@@ -53,11 +53,15 @@ feature -- Access User Outh
 			create l_string.make_from_string (select_user_oauth2_template_by_id)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
 			sql_query (l_string, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end
 
 	user_oauth2_by_email (a_email: like {CMS_USER}.email; a_consumer: READABLE_STRING_GENERAL): detachable CMS_USER
@@ -73,11 +77,15 @@ feature -- Access User Outh
 			create l_string.make_from_string (select_user_oauth2_template_by_email)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
 			sql_query (l_string, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end
 
 	user_oauth2_by_token (a_token: READABLE_STRING_GENERAL; a_consumer: READABLE_STRING_GENERAL): detachable CMS_USER
@@ -93,11 +101,15 @@ feature -- Access User Outh
 			create l_string.make_from_string (select_user_by_oauth2_template_token)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
 			sql_query (l_string, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end
 
 
@@ -134,11 +146,15 @@ feature --Access: Consumers
 			create l_parameters.make (1)
 			l_parameters.put (a_name, "name")
 			sql_query (sql_oauth_consumer_name, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_consumer
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end
 
 	oauth_consumer_by_callback  (a_callback: READABLE_STRING_8): detachable CMS_OAUTH_20_CONSUMER
@@ -151,11 +167,15 @@ feature --Access: Consumers
 			create l_parameters.make (1)
 			l_parameters.put (a_callback, "name")
 			sql_query (sql_oauth_consumer_callback, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_consumer
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end
 
 feature -- Change: User OAuth
@@ -181,7 +201,7 @@ feature -- Change: User OAuth
 
 			create l_string.make_from_string (sql_insert_oauth2_template)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
-			sql_change (l_string, l_parameters)
+			sql_insert (l_string, l_parameters)
 			sql_commit_transaction
 		end
 
@@ -202,7 +222,7 @@ feature -- Change: User OAuth
 
 			create l_string.make_from_string (sql_update_oauth2_template)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
-			sql_change (l_string, l_parameters)
+			sql_modify (l_string, l_parameters)
 			sql_commit_transaction
 		end
 
@@ -221,7 +241,7 @@ feature -- Change: User OAuth
 
 			create l_string.make_from_string (sql_remove_oauth2_template)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
-			sql_change (l_string, l_parameters)
+			sql_modify (l_string, l_parameters)
 			sql_commit_transaction
 		end
 
@@ -342,7 +362,7 @@ feature {NONE} -- User OAuth2
 
 	Sql_remove_oauth2_template: STRING = "DELETE FROM $table_name WHERE uid =:uid;"
 
-	Sql_oauth_consumers: STRING = "SELECT name FROM oauth2_consumers";
+	Sql_oauth_consumers: STRING = "SELECT name FROM oauth2_consumers;"
 
 	Sql_oauth2_table_prefix: STRING = "oauth2_"
 

modules/openid/persitence/cms_openid_storage_sql.e

@@ -33,11 +33,15 @@ feature -- Access User Outh
 			l_parameters.put (a_uid, "uid")
 			l_parameters.put (a_identity, "identity")
 			sql_query (Select_user_openid_by_id, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end
 
 	user_openid_by_identity (a_identity: READABLE_STRING_GENERAL): detachable CMS_USER
@@ -50,10 +54,15 @@ feature -- Access User Outh
 			create l_parameters.make (1)
 			l_parameters.put (a_identity, "identity")
 			sql_query (Select_user_by_openid_identity, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			else
-				check no_more_than_one: sql_rows_count = 0 end
+				check no_more_than_one: False end
 			end
 		end
 
@@ -91,11 +100,14 @@ feature --Access: Consumers
 			create l_parameters.make (1)
 			l_parameters.put (a_name, "name")
 			sql_query (sql_openid_consumer_name, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_consumer
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+				end
 			end
+			sql_finalize
 		end
 
 feature -- Change: User OAuth
@@ -114,7 +126,7 @@ feature -- Change: User OAuth
 			l_parameters.put (a_user.id, "uid")
 			l_parameters.put (a_identity, "identity")
 			l_parameters.put (create {DATE_TIME}.make_now_utc, "utc_date")
-			sql_change (Sql_insert_openid, l_parameters)
+			sql_insert (Sql_insert_openid, l_parameters)
 			sql_commit_transaction
 		end