Ensure string_params doesn't get GC'd (#276)

krynju · web-flow · commit ae46e134f911 · 2023-08-17T15:20:33.000-05:00
* Update asyncresults.jl * move to GC.@preserve & fix all usages * fix whitespace * fixup style
diff --git a/src/asyncresults.jl b/src/asyncresults.jl
@@ -252,7 +252,9 @@ function async_execute(
     pointer_params = parameter_pointers(string_params)
 
     async_result = _async_execute(jl_conn; binary_format=binary_format, kwargs...) do jl_conn
-            _async_submit(jl_conn.conn, query, pointer_params; binary_format=binary_format)
+            GC.@preserve string_params _async_submit(
+                jl_conn.conn, query, pointer_params; binary_format=binary_format
+            )
         end
 
     return async_result
diff --git a/src/copy.jl b/src/copy.jl
@@ -52,7 +52,9 @@ function execute(
         if parameters === nothing
             result = _execute(jl_conn.conn, copy.query)
         else
-            result = _execute(jl_conn.conn, copy.query, pointer_params)
+            result = GC.@preserve string_params _execute(
+                jl_conn.conn, copy.query, pointer_params
+            )
         end
         result_status = libpq_c.PQresultStatus(result)
 
diff --git a/src/results.jl b/src/results.jl
@@ -322,7 +322,9 @@ function execute(
     pointer_params = parameter_pointers(string_params)
 
     result = lock(jl_conn) do
-        _execute(jl_conn.conn, query, pointer_params; binary_format=binary_format)
+        GC.@preserve string_params _execute(
+            jl_conn.conn, query, pointer_params; binary_format=binary_format
+        )
     end
 
     return handle_result(
diff --git a/src/statements.jl b/src/statements.jl
@@ -121,7 +121,7 @@ function execute(
     pointer_params = parameter_pointers(string_params)
 
     result = lock(stmt.jl_conn) do
-        _execute_prepared(
+        GC.@preserve string_params _execute_prepared(
             stmt.jl_conn.conn, stmt.name, pointer_params; binary_format=binary_format
         )
     end

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ function execute(`
`121`	`121`	`pointer_params = parameter_pointers(string_params)`
`122`	`122`
`123`	`123`	`result = lock(stmt.jl_conn) do`
`124`		`- _execute_prepared(`
	`124`	`+ GC.@preserve string_params _execute_prepared(`
`125`	`125`	`stmt.jl_conn.conn, stmt.name, pointer_params; binary_format=binary_format`
`126`	`126`	`)`
`127`	`127`	`end`