forest_admin_datasource_active_record 1.0.0.pre.beta.53 → 1.0.0.pre.beta.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241691e966a9bd75b1cf66d07cc640e8ad2201fef29640568fafca6490c28250
-  data.tar.gz: 4db07ffe9fa5d0c0f9397c9b4b7073850440aa5a68d8329ef1e350d2e23ba7db
+  metadata.gz: 872ac653d0f9a281cab0421a9f01343ab3ee751ab12dd89d07aaabc870ecd91e
+  data.tar.gz: dc666fc765acabfa4ce22fccd2e3240f4c4ba308884d2b77754b6ffd33adf85d
 SHA512:
-  metadata.gz: d7b4af902acab6b8edd4067603f6de7f1e3420608a78b44a5ee339125030b54e4508a50f4956c50bad891a8d77c92f6854d922fd5e3debfbe9cf6706555fcacf
-  data.tar.gz: 817416e1dc2c846b473f1afec82f922205560c8802f8b340507337714aa4388bc1d328436ad2b5bfaae24cef2b52960da69d6c25e7cb5c4b991a17bfd1e52d3c
+  metadata.gz: 613b29a6e6f7119ecc1d33f2955b5bf3fdf69999a4d6a2d7066c1a423b4bff4af630dc8dd4aefdf2fdc88a4f2393da8dcb5edc379ab54f89ba00e00ab158c512
+  data.tar.gz: fc7ca9cc8868bdf8aca89735d1c22c550bdb45b962054958dd1cc8c01a2cd0ec8022c67dd27c1e7ea3c5c05f51442cbd7d8f22ff6e417eefd5352c667296dcb2

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -47,11 +47,10 @@ module ForestAdminDatasourceActiveRecord
 
     def fetch_fields
       @model.columns_hash.each do |column_name, column|
-        # TODO: check is not sti column
         field = ForestAdminDatasourceToolkit::Schema::ColumnSchema.new(
           column_type: get_column_type(@model, column),
           filter_operators: operators_for_column_type(get_column_type(@model, column)),
-          is_primary_key: column_name == @model.primary_key,
+          is_primary_key: column_name == @model.primary_key || @model.primary_key.include?(column_name),
           is_read_only: false,
           is_sortable: true,
           default_value: column.default,

data/lib/forest_admin_datasource_active_record/datasource.rb

@@ -5,6 +5,7 @@ module ForestAdminDatasourceActiveRecord
     def initialize(db_config = {})
       super()
       @models = []
+      @habtm_models = {}
       init_orm(db_config)
       generate
     end
@@ -19,11 +20,52 @@ module ForestAdminDatasourceActiveRecord
     end
 
     def fetch_model(model)
-      @models << model unless model.abstract_class? || @models.include?(model) || !model.table_exists?
+      if model.name.start_with?('HABTM_')
+        build_habtm(model)
+      else
+        @models << model unless model.abstract_class? || @models.include?(model) || !model.table_exists?
+      end
     end
 
     def init_orm(db_config)
       ActiveRecord::Base.establish_connection(db_config)
     end
+
+    def build_habtm(model)
+      if @habtm_models.key?(model.table_name)
+        @habtm_models[model.table_name].left_reflection = model.right_reflection
+        # when the second model is added, we can push the HABTM model to the models list
+        @models << make_through_model(
+          model.table_name,
+          [
+            @habtm_models[model.table_name].left_reflection,
+            @habtm_models[model.table_name].right_reflection
+          ]
+        )
+      else
+        @habtm_models[model.table_name] = model
+      end
+    end
+
+    def make_through_model(table_name, associations)
+      through_model = Class.new(ActiveRecord::Base) do
+        class << self
+          attr_accessor :name, :table_name
+        end
+
+        def self.add_association(name, options)
+          belongs_to name, required: false, **options
+        end
+      end
+
+      through_model.name = table_name.singularize
+      through_model.table_name = table_name
+      through_model.primary_key = [associations[0].foreign_key, associations[1].foreign_key]
+      associations.each do |association|
+        through_model.add_association(association.name, association.options)
+      end
+
+      through_model
+    end
   end
 end

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -107,9 +107,7 @@ module ForestAdminDatasourceActiveRecord
       def apply_select
         unless @projection.nil?
           @query = @query.select(@select.join(', '))
-          @query = @query.eager_load(@projection.relations.keys.map(&:to_sym))
-          # TODO: replace eager_load by joins because eager_load select ALL columns of relation
-          # @query = @query.joins(@projection.relations.keys.map(&:to_sym))
+          @query = @query.joins(@projection.relations.keys.map(&:to_sym))
         end
 
         @query

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.53"
+  VERSION = "1.0.0-beta.54"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.53
+  version: 1.0.0.pre.beta.54
 platform: ruby
 authors:
 - Matthieu