tina4ruby 3.10.66 → 3.10.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13acdd49bf29d256910ee8f803a6cd0983d9b38a903d3bc3e3efbba4bc07b565
-  data.tar.gz: 2e344b8b471db71b218d29e69d18d0aa0f3b3d8493e60840f5d409c9c2807c31
+  metadata.gz: e5ba81bb86f837e23521b7b13d2ee313a0ac7e34bbf04371c4256d00b077c7f3
+  data.tar.gz: 9bb8a43825801b904b30bddcfbc51fedc74694bb04d37d404d33702338d40806
 SHA512:
-  metadata.gz: b314ccc66d3cc707e5efcaf27a162da73d2f84255faf1cde06369b11144591c58223f007808415f9697d3d158d496786baeda362a20ceafb7eddd4d5e4ec450c
-  data.tar.gz: 1117b18973c2f6c44b28caa2d18f6064b3ce63fa4f0e6d4a6a88250c448bd2133a026b05a4f85978a7cf38473043d9d41e440c7a6b92af8693ef78af3ece5a27
+  metadata.gz: 29819ac550ac637dbc6bd3fb3456e426a2311cdbabc6cbe9953d4b03317ecb5eca6f55f5f70b69f515db433135b221fb45320f7aad3ded354b56a9772f150da2
+  data.tar.gz: 2ae5fc934297b48c3352aab9bc6606dba1553adc91e989efe8b301a6163e291eeec9f79d592a2a781ea34528b13b75a6cf8d55714f4795b5da80984c9be6e165

data/lib/tina4/orm.rb

@@ -481,29 +481,15 @@ module Tina4
       errors
     end
 
-    def load(filter_sql = nil, params = [])
-      @relationship_cache = {} # Clear relationship cache on reload
-
-      pk = self.class.primary_key_field || :id
-
-      # Determine the SQL to execute
-      if filter_sql.nil? || filter_sql.is_a?(Integer)
-        # Legacy: load by primary key (load() or load(id))
-        id = filter_sql || __send__(pk)
-        return false unless id
-        sql = "SELECT * FROM #{self.class.table_name} WHERE #{pk} = ?"
-        query_params = [id]
-      else
-        # Filter-based: load("email = ?", ["alice@example.com"])
-        sql = "SELECT * FROM #{self.class.table_name} WHERE #{filter_sql}"
-        query_params = params
-      end
-
-      result = self.class.db.fetch_one(sql, query_params)
+    # Load a record into this instance via select_one.
+    # Returns true if found and loaded, false otherwise.
+    def load(sql, params = [], include: nil)
+      @relationship_cache = {}
+      result = self.class.select_one(sql, params, include: include)
       return false unless result
 
       mapping_reverse = self.class.field_mapping.invert
-      result.each do |key, value|
+      result.to_h.each do |key, value|
         attr_name = mapping_reverse[key.to_s] || key
         setter = "#{attr_name}="
         __send__(setter, value) if respond_to?(setter)

data/lib/tina4/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tina4
-  VERSION = "3.10.66"
+  VERSION = "3.10.67"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.10.66
+  version: 3.10.67
 platform: ruby
 authors:
 - Tina4 Team