motor-admin 0.2.75 → 0.2.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9b78349d5fe94d86f874d3523e24dafaac9633eba8af576eba113995ec1a7f
-  data.tar.gz: f31aca38824912083d76dea8aa4940184e7c27ddfbf10869fef996604e4450c8
+  metadata.gz: f7103c85ab2173fce73651f6c94df44400326c3a0f6900d02958166334919764
+  data.tar.gz: 2702651e4344a7e11a433e7af54a754413075e6de05fb56a12459f831a6087c9
 SHA512:
-  metadata.gz: 838c3609255728a2dd03eb8c486d0a2b18d1dd2276038f019384c5f58a8fc2b06dc1efc611eb635e4f3ad3601b249ebc7437bcd33238bcb1af40b8baf1c2848e
-  data.tar.gz: e92db19b2104d4424d322df45f95c9ed543c41c4d84f9cf04c566f9f1d00d118309332c41db644c82b93c3d3ea11bc18544e6df7824853572142b52e97683f83
+  metadata.gz: bbebc6014289c848ac575afd1c21152e8671c7132af5806a0d550db254110e6b890c948dcdd216ccd54ec1f1849f0295237ad9f715775018b702059cff737e57
+  data.tar.gz: efd8735097f2419c606fafee91bab1543888d5e2d98719a2b6efafb7fe2706e3dbe7d55b0aace3265ff78ddac94056b494980f4d42f2444587136913c95c82f1

data/lib/motor/configs/sync_from_hash.rb

@@ -67,6 +67,8 @@ module Motor
 
           record.update!(attrs)
         end
+
+        ActiveRecordUtils.reset_id_sequence!(Motor::Config)
       end
 
       def sync_api_configs(configs_hash)
@@ -83,6 +85,8 @@ module Motor
         end
 
         archive_api_configs(configs_index, configs_hash[:api_configs])
+
+        ActiveRecordUtils.reset_id_sequence!(Motor::ApiConfig)
       end
 
       def archive_api_configs(configs_index, api_configs)
@@ -91,6 +95,7 @@ module Motor
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
       def sync_resources(configs_hash)
         resources_index = Motor::Configs::LoadFromCache.load_resources.index_by(&:name)
 
@@ -105,7 +110,10 @@ module Motor
           record.updated_at_will_change!
           record.update!(attrs)
         end
+
+        ActiveRecordUtils.reset_id_sequence!(Motor::Resource)
       end
+      # rubocop:enable Metrics/AbcSize
 
       def sync_taggable(records, config_items, configs_timestamp, update_proc)
         processed_records, create_items = update_taggable_items(records, config_items, update_proc)

data/lib/motor/configs.rb

@@ -10,6 +10,16 @@ module Motor
 
     module_function
 
+    def clear
+      Motor::Resource.destroy_all
+      Motor::Alert.destroy_all
+      Motor::Query.destroy_all
+      Motor::Dashboard.destroy_all
+      Motor::Form.destroy_all
+      Motor::ApiConfig.destroy_all
+      Motor::Config.destroy_all
+    end
+
     # @return [String]
     def file_path
       if Rails.root.to_s.start_with?(MEMFS_PATH)

data/lib/motor/queries/run_query.rb

@@ -145,9 +145,9 @@ module Motor
       # @param filters [Hash]
       # @return [String]
       def build_select_sql(connection_class, sql, limit, filters)
-        sql = sql.strip.delete_suffix(';').gsub(/\A\)+/, '').gsub(/\z\(+/, '')
+        sql = normalize_sql(sql)
 
-        subquery_sql = Arel.sql("(#{sql}) as #{SUBQUERY_NAME}")
+        subquery_sql = Arel.sql("(#{sql})").as(connection_class.connection.quote_column_name(SUBQUERY_NAME))
 
         arel_filters = build_filters_arel(filters)
 
@@ -198,6 +198,10 @@ module Motor
         [sql, 'SQL', attributes]
       end
 
+      def normalize_sql(sql)
+        sql.strip.delete_suffix(';').gsub(/\A\)+/, '').gsub(/\z\(+/, '')
+      end
+
       # @param variable_configs [Array<Hash>]
       # @param variables_hash [Hash]
       # @return [Hash]

data/lib/motor/resources/fetch_configured_model.rb

@@ -45,7 +45,8 @@ module Motor
 
         klass.instance_eval do
           default_scope do
-            from(Arel.sql("(#{self.klass.instance_variable_get(:@__motor_custom_sql)})").as(table_name))
+            from(Arel.sql("(#{self.klass.instance_variable_get(:@__motor_custom_sql)})")
+                     .as(connection.quote_column_name(table_name)))
           end
         end
 

data/lib/motor/tasks/motor.rake

@@ -21,6 +21,15 @@ namespace :motor do
     puts '✅ configs have been loaded from configs/motor.yml'
   end
 
+  task reload: :environment do
+    ActiveRecord::Base.transaction do
+      Motor::Configs.clear
+      Motor::Configs::SyncFromFile.call(with_exception: true)
+    end
+
+    puts '✅ configs have been loaded from configs/motor.yml'
+  end
+
   desc 'Synchronize configs with remote application'
 
   task sync: :environment do

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.75'
+  VERSION = '0.2.78'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.75
+  version: 0.2.78
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter