motor-admin 0.1.48 → 0.1.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55c1bf8c2fc221d84cbb142204893b6625d980d9c9966fe08cab12b1b8b9e9f6
-  data.tar.gz: 25c3c29dac2b0abd4414cf5c90ada44e4af357efb43ddd63fad4a632321bf89f
+  metadata.gz: 2484e6d98ef1891e59ab7bc0e50dc8337f0b99ae3fb35e2d5d72caf84020112c
+  data.tar.gz: 85a1e6334f83ccdd8e49b6f80ef52ff7ef8f169b586fc00b0745d281e1b75f9a
 SHA512:
-  metadata.gz: 6faa1ebe8212cf8855b064f4c80df93b6f8a4ef93b09ba98d5565a24a86d6e4274f746511c28ffc5fca2da67710572ee53b2aaa384199ef3fa6de908cf774330
-  data.tar.gz: 737e7e1768be0721d825029176e3397007feb21794eb1eeec2ebe777c0a5c3880b3942f23be50476bdf7f12f564fd03fa3aadb8a69a31d8b06ba2dfb1111e845
+  metadata.gz: dabb17786ed10544c54246f0a460cb3507d9cca5cb8269aa4e0cf0962d69f55cb8f63870f0c6ecfe2810da7c174f2cce7f75702f3472be0221a02ad49babb159
+  data.tar.gz: 2a5c5b2c319248b692f6d662c510ca489066a192c613714c9e970352db3a06994d032d01052707799627bf81bca0b6422a399f8584925baa1658d44706043c67

data/README.md

@@ -82,7 +82,7 @@ SQL queries can be organized into dashboards to create a convenient representati
 
 Query data can be sent via email periodically using the alerts feature. Interval of the alert email can be specified using natural language, e.g., `every day at midnight`, `every Monday at 8 PM`, `every weekday at 6AM and 6PM`, `every minute`.
 
-The sender address can be specified using `MOTOR_ALERTS_FROM_ADDRESS` environment variable.
+Sender address can be specified using `MOTOR_ALERTS_FROM_ADDRESS` environment variable.
 
 ### Intelligence Search
 

data/app/controllers/motor/api_base_controller.rb

@@ -12,10 +12,12 @@ module Motor
       end
     end
 
-    rescue_from StandardError do |e|
-      Rails.logger.error(e)
+    unless Rails.env.test?
+      rescue_from StandardError do |e|
+        Rails.logger.error(e)
 
-      render json: { errors: [e.message] }, status: :internal_server_error
+        render json: { errors: [e.message] }, status: :internal_server_error
+      end
     end
 
     def current_ability

data/app/controllers/motor/run_queries_controller.rb

@@ -9,22 +9,24 @@ module Motor
     before_action :build_query, only: :create
     authorize_resource :query, only: :create
 
-    rescue_from 'ActiveRecord::StatementInvalid' do |e|
-      render json: { errors: [{ detail: e.message }] }, status: :unprocessable_entity
-    end
-
     def show
-      render json: query_result_hash(query_result)
+      render_result
     end
 
     def create
-      render json: query_result_hash(query_result)
+      render_result
     end
 
     private
 
-    def query_result
-      Queries::RunQuery.call(@query, variables_hash: params[:variables])
+    def render_result
+      query_result = Queries::RunQuery.call(@query, variables_hash: params[:variables])
+
+      if query_result.error
+        render json: { errors: [{ detail: query_result.error }] }, status: :unprocessable_entity
+      else
+        render json: query_result_hash(query_result)
+      end
     end
 
     def query_result_hash(query_result)

data/app/controllers/motor/ui_controller.rb

@@ -7,14 +7,20 @@ module Motor
     helper_method :current_user
 
     def index
-      Motor.reload! if Motor.development?
-
-      Motor::Configs::SyncFromFile.call
+      render_ui
+    end
 
-      render :show
+    def new
+      render_ui
     end
 
     def show
+      render_ui
+    end
+
+    private
+
+    def render_ui
       Motor.reload! if Motor.development?
 
       Motor::Configs::SyncFromFile.call

data/app/models/motor/alert.rb

@@ -11,6 +11,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/dashboard.rb

@@ -9,6 +9,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/form.rb

@@ -9,6 +9,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/query.rb

@@ -10,12 +10,13 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
     has_many :alerts, dependent: :destroy
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }
 
     def result(variables_hash = {})
-      result = Motor::Queries::RunQuery.call(self, variables_hash: variables_hash)
+      result = Motor::Queries::RunQuery.call!(self, variables_hash: variables_hash)
       column_names = result.columns.pluck(:name)
 
       result.data.map { |row| column_names.zip(row).to_h }

data/app/models/motor/resource.rb

@@ -4,6 +4,7 @@ module Motor
   class Resource < ::Motor::ApplicationRecord
     audited
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
   end
 end

data/config/routes.rb

@@ -2,7 +2,7 @@
 
 Motor::Admin.routes.draw do
   namespace :motor, path: '' do
-    scope 'api', as: 'api' do
+    scope 'api', as: :api do
       resources :run_queries, only: %i[show create]
       resources :send_alerts, only: %i[create]
       resources :queries, only: %i[index show create update destroy]
@@ -34,16 +34,15 @@ Motor::Admin.routes.draw do
 
     get '/', to: 'ui#show'
 
-    scope as: 'ui' do
+    scope as: :ui do
+      get '/data(/*path)', to: 'ui#index', as: :data
+
       with_options controller: 'ui' do
-        resources :data, only: %i[index show],
-                         param: 'path',
-                         constraints: { path: /.+/ }
         resources :reports, only: %i[index show]
-        resources :queries, only: %i[index show]
-        resources :dashboards, only: %i[index show]
-        resources :alerts, only: %i[index show]
-        resources :forms, only: %i[index show]
+        resources :queries, only: %i[index show new]
+        resources :dashboards, only: %i[index show new]
+        resources :alerts, only: %i[index show new]
+        resources :forms, only: %i[index show new]
       end
     end
   end

data/lib/generators/motor/templates/install.rb

@@ -2,61 +2,61 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
   def self.up
     create_table :motor_queries do |t|
       t.column :name, :string, null: false
-      t.column :description, :string
-      t.column :sql_body, :string, null: false
-      t.column :preferences, :string, null: false, default: '{}'
-      t.column :author_id, :integer
+      t.column :description, :text
+      t.column :sql_body, :text, null: false
+      t.column :preferences, :text, null: false
+      t.column :author_id, :bigint
       t.column :author_type, :string
       t.column :deleted_at, :datetime
 
       t.timestamps
 
       t.index :updated_at
-      t.index 'lower(name)',
-              name: 'motor_queries_lower_name_unique_index',
+      t.index 'name',
+              name: 'motor_queries_name_unique_index',
               unique: true,
               where: 'deleted_at IS NULL'
     end
 
     create_table :motor_dashboards do |t|
       t.column :title, :string, null: false
-      t.column :description, :string
-      t.column :preferences, :string, null: false, default: '{}'
-      t.column :author_id, :integer
+      t.column :description, :text
+      t.column :preferences, :text, null: false
+      t.column :author_id, :bigint
       t.column :author_type, :string
       t.column :deleted_at, :datetime
 
       t.timestamps
 
       t.index :updated_at
-      t.index 'lower(title)',
-              name: 'motor_dashboards_lower_title_unique_index',
+      t.index 'title',
+              name: 'motor_dashboards_title_unique_index',
               unique: true,
               where: 'deleted_at IS NULL'
     end
 
     create_table :motor_forms do |t|
       t.column :name, :string, null: false
-      t.column :description, :string
-      t.column :api_path, :string, null: false
+      t.column :description, :text
+      t.column :api_path, :text, null: false
       t.column :http_method, :string, null: false
-      t.column :preferences, :string, null: false, default: '{}'
-      t.column :author_id, :integer
+      t.column :preferences, :text, null: false
+      t.column :author_id, :bigint
       t.column :author_type, :string
       t.column :deleted_at, :datetime
 
       t.timestamps
 
       t.index :updated_at
-      t.index 'lower(name)',
-              name: 'motor_forms_lower_name_unique_index',
+      t.index 'name',
+              name: 'motor_forms_name_unique_index',
               unique: true,
               where: 'deleted_at IS NULL'
     end
 
     create_table :motor_resources do |t|
       t.column :name, :string, null: false, index: { unique: true }
-      t.column :preferences, :string, null: false, default: '{}'
+      t.column :preferences, :text, null: false
 
       t.timestamps
 
@@ -65,7 +65,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 
     create_table :motor_configs do |t|
       t.column :key, :string, null: false, index: { unique: true }
-      t.column :value, :string, null: false, default: '{}'
+      t.column :value, :text, null: false
 
       t.timestamps
 
@@ -75,19 +75,19 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     create_table :motor_alerts do |t|
       t.references :query, null: false, foreign_key: { to_table: :motor_queries }, index: true
       t.column :name, :string, null: false
-      t.column :description, :string
-      t.column :to_emails, :string, null: false
+      t.column :description, :text
+      t.column :to_emails, :text, null: false
       t.column :is_enabled, :boolean, null: false, default: true
-      t.column :preferences, :string, null: false, default: '{}'
-      t.column :author_id, :integer
+      t.column :preferences, :text, null: false
+      t.column :author_id, :bigint
       t.column :author_type, :string
       t.column :deleted_at, :datetime
 
       t.timestamps
 
       t.index :updated_at
-      t.index 'lower(name)',
-              name: 'motor_alerts_lower_name_unique_index',
+      t.index 'name',
+              name: 'motor_alerts_name_unique_index',
               unique: true,
               where: 'deleted_at IS NULL'
     end
@@ -106,14 +106,14 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 
       t.timestamps
 
-      t.index 'lower(name)',
-              name: 'motor_tags_lower_name_unique_index',
+      t.index 'name',
+              name: 'motor_tags_name_unique_index',
               unique: true
     end
 
     create_table :motor_taggable_tags do |t|
       t.references :tag, null: false, foreign_key: { to_table: :motor_tags }, index: true
-      t.column :taggable_id, :integer, null: false
+      t.column :taggable_id, :bigint, null: false
       t.column :taggable_type, :string, null: false
 
       t.index %i[taggable_id taggable_type tag_id],
@@ -122,17 +122,17 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     end
 
     create_table :motor_audits do |t|
-      t.column :auditable_id, :integer
+      t.column :auditable_id, :bigint
       t.column :auditable_type, :string
-      t.column :associated_id, :integer
+      t.column :associated_id, :bigint
       t.column :associated_type, :string
-      t.column :user_id, :integer
+      t.column :user_id, :bigint
       t.column :user_type, :string
       t.column :username, :string
       t.column :action, :string
       t.column :audited_changes, :text
-      t.column :version, :integer, default: 0
-      t.column :comment, :string
+      t.column :version, :bigint, default: 0
+      t.column :comment, :text
       t.column :remote_address, :string
       t.column :request_uuid, :string
       t.column :created_at, :datetime

data/lib/motor.rb

@@ -40,7 +40,6 @@ module Motor
       (defined?(::Puma) && File.basename($PROGRAM_NAME) == 'puma') ||
       defined?(::Unicorn::HttpServer) ||
       defined?(::Mongrel::HttpServer) ||
-      defined?(::WEBrick::VERSION) ||
       defined?(JRuby::Rack::VERSION) ||
       defined?(::Trinidad::Server)
   end

data/lib/motor/active_record_utils.rb

@@ -1,6 +1,18 @@
 # frozen_string_literal: true
 
-module ActiveRecordUtils
+module Motor
+  module ActiveRecordUtils
+    module_function
+
+    def reset_id_sequence!(model)
+      case ActiveRecord::Base.connection.class.name
+      when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
+        ActiveRecord::Base.connection.reset_pk_sequence!(model.table_name)
+      else
+        ActiveRecord::Base.connection.reset_sequence!(model.table_name, 'id')
+      end
+    end
+  end
 end
 
 require_relative './active_record_utils/types'

data/lib/motor/active_record_utils/active_storage_blob_patch.rb

@@ -13,6 +13,10 @@ module Motor
         super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
       end
 
+      def create_after_upload!(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
       def create_after_unfurling!(hash)
         super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
       end

data/lib/motor/admin.rb

@@ -43,7 +43,7 @@ module Motor
     end
 
     initializer 'motor.alerts.scheduler' do
-      config.after_initialize do |_app|
+      config.after_initialize do
         next unless Motor.server?
 
         Motor::Alerts::Scheduler::SCHEDULER_TASK.execute
@@ -66,11 +66,10 @@ module Motor
     end
 
     initializer 'motor.active_storage.extensions' do
-      ActiveSupport.on_load(:active_storage_attachment) do
-        ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
-      end
+      config.after_initialize do
+        next unless defined?(ActiveStorage::Engine)
 
-      ActiveSupport.on_load(:active_storage_blob) do
+        ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
         ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
       end
     end

data/lib/motor/alerts/persistance.rb

@@ -28,7 +28,7 @@ module Motor
       end
 
       def create_from_params!(params, current_user = nil)
-        raise NameAlreadyExists if Alert.exists?(['lower(name) = ?', params[:name].to_s.downcase])
+        raise NameAlreadyExists if Alert.exists?(name: params[:name])
 
         alert = build_from_params(params, current_user)
 
@@ -77,7 +77,7 @@ module Motor
       end
 
       def archive_with_existing_name(alert)
-        Motor::Alert.where(['lower(name) = ? AND id != ?', alert.name.to_s.downcase, alert.id])
+        Motor::Alert.where(['name = ? AND id != ?', alert.name, alert.id])
                     .update_all(deleted_at: Time.current)
       end
 
@@ -87,9 +87,9 @@ module Motor
 
       def name_already_exists?(alert)
         if alert.new_record?
-          Alert.exists?(['lower(name) = ?', alert.name.to_s.downcase])
+          Alert.exists?(name: alert.name)
         else
-          Alert.exists?(['lower(name) = ? AND id != ?', alert.name.to_s.downcase, alert.id])
+          Alert.exists?(['name = ? AND id != ?', alert.name, alert.id])
         end
       end
     end

data/lib/motor/alerts/scheduler.rb

@@ -3,7 +3,7 @@
 module Motor
   module Alerts
     module Scheduler
-      SCHEDULER_INTERVAL = 10.seconds
+      SCHEDULER_INTERVAL = 1.minute
       CHECK_BEHIND_DURATION = 15.minutes
 
       SCHEDULER_TASK = Concurrent::TimerTask.new(

data/lib/motor/api_query/build_json.rb

@@ -10,12 +10,12 @@ module Motor
 
         rel = rel.preload_associations_lazily if rel.is_a?(ActiveRecord::Relation)
 
-        json_params = {}
+        json_params = {}.with_indifferent_access
 
         assign_include_params(json_params, rel, params)
         assign_fields_params(json_params, rel, params)
 
-        rel.as_json(json_params.with_indifferent_access)
+        rel.as_json(json_params)
       end
 
       def assign_include_params(json_params, _rel, api_params)
@@ -51,11 +51,11 @@ module Motor
         params[:fields].each do |key, fields|
           fields = fields.split(',') if fields.is_a?(String)
 
-          merge_fields_params!(key, fields, json_params, model)
+          merge_fields_params!(json_params, key, fields, model)
         end
       end
 
-      def merge_fields_params!(key, fields, json_params, model)
+      def merge_fields_params!(json_params, key, fields, model)
         model_name = model.name.underscore
 
         if key == model_name || model_name.split('/').last == key

data/lib/motor/api_query/paginate.rb

@@ -11,6 +11,7 @@ module Motor
         params ||= {}
 
         rel = rel.limit([MAX_PER_PAGE, (params[:limit] || MAX_PER_PAGE).to_i].min)
+
         rel.offset(params[:offset].to_i)
       end
     end

data/lib/motor/api_query/sort.rb

@@ -13,7 +13,9 @@ module Motor
         arel_order = build_arel_order(rel.klass, param)
         join_params = build_join_params(rel.klass, param)
 
-        rel.reorder(arel_order).left_joins(join_params)
+        rel = rel.left_joins(join_params) if join_params.present?
+
+        rel.reorder(arel_order)
       end
 
       def build_join_params(_model, param)

data/lib/motor/assets.rb

@@ -35,6 +35,8 @@ module Motor
     def load_from_disk(filename, gzip:)
       filename += '.gz' if gzip
 
+      raise InvalidPathError if filename.include?('..')
+
       path = ASSETS_PATH.join(filename)
 
       raise InvalidPathError unless path.to_s.starts_with?(ASSETS_PATH.to_s)

data/lib/motor/build_schema/load_from_rails.rb

@@ -12,6 +12,8 @@ module Motor
         models.map do |model|
           Object.const_get(model.name)
 
+          next unless ActiveRecord::Base.connection.table_exists?(model.table_name)
+
           schema = build_model_schema(model)
 
           if model.respond_to?(:devise_modules)
@@ -20,7 +22,7 @@ module Motor
 
           schema
         rescue StandardError, NotImplementedError => e
-          Rails.logger.error(e) if model.name != 'Audited::Audit'
+          Rails.logger.error(e)
 
           next
         end.compact
@@ -34,6 +36,7 @@ module Motor
         models -= Motor::ApplicationRecord.descendants
         models -= [Motor::Audit]
         models -= [ActiveRecord::SchemaMigration] if defined?(ActiveRecord::SchemaMigration)
+        models -= [ActiveRecord::InternalMetadata] if defined?(ActiveRecord::InternalMetadata)
         models -= [ActiveStorage::Blob] if defined?(ActiveStorage::Blob)
         models -= [ActiveStorage::VariantRecord] if defined?(ActiveStorage::VariantRecord)
 
@@ -101,7 +104,7 @@ module Motor
           name: column.name,
           display_name: Utils.humanize_column_name(column.name),
           column_type: is_enum ? 'string' : UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
-          is_array: column.array?,
+          is_array: column.respond_to?(:array?) && column.array?,
           access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
           default_value: default_attrs[column.name],
           validators: fetch_validators(model, column.name),

data/lib/motor/configs/load_from_cache.rb

@@ -3,7 +3,7 @@
 module Motor
   module Configs
     module LoadFromCache
-      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 10.megabytes)
+      CACHE_HASH = HashWithIndifferentAccess.new
 
       module_function
 
@@ -56,25 +56,37 @@ module Motor
         end
       end
 
-      def maybe_fetch_from_cache(type, cache_key, &block)
+      def maybe_fetch_from_cache(type, cache_key)
         return yield unless cache_key
 
-        CACHE_STORE.fetch(type + cache_key.to_s, &block)
+        if CACHE_HASH[type] && CACHE_HASH[type][:key] == cache_key
+          CACHE_HASH[type][:value]
+        else
+          result = yield
+
+          CACHE_HASH[type] = { key: cache_key, value: result }
+
+          result
+        end
       end
 
       def load_cache_keys
-        ActiveRecord::Base.connection.execute(
-          "(#{
-            [
-              Motor::Config.select("'configs', MAX(updated_at)").to_sql,
-              Motor::Resource.select("'resources', MAX(updated_at)").to_sql,
-              Motor::Dashboard.select("'dashboards', MAX(updated_at)").to_sql,
-              Motor::Alert.select("'alerts', MAX(updated_at)").to_sql,
-              Motor::Query.select("'queries', MAX(updated_at)").to_sql,
-              Motor::Form.select("'forms', MAX(updated_at)").to_sql
-            ].join(') UNION (')
-          })"
-        ).to_a.map(&:values).to_h.with_indifferent_access
+        result = ActiveRecord::Base.connection.execute(cache_keys_sql).to_a
+
+        result = result.map(&:values) if result.first.is_a?(Hash)
+
+        result.to_h.with_indifferent_access
+      end
+
+      def cache_keys_sql
+        [
+          Motor::Config.select("'configs', MAX(updated_at)").to_sql,
+          Motor::Resource.select("'resources', MAX(updated_at)").to_sql,
+          Motor::Dashboard.select("'dashboards', MAX(updated_at)").to_sql,
+          Motor::Alert.select("'alerts', MAX(updated_at)").to_sql,
+          Motor::Query.select("'queries', MAX(updated_at)").to_sql,
+          Motor::Form.select("'forms', MAX(updated_at)").to_sql
+        ].join(' UNION ')
       end
     end
   end

data/lib/motor/configs/sync_from_hash.rb

@@ -87,7 +87,7 @@ module Motor
 
         archive_taggable_items(records - processed_records, configs_timestamp)
 
-        ActiveRecord::Base.connection.reset_pk_sequence!(records.klass.table_name)
+        ActiveRecordUtils.reset_id_sequence!(records.klass)
       end
 
       def update_taggable_items(records, config_items, update_proc)

data/lib/motor/configs/write_to_file.rb

@@ -9,6 +9,7 @@ module Motor
       module_function
 
       def call
+        return if Rails.env.test?
         return if THREAD_POOL.queue_length.positive?
 
         THREAD_POOL.post do

data/lib/motor/dashboards/persistance.rb

@@ -16,7 +16,7 @@ module Motor
       end
 
       def create_from_params!(params, current_user = nil)
-        raise TitleAlreadyExists if Dashboard.exists?(['lower(title) = ?', params[:title].to_s.downcase])
+        raise TitleAlreadyExists if Dashboard.exists?(title: params[:title])
 
         dashboard = build_from_params(params, current_user)
 
@@ -57,15 +57,15 @@ module Motor
       end
 
       def archive_with_existing_name(dashboard)
-        Motor::Dashboard.where(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
+        Motor::Dashboard.where(['title = ? AND id != ?', dashboard.title, dashboard.id])
                         .update_all(deleted_at: Time.current)
       end
 
       def title_already_exists?(dashboard)
         if dashboard.new_record?
-          Motor::Dashboard.exists?(['lower(title) = ?', dashboard.title.to_s.downcase])
+          Motor::Dashboard.exists?(title: dashboard.title)
         else
-          Motor::Dashboard.exists?(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
+          Motor::Dashboard.exists?(['title = ? AND id != ?', dashboard.title, dashboard.id])
         end
       end
     end

data/lib/motor/forms/persistance.rb

@@ -16,7 +16,7 @@ module Motor
       end
 
       def create_from_params!(params, current_user = nil)
-        raise NameAlreadyExists if Form.exists?(['lower(name) = ?', params[:name].to_s.downcase])
+        raise NameAlreadyExists if Form.exists?(name: params[:name])
 
         form = build_from_params(params, current_user)
 
@@ -57,15 +57,15 @@ module Motor
       end
 
       def archive_with_existing_name(form)
-        Motor::Form.where(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
+        Motor::Form.where(['name = ? AND id != ?', form.name, form.id])
                    .update_all(deleted_at: Time.current)
       end
 
       def name_already_exists?(form)
         if form.new_record?
-          Motor::Form.exists?(['lower(name) = ?', form.name.to_s.downcase])
+          Motor::Form.exists?(['name = ?', form.name])
         else
-          Motor::Form.exists?(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
+          Motor::Form.exists?(['name = ? AND id != ?', form.name, form.id])
         end
       end
     end

data/lib/motor/queries/persistance.rb

@@ -16,7 +16,7 @@ module Motor
       end
 
       def create_from_params!(params, current_user = nil)
-        raise NameAlreadyExists if Query.exists?(['lower(name) = ?', params[:name].to_s.downcase])
+        raise NameAlreadyExists if Query.exists?(name: params[:name])
 
         query = build_from_params(params, current_user)
 
@@ -57,15 +57,15 @@ module Motor
       end
 
       def archive_with_existing_name(query)
-        Motor::Query.where(['lower(name) = ? AND id != ?', query.name.to_s.downcase, query.id])
+        Motor::Query.where(['name = ? AND id != ?', query.name, query.id])
                     .update_all(deleted_at: Time.current)
       end
 
       def name_already_exists?(query)
         if query.new_record?
-          Query.exists?(['lower(name) = ?', query.name.to_s.downcase])
+          Query.exists?(name: query.name)
         else
-          Query.exists?(['lower(name) = ? AND id != ?', query.name.to_s.downcase, query.id])
+          Query.exists?(['name = ? AND id != ?', query.name, query.id])
         end
       end
     end

data/lib/motor/queries/run_query.rb

@@ -5,19 +5,24 @@ module Motor
     module RunQuery
       DEFAULT_LIMIT = 100_000
 
-      QueryResult = Struct.new(:data, :columns, keyword_init: true)
+      QueryResult = Struct.new(:data, :columns, :error, keyword_init: true)
+
+      WITH_STATEMENT_START = 'WITH __query__ AS ('
 
       WITH_STATEMENT_TEMPLATE = <<~SQL
-        WITH __query__ AS (%<sql_body>s) SELECT * FROM __query__ LIMIT %<limit>s;
+        #{WITH_STATEMENT_START}%<sql_body>s
+        ) SELECT * FROM __query__ LIMIT %<limit>s;
       SQL
 
+      PG_ERROR_REGEXP = /\APG.+ERROR:/.freeze
+
       module_function
 
       # @param query [Motor::Query]
       # @param variables_hash [Hash]
       # @param limit [Integer]
       # @return [Motor::Queries::RunQuery::QueryResult]
-      def call(query, variables_hash: nil, limit: DEFAULT_LIMIT)
+      def call!(query, variables_hash: nil, limit: DEFAULT_LIMIT)
         variables_hash ||= {}
 
         result = execute_query(query, limit, variables_hash)
@@ -25,6 +30,22 @@ module Motor
         QueryResult.new(data: result.rows, columns: build_columns_hash(result))
       end
 
+      # @param query [Motor::Query]
+      # @param variables_hash [Hash]
+      # @param limit [Integer]
+      # @return [Motor::Queries::RunQuery::QueryResult]
+      def call(query, variables_hash: nil, limit: DEFAULT_LIMIT)
+        call!(query, variables_hash: variables_hash, limit: limit)
+      rescue ActiveRecord::StatementInvalid => e
+        QueryResult.new(error: build_error_message(e))
+      end
+
+      # @param exception [ActiveRecord::StatementInvalid]
+      # @return [String]
+      def build_error_message(exception)
+        exception.message.sub(WITH_STATEMENT_START, '').sub(PG_ERROR_REGEXP, '').strip.upcase_first
+      end
+
       # @param query [Motor::Query]
       # @param limit [Integer]
       # @param variables_hash [Hash]
@@ -35,8 +56,8 @@ module Motor
 
         ActiveRecord::Base.transaction do
           result =
-            case ActiveRecord::Base.connection
-            when ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+            case ActiveRecord::Base.connection.class.name
+            when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
               PostgresqlExecQuery.call(ActiveRecord::Base.connection, statement)
             else
               ActiveRecord::Base.connection.exec_query(*statement)

data/lib/motor/tags.rb

@@ -10,7 +10,7 @@ module Motor
       tags.each do |tag_name|
         next if taggable.taggable_tags.find { |tt| tt.tag.name.casecmp(tag_name).zero? }
 
-        tag = Tag.where('lower(name) = ?', tag_name.downcase).take || Tag.new(name: tag_name)
+        tag = Tag.find_or_initialize_by(name: tag_name)
 
         taggable.taggable_tags.new(tag: tag)
       end

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -2068,11 +2068,11 @@
   "mail-opened.svg": "icons/mail-opened.svg",
   "mail.svg": "icons/mail.svg",
   "mailbox.svg": "icons/mailbox.svg",
-  "main-af386d0c907b80c29f22.css.gz": "main-af386d0c907b80c29f22.css.gz",
-  "main-af386d0c907b80c29f22.js.LICENSE.txt": "main-af386d0c907b80c29f22.js.LICENSE.txt",
-  "main-af386d0c907b80c29f22.js.gz": "main-af386d0c907b80c29f22.js.gz",
-  "main.css": "main-af386d0c907b80c29f22.css",
-  "main.js": "main-af386d0c907b80c29f22.js",
+  "main-67fbb3a8f6a6388434c8.css.gz": "main-67fbb3a8f6a6388434c8.css.gz",
+  "main-67fbb3a8f6a6388434c8.js.LICENSE.txt": "main-67fbb3a8f6a6388434c8.js.LICENSE.txt",
+  "main-67fbb3a8f6a6388434c8.js.gz": "main-67fbb3a8f6a6388434c8.js.gz",
+  "main.css": "main-67fbb3a8f6a6388434c8.css",
+  "main.js": "main-67fbb3a8f6a6388434c8.js",
   "man.svg": "icons/man.svg",
   "manual-gearbox.svg": "icons/manual-gearbox.svg",
   "map-2.svg": "icons/map-2.svg",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.48
+  version: 0.1.53
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -108,7 +108,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-description: Admin UI and Business Analytics.
+description: |
+  Motor Admin allows to create a flexible admin panel with writing less code.
+  All customizations to the admin panel can be made directly in the UI without
+  the need of writing any configurations code.
 email:
 - pete.matsy@gmail.com
 executables: []
@@ -1481,8 +1484,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-af386d0c907b80c29f22.css.gz
-- ui/dist/main-af386d0c907b80c29f22.js.gz
+- ui/dist/main-67fbb3a8f6a6388434c8.css.gz
+- ui/dist/main-67fbb3a8f6a6388434c8.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:
@@ -1506,5 +1509,5 @@ requirements: []
 rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
-summary: Admin UI and Business Analytics
+summary: Low-code Admin panel and Business intelligence
 test_files: []