Refactor parameter handling in add_parameter! function and update delete_objects and update_field functions to use parameters correctly; add tests for filtering with 'nin' operator.

Author: PingoLee

src/QueryBuilder.jl

@@ -89,13 +89,17 @@ end
 get_parameter(connection::PormGPostgres) = PgParameterizedQuery("", Any[], 0)
 
 function add_parameter!(pq::PormGPostgresParam, value::AbstractArray; contains::Bool = false)
-  parameters::Vector{String} = String[]
-  for v in value
-    pq.parameter_count += 1
-    push!(pq.parameters, v)
-    push!(parameters, "\$$(pq.parameter_count)")
-  end
-  return parameters
+  # parameters::Vector{String} = String[]
+  # for v in value
+  #   pq.parameter_count += 1
+  #   push!(pq.parameters, v)
+  #   push!(parameters, "\$$(pq.parameter_count)")
+  # end
+  contains && (throw(ArgumentError("Contains option is not supported for array parameters")))
+  pq.parameter_count += 1
+  push!(pq.parameters, value)
+  # push!(pq.parameters, "ANY(\$$(pq.parameter_count))")
+  return "\$$(pq.parameter_count)"
 end
 function add_parameter!(pq::PormGPostgresParam, value; contains::Bool = false)::String
   contains && (value = string("%", value |> escape_like_pattern, "%"))  # Escape LIKE patterns if needed
@@ -1613,7 +1617,7 @@ function _get_filter_query(v::SQLTypeOper, instruc::SQLInstruction)
     return string(column, " ", v.operator, " ", placeholders)     
   elseif v.operator in ["in", "not in"]
     if isa(placeholders, String)
-      return string(column, " ", v.operator, " (", placeholders, ")")
+      return string(column, " ", v.operator == "in" ? "= ANY" : "<> ALL", "(", placeholders, ")")
     elseif isa(placeholders, AbstractArray)
       return string(column, " ", v.operator, " (", join(placeholders, ", "), ")")
     else
@@ -2268,7 +2272,7 @@ function update(objct::SQLObject; table_alias::Union{Nothing, SQLTableAlias} = n
     """
   end
 
-  @info sql
+  # @info sql
 
   @infiltrate false
 
@@ -2468,9 +2472,10 @@ function bulk_insert(objct::SQLObjectHandler, df_o::DataFrames.DataFrame;
   for (index, row) in enumerate(eachrow(df))
     values = String[]
     try
-      values = [model.fields[field].formater(row[field]) for field in fields_df]
-      param_placeholders = add_parameter!(parameters, values)
+      param_placeholders = [add_parameter!(parameters, model.fields[field].formater(row[field])) for field in fields_df]
+      # param_placeholders = add_parameter!(parameters, values)
     catch e
+      @infiltrate false
       _depuration_values_bulk_insert(fields_df, model, row, index, django_prefix)
       throw("Error in bulk_update, the row $(index) has a problem: $(e)")
     end
@@ -2761,8 +2766,8 @@ function _bulk_update(objct::SQLObjectHandler, df::DataFrames.DataFrame,
   for (index, row) in enumerate(eachrow(df))
     values = String[]    
     try
-      values = [model.fields[field].formater(row[field]) for field in joined_columns]
-      param_placeholders = add_parameter!(instruction.parameters, values)
+      param_placeholders = [add_parameter!(instruction.parameters, model.fields[field].formater(row[field])) for field in joined_columns]
+      # param_placeholders = add_parameter!(instruction.parameters, values)
     catch e
       _depuration_values_bulk_insert(fields_df, model, row, index, settings.django_prefix !== nothing)
       throw("Error in bulk_update, the row $(index) has a problem: $(e)")
@@ -2971,7 +2976,7 @@ function delete(objct::SQLObjectHandler;
 
       # Process field updates (for SET_NULL, SET_DEFAULT, etc.)
       for ((field, value), affected_models) in collector.field_updates
-        @infiltrate
+        @infiltrate false
         for (affected_model, keys) in affected_models
           update_field(connection, affected_model, field, value, keys, show_query, conn)
         end
@@ -3220,10 +3225,11 @@ function delete_objects(connection::Union{PormGPostgres, SQLite.DB}, model::Porm
   @infiltrate false
   # Execute the actual deletion SQL
   _where = String[]
+  parameters = get_parameter(connection)
   # @info keys[1][:objct] |> query
   for key in keys
     pk_field = key[:key]
-    push!(_where, """"$(pk_field)" IN ($(key[:objct] |> query))""")   
+    push!(_where, """"$(pk_field)" IN ($(query(key[:objct], parameters=parameters)))""")
   end
   sql::String = ""
   if size(keys, 1) == 1
@@ -3244,7 +3250,7 @@ function delete_objects(connection::Union{PormGPostgres, SQLite.DB}, model::Porm
     deleted_counter[model.name] = _query |> do_count
     _query.values(pk_field) # Ensure the query is built
     @infiltrate false
-    sql = "DELETE FROM $(model.name |> lowercase) WHERE $(pk_field) IN ($(_query |> query))"
+    sql = "DELETE FROM $(model.name |> lowercase) WHERE $(pk_field) IN ($(query(_query, parameters=parameters)))"
   end
 
   sql == "" && throw("Error in delete, the SQL query is empty, this should not happen")
@@ -3253,23 +3259,25 @@ function delete_objects(connection::Union{PormGPostgres, SQLite.DB}, model::Porm
     @info sql
     return deleted_counter  # Return count of deleted objects
   end
-  result, conn = with_transaction(connection, sql, conn=conn)
+  @infiltrate false
+  result, conn = with_transaction(connection, sql, conn=conn, params=parameters)
   return deleted_counter  # Return count of deleted objects
 end
 
 function update_field(connection::PormGPostgres, model::PormGModel, field::String, value::Any, keys::Dict{Symbol, Union{String, SQLObjectHandler}}, show_query::Bool, conn::Union{Nothing, LibPQ.Connection})
   # Update field values using query object like CASCADE
-  @infiltrate
+  @infiltrate false
   pk_field = keys[:key]
   _query = keys[:objct]
+  parameters = get_parameter(connection)
   value_sql = value === nothing ? "NULL" : model.fields[field].formater(value)
-  sql = "UPDATE $(model.name |> lowercase) SET $(field) = $(value_sql) WHERE $(pk_field) IN ($(_query |> query))"
+  sql = "UPDATE $(model.name |> lowercase) SET $(field) = $(value_sql) WHERE $(pk_field) IN ($(query(_query, parameters=parameters)))"
   if show_query
     @info sql
     return
   end
-  LibPQ.execute(connection, sql)
-  with_transaction(connection, sql, conn=conn)
+  # LibPQ.execute(connection, sql)
+  with_transaction(connection, sql, conn=conn, params=parameters)
 end
 
 

test/pg/test.jl

@@ -233,6 +233,9 @@ end
     query = M.Result |> object;
     query.filter("raceid__circuitid__name__@in" => ["Circuit de Monaco", "monaco"]);
     @test query |> do_count == 1664
+    query = M.Result |> object;
+    query.filter("raceid__circuitid__name__@nin" => ["Circuit de Monaco", "monaco"]);
+    @test query |> do_count == 25095
 end
 
 @testset "Date Operations" begin