refactor PreparedConnection for more useful ActiveRecord

discourse · Aug 22, 2024 · 49dc09b · 49dc09b
1 parent 7fc32ce
commit 49dc09b
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/mini_sql/postgres/prepared_connection.rb b/lib/mini_sql/postgres/prepared_connection.rb
@@ -7,13 +7,10 @@ class PreparedConnection < Connection
       attr_reader :unprepared
 
       def initialize(unprepared_connection)
-        @unprepared         = unprepared_connection
-        @raw_connection     = unprepared_connection.raw_connection
-        @type_map           = unprepared_connection.type_map
-        @param_encoder      = unprepared_connection.param_encoder
-
-        @prepared_cache     = PreparedCache.new(@raw_connection)
-        @param_binder       = unprepared.array_encoder ? PreparedBindsAutoArray.new(unprepared.array_encoder) : PreparedBinds.new
+        @unprepared    = unprepared_connection
+        @type_map      = unprepared_connection.type_map
+        @param_encoder = unprepared_connection.param_encoder
+        @param_binder  = unprepared.array_encoder ? PreparedBindsAutoArray.new(unprepared.array_encoder) : PreparedBinds.new
       end
 
       def build(_)
@@ -30,8 +27,11 @@ def deserializer_cache
 
       private def run(sql, params)
         prepared_sql, binds, _bind_names = @param_binder.bind(sql, *params)
+
+        @prepared_cache ||= PreparedCache.new(unprepared.raw_connection)
         prepare_statement_key = @prepared_cache.prepare_statement(prepared_sql)
-        raw_connection.exec_prepared(prepare_statement_key, binds)
+
+        unprepared.raw_connection.exec_prepared(prepare_statement_key, binds)
       end
 
     end