restart 0.1.0 again

Author: Andrey Oskin

Project.toml

@@ -16,7 +16,6 @@ IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
 LayerDicts = "6f188dcb-512c-564b-bc01-e0f76e72f166"
 LibPQ_jll = "08be9ffa-1c94-5ee5-a977-46a84ec9b350"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-Memento = "f28f55f0-a522-5efc-85c2-fe41dfb9b2d9"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
@@ -32,7 +31,6 @@ Intervals = "1.4"
 IterTools = "1"
 LayerDicts = "1"
 LibPQ_jll = "12"
-Memento = "0.10, 0.11, 0.12, 0.13, 1"
 OffsetArrays = "0.9.1, 0.10, 0.11, 1"
 Tables = "0.2, 1"
 TimeZones = "0.9.2, 0.10, 0.11, 1"

src/LibPQ2.jl

@@ -17,16 +17,13 @@ using Infinity: InfExtendedTime, isposinf, ∞
 using Intervals
 using IterTools: imap
 using LayerDicts
-using Memento: Memento, getlogger, warn, info, error, debug
 using OffsetArrays
 using TimeZones
 
 const Parameter = Union{String, Missing}
-const LOGGER = getlogger(@__MODULE__)
 
 function __init__()
     INTERVAL_REGEX[] = _interval_regex()
-    Memento.register(LOGGER)
 end
 
 # Docstring template for types using DocStringExtensions

src/asyncresults.jl

@@ -158,11 +158,9 @@ function _cancel(jl_conn::Connection)
         errbuf = zeros(UInt8, errbuf_size)
         success = libpq_c.PQcancel(cancel_ptr, pointer(errbuf), errbuf_size) == 1
         if !success
-            warn(LOGGER, Errors.JLConnectionError(
-                "Failed cancelling query: $(String(errbuf))"
-            ))
+            @warn Errors.JLConnectionError("Failed cancelling query: $(String(errbuf))")
         else
-            debug(LOGGER, "Cancelled query for connection $(jl_conn.conn)")
+            @debug "Cancelled query for connection $(jl_conn.conn)"
         end
     finally
         libpq_c.PQfreeCancel(cancel_ptr)

src/connections.jl

@@ -124,12 +124,12 @@ function handle_new_connection(jl_conn::Connection; throw_error::Bool=true)
 
         if throw_error
             close(jl_conn)
-            error(LOGGER, err)
+            error(err)
         else
-            warn(LOGGER, err)
+            @warn err
         end
     else
-        debug(LOGGER, "Connection established: $(jl_conn.conn)")
+        @debug "Connection established: $(jl_conn.conn)"
         # if connection is successful, set client_encoding
         reset_encoding!(jl_conn)
     end
@@ -140,7 +140,7 @@ function handle_new_connection(jl_conn::Connection; throw_error::Bool=true)
             # finalizers can't task swtich, but they can schedule tasks
             @async begin
                 if !atomic_cas!(closed, false, true)
-                    debug(LOGGER, "Closing connection $(conn_ptr) in finalizer")
+                    @debug "Closing connection $(conn_ptr) in finalizer"
                     # we don't need to acquire a lock, because if anyone else is holding a
                     # lock on the connection (using lock(::Connection)) then it won't be
                     # cleaned up by the gc yet

src/copy.jl

@@ -58,9 +58,11 @@ function execute(
 
         if result_status != libpq_c.PGRES_COPY_IN
             if !(result_status in (libpq_c.PGRES_BAD_RESPONSE, libpq_c.PGRES_FATAL_ERROR))
-                level(LOGGER, Errors.JLResultError(
-                    "Expected PGRES_COPY_IN after COPY query, got $result_status"
-                ))
+                if throw_error
+                    error(Errors.JLResultError("Expected PGRES_COPY_IN after COPY query, got $result_status"))
+                else
+                    @warn Errors.JLResultError("Expected PGRES_COPY_IN after COPY query, got $result_status")
+                end
             end
             return result
         end
@@ -71,7 +73,11 @@ function execute(
 
         status_code = put_copy_end(jl_conn)
         if status_code == -1
-            level(LOGGER, Errors.PQConnectionError(jl_conn))
+            if throw_error
+                error(Errors.PQConnectionError(jl_conn))
+            else
+                @warn Errors.PQConnectionError(jl_conn)
+            end
         end
 
         libpq_c.PQgetResult(jl_conn.conn)

src/results.jl

@@ -225,16 +225,16 @@ function handle_result(jl_result::Result; throw_error::Bool=true)
 
         if throw_error
             close(jl_result)
-            error(LOGGER, err)
+            error(err)
         else
-            warn(LOGGER, err)
+            @warn err
         end
     else
         if result_status == libpq_c.PGRES_NONFATAL_ERROR
-            warn(LOGGER, Errors.PQResultError(jl_result))
+            @warn Errors.PQResultError(jl_result)
         end
 
-        debug(LOGGER, unsafe_string(libpq_c.PQcmdStatus(jl_result.result)))
+        @debug unsafe_string(libpq_c.PQcmdStatus(jl_result.result))
     end
 
     return jl_result