fat_free_crm 0.22.0 → 0.23.0

data/app/views/accounts/update.js.haml

@@ -7,6 +7,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{j @entity.name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/admin/custom_fields/_check_boxes_field.html.haml

@@ -1,6 +1,9 @@
 %div
   .label.top.req
     = "Select Options (pipe separated):"
-= f.text_field :collection_string, class: 'field_collection_string', size: 78
+= f.text_field :collection_string, class: 'field_collection_string', size: 78, placeholder: "Option 1|Option 2|Option 3"
 
 = render partial: 'admin/custom_fields/base_field', locals: {f: f}
+
+- if f.object.new_record?
+  .info2 After saving, you must restart all instances of the Rails server to apply column serialization.

data/app/views/admin/custom_fields/_date_pair_field.html.haml

@@ -1,5 +1,5 @@
 - field1 = f.object || CustomFieldPair.new
-- field2 = f.object.respond_to?(:paired_with) ? field1.paired_with : CustomFieldPair.new
+- field2 = (field1.pair || CustomFieldPair.new)
 
 %table{class: :pairs}
   = fields_for("pair[0]", field1) do |first|

data/app/views/campaigns/_top_section.html.haml

@@ -2,9 +2,9 @@
   .section
     %table
       %tr
-        %td(colspan="5")
+        %td{class: (@campaign.errors['name'].present? ? 'fieldWithErrors' : nil)}(colspan="5")
           .label.top.req #{t :name}:
-          = f.text_field :name, autofocus: true, style: "width:500px"
+          = f.text_field :name, autofocus: true, style: "width:500px", required: "required"
       %tr
         %td
           .label #{t :start_date}:

data/app/views/campaigns/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :leads, :opportunities)

data/app/views/campaigns/update.js.haml

@@ -7,6 +7,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/contacts/_top_section.html.haml

@@ -3,13 +3,13 @@
   .section
     %table
       %tr
-        %td
-          .label.top.req{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
-          = f.text_field :first_name, autofocus: true
+        %td{class: (@contact.errors['first_name'].present? ? 'fieldWithErrors' : nil)}
+          .label.top{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
+          = f.text_field :first_name, autofocus: true, required: (Setting.require_first_names ? "required" : nil)
         %td= spacer
-        %td
+        %td{class: (@contact.errors['last_name'].present? ? 'fieldWithErrors' : nil)}
           .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}:
-          = f.text_field :last_name
+          = f.text_field :last_name, required: (Setting.require_last_names ? "required" : nil)
       %tr
         %td
           .label #{t :email}:

data/app/views/contacts/show.js.haml

@@ -1,5 +1,4 @@
-- entity_name = controller.controller_name.singularize.underscore #account
+- entity_name = controller.controller_name.singularize.underscore
 - @entity = instance_variable_get("@#{entity_name}")
-
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :opportunities)

data/app/views/contacts/update.js.haml

@@ -8,6 +8,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/devise/sessions/new.html.haml

@@ -23,10 +23,9 @@
       .label= t(:password)
       = f.input_field :password
 
-    %div(style="margin-left:12px")
+    .section
       = f.input :remember_me, as: :boolean, inline_label: t('remember_me')
-    %br
-    .buttonbar
-      = f.submit t(:login)
-      = t(:or)
+      = f.submit t(:login), class: 'btn btn-primary'
+
+    .section
       = link_to t(:forgot_password) + '?', new_password_path(resource_name)

data/app/views/fields/_group.html.haml

@@ -1,6 +1,9 @@
 - if field_group.name != 'custom_fields'
-  -# start a new section
-  - collapsed = session[field_group.key].nil?
+  - # Ensure field groups containing validation errors are expanded
+  - required_field_names = field_group.fields.select(&:required?).map(&:name)
+  - fields_with_errors = f.object.errors.map{|e| e.attribute.to_s}
+  - force_open = (required_field_names & fields_with_errors).any?
+  - collapsed = session[field_group.key].nil? && !force_open
   %div{ id: "#{field_group.key}_container", :"data-tag" => field_group.tag.try(:name) }
     = subtitle field_group.key, collapsed, t(field_group.name, default: field_group.label)
     .section

data/app/views/fields/_group_table.html.haml

@@ -2,12 +2,11 @@
   - field_group.fields.without_pairs.in_groups_of(2, false) do |group|
     %tr
       - group.each_with_index do |field, i|
-        %td
+        %td{class: (f.object.errors[field.name].present? ? 'fieldWithErrors' : nil)}
           - if field.hint.present?
             = image_tag "info_tiny.png", title: field.hint, class: "tooltip-icon"
-          - if field.as == 'check_boxes'
-            - value = f.object.send(field.name)
-            - checked = YAML.load(value.to_s)
-          = f.input field.name, field.input_options.merge(checked: checked)
+          .label.top{class: (field.required? ? 'req': nil)}
+            = "#{field.label}:"
+          = f.input_field field.name, field.input_options
         - if i == 0
           %td= spacer

data/app/views/fields/_group_view.html.haml

@@ -4,7 +4,10 @@
     %tr
       - group.each do |field|
         = col(field.label, (i == groups.size - 1) ? :last : nil) do
-          = field.render_value(entity)
+          - if field.as == "text"
+            = simple_format(field.render_value(entity))
+          - else
+            = field.render_value(entity)
         - if group.size == 1
           %th.last
           %td.last

data/app/views/fields/_sidebar_show.html.haml

@@ -1,9 +1,6 @@
 - asset.field_groups.each do |field_group|
-  - fg = field_group.fields.without_pairs
-  - if fg.select{|f| asset.send(f.name).present? }.any?
-    %div
-      - unless field_group.name == 'custom_fields'
-        .caption #{field_group.label_i18n}
-      - fg.each do |field|
-        - if (value = field.render_value(asset)).present?
-          == #{field.label}:<br /> <b>#{truncate(value, length: 35)}</b><br />
+  - fields = field_group.fields.without_pairs
+  - if fields.select{|f| asset.send(f.name).present? }.any?
+    - unless field_group.name == 'custom_fields'
+      .caption #{field_group.label_i18n}
+    = render("fields/group_view", fields: fields, entity: asset) unless fields.nil?

data/app/views/fields/group.js.erb

@@ -1,3 +1,5 @@
 <%= simple_fields_for(@asset) do |f| %>
-  $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: @field_group, fields: @field_group.fields}) %>')
+  <% @field_groups.each do |field_group| %>
+    $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: field_group, fields: field_group.fields}) %>')
+  <% end %>
 <% end %>

data/app/views/layouts/application.html.haml

@@ -26,9 +26,7 @@
     - if current_user.present?
       :javascript
         #{yield :javascript}
-        var _ffcrm_users = [
-        #{raw User.all.map{|u| "'#{j u.full_name} (@#{j u.username})'" }.join(",\n")}
-        ];
+
 
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
@@ -42,7 +40,7 @@
       = render "layouts/footer"
 
     %script{type: "text/javascript"}
-      = "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank?
+      = "crm.base_url = '#{h Setting.base_url}';".html_safe unless Setting.base_url.blank?
       = get_browser_timezone_offset
       = content_for :javascript_epilogue
       = hook(:javascript_epilogue, self)

data/app/views/leads/_top_section.html.haml

@@ -3,13 +3,13 @@
   .section
     %table
       %tr
-        %td
+        %td{ class: (@lead.errors['first_name'].present? ? 'fieldWithErrors' : nil)}
           .label.top{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
-          = f.text_field :first_name, autofocus: true
+          = f.text_field :first_name, autofocus: true, required: (Setting.require_first_names ? "required" : nil)
         %td= spacer
-        %td
+        %td{ class: (@lead.errors['last_name'].present? ? 'fieldWithErrors' : nil)}
           .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}:
-          = f.text_field :last_name
+          = f.text_field :last_name, required: (Setting.require_last_names ? "required" : nil)
       %tr
         %td
           .label #{t :email}:

data/app/views/leads/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks)

data/app/views/leads/update.js.haml

@@ -7,6 +7,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/opportunities/_top_section.html.haml

@@ -2,9 +2,9 @@
   .section
     %table
       %tr
-        %td
+        %td{class: (@opportunity.errors['name'].present? ? 'fieldWithErrors' : nil)}
           .label.req.top #{t :name}:
-          = f.text_field :name, autofocus: true, style: "width:325px"
+          = f.text_field :name, autofocus: true, style: "width:325px", required: "required"
         %td= spacer
         %td
           .label.req.top #{t :stage}:

data/app/views/opportunities/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :contacts)

data/app/views/opportunities/update.js.haml

@@ -7,6 +7,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/shared/_add_comment.html.haml

@@ -1,5 +1,5 @@
 - edit ||= false
-- collapsed = @comment_body.nil?  && f.object.errors.empty?
+- collapsed = session[:comment].nil?
 = subtitle :comment, collapsed, t(:comment)
 .section
   %small#comment_intro{ hidden_if(!collapsed) }

data/app/views/shared/_address.html.haml

@@ -41,4 +41,4 @@
           = address_field(a, :zipcode, "width:80px;")
         %td= spacer
         %td
-          = a.country_select(:country, priority_countries: priority_countries, include_blank: "", :"data-placeholder" => t(:select_a_country), style: "width:150px; margin-top:6px", class: 'select2')
+          = a.country_select(:country, {priority_countries: priority_countries, include_blank: true}, {data: { placeholder: t(:select_a_country)}, class: 'select2'})

data/app/views/tasks/_top_section.html.haml

@@ -3,10 +3,10 @@
     %tr
       %td(colspan="5")
         .label.top.req #{t :name}:
-        = f.text_field :name, autofocus: true, style: "width:500px"
+        = f.text_field :name, autofocus: true, style: "width:500px", required: "required"
     %tr
       %td
-        .label.req #{t :due}:
+        .label #{t :due}:
         - bucket = (params[:bucket].blank? ? @task.bucket : params[:bucket]) || "due_asap"
         - with_time = Setting.task_calendar_with_time
         - if @task.bucket != "specific_time"
@@ -18,11 +18,11 @@
           = f.text_field :calendar, value: f.object.due_at.strftime(fmt), style: "width:160px;", autocomplete: :off, class: (with_time ? 'datetime' : 'date')
       %td= spacer
       %td
-        .label.req #{t :assign_to}:
+        .label #{t :assign_to}:
         = user_select(:task, all_users, current_user)
       %td= spacer
       %td
-        .label.req #{t :category}:
+        .label #{t :category}:
         = f.select :category, @category, { selected: @task.category.blank? ? nil : @task.category.to_sym, include_blank: t(:select_blank) }, { style: "width:160px", class: 'select2' }
 
     - if Setting.background_info && Setting.background_info.include?(:task)

data/config/application.rb

@@ -85,6 +85,8 @@ module FatFreeCRM
       ::ActiveSupport::HashWithIndifferentAccess, # for Field#settings serialization see app/models/fields/field.rb
       ::ActiveSupport::TimeWithZone,
       ::ActiveSupport::TimeZone,
+      ::ActsAsTaggableOn::TagList,
+      ::ActsAsTaggableOn::DefaultParser,
       ::BigDecimal,
       ::Date,
       ::Symbol,

data/config/database.yml

@@ -1,26 +1,23 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
 ---
 development: &development
-  adapter: postgresql
-  database: fat_free_crm_development
-  username: postgres
-  password:
-  host:     localhost
-  port:     5432
-  schema_search_path: public
-  min_messages: warning
+  adapter: sqlite3
+  database: db/fat_free_crm_development.sqlite3
+  pool: 5
+  timeout: 5000
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *development
-  database: fat_free_crm_test
+  database: db/fat_free_crm_test.sqlite3
 
 production:
   <<: *development
-  database: fat_free_crm_production
+  database: db/fat_free_crm_production.sqlite3
 
 staging:
   <<: *development
-  database: fat_free_crm_staging
-
+  database: db/fat_free_crm_staging.sqlite3

data/config/environments/development.rb

@@ -83,5 +83,20 @@ if defined?(FatFreeCRM::Application)
     # Checks for improperly declared sprockets dependencies.
     # Raises helpful error messages.
     config.assets.raise_runtime_errors = true
+
+    # Are we running in a GitHub Codespace?
+    if ENV.fetch('CODESPACE_NAME', nil)
+      config.host = "#{ENV.fetch('CODESPACE_NAME', nil)}-3000.app.github.dev:443"
+      config.hosts << ".preview.app.github.dev"
+      config.hosts << ".app.github.dev"
+
+      config.force_ssl = true
+      config.action_dispatch.cookies_same_site_protection = :lax
+
+      config.action_dispatch.trusted_proxies = [
+        # Trust all IPs (safe in dev only)
+        IPAddr.new("0.0.0.0/0"), IPAddr.new("::/0")
+      ]
+    end
   end
 end

data/config/initializers/action_mailer.rb

@@ -10,7 +10,7 @@
 #   ActionMailer is setup in test mode later on
 #
 unless Rails.env.test?
-  require './app/models/setting'
+  require 'setting'
 
   smtp_settings = Setting.smtp || {}
 

data/config/initializers/application_controller_renderer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # ActiveSupport::Reloader.to_prepare do

data/config/initializers/backtrace_silencers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

data/config/initializers/content_security_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Define an application-wide content security policy.

data/config/initializers/custom_field_ransack_translations.rb

@@ -6,8 +6,8 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 # Load field names for custom fields, for Ransack search
-require './app/models/setting'
-if Setting.database_and_table_exists?
+require 'setting'
+if Setting.database_and_table_exists? && ActiveRecord::Base.connection.table_exists?(:custom_fields)
   Rails.application.config.after_initialize do
     I18n.backend.load_translations
 

data/config/initializers/devise.rb

@@ -16,6 +16,7 @@ Devise.setup do |config|
   # Devise will use the `secret_key_base` as its `secret_key`
   # by default. You can change it below and use your own secret key.
   # config.secret_key = SecureRandom.hex(64)
+  config.secret_key = Rails.application.secret_key_base
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/config/initializers/inflections.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/config/initializers/permissions_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Define an application-wide HTTP permissions policy. For further
 # information see https://developers.google.com/web/updates/2018/06/feature-policy
 #

data/config/routes.rb

@@ -23,6 +23,7 @@ Rails.application.routes.draw do
     resources :users, only: %i[index show] do
       collection do
         get :opportunities_overview
+        match :auto_complete, via: %i[get post]
       end
     end
   end
@@ -159,9 +160,6 @@ Rails.application.routes.draw do
       patch :change_password
       post :redraw
     end
-    collection do
-      match :auto_complete, via: %i[get post]
-    end
   end
 
   namespace :admin do

data/config/settings.default.yml

@@ -192,7 +192,8 @@
 #------------------------------------------------------------------------------
 # Specify which countries (if any) should appear at the top of country pickers
 # priority_countries:
-#  - Burkina Faso
+#  - AU
+#  - BF
 
 # Main and Admin Tabs
 #------------------------------------------------------------------------------

data/db/migrate/20230422234321_optionally_create_action_text_tables.action_text.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# This migration comes from action_text (originally 20180528164100)
+class OptionallyCreateActionTextTables < ActiveRecord::Migration[6.0]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :action_text_rich_texts, id: primary_key_type, if_not_exists: true do |t|
+      t.string     :name, null: false
+      t.text       :body, size: :long
+      t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type
+
+      t.timestamps
+
+      t.index %i[record_type record_id name], name: "index_action_text_rich_texts_uniqueness", unique: true
+    end
+  end
+
+  private
+
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
+end

data/db/migrate/20230526211831_create_active_storage_tables.active_storage.rb

@@ -6,7 +6,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
     # Use Active Record's configured type for primary and foreign keys
     primary_key_type, foreign_key_type = primary_and_foreign_key_types
 
-    create_table :active_storage_blobs, id: primary_key_type do |t|
+    create_table :active_storage_blobs, id: primary_key_type, if_not_exists: true do |t|
       t.string   :key,          null: false
       t.string   :filename,     null: false
       t.string   :content_type
@@ -19,7 +19,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
       t.index [:key], unique: true
     end
 
-    create_table :active_storage_attachments, id: primary_key_type do |t|
+    create_table :active_storage_attachments, id: primary_key_type, if_not_exists: true do |t|
       t.string     :name,     null: false
       t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
       t.references :blob,     null: false, type: foreign_key_type
@@ -30,7 +30,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
       t.foreign_key :active_storage_blobs, column: :blob_id
     end
 
-    create_table :active_storage_variant_records, id: primary_key_type do |t|
+    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
       t.belongs_to :blob, null: false, index: false, type: foreign_key_type
       t.string :variation_digest, null: false
 

data/db/migrate/20230526212613_convert_to_active_storage.rb

@@ -4,19 +4,16 @@ class ConvertToActiveStorage < ActiveRecord::Migration[5.2]
   require 'open-uri'
 
   def up
-    get_blob_id = case ENV['CI'] && ENV['DB']
-                  when 'sqlite'
-                    'LAST_INSERT_ROWID()'
-                  when 'mysql'
-                    'LAST_INSERT_ID()'
-                  when 'postgres'
-                    'LASTVAL()'
-                  else
-                    'LASTVAL()'
-                  end
-
     ActiveRecord::Base.connection.raw_connection.then do |conn|
-      if conn.is_a?(PG::Connection)
+      get_blob_id = case ENV['CI'] && ENV['DB']
+                    when 'mysql'
+                      'LAST_INSERT_ID()'
+                    else
+                      'LASTVAL()'
+                    end
+      get_blob_id = 'LAST_INSERT_ROWID()' if conn.is_a?(SQLite3::Database)
+      if conn.is_a?(::PG::Connection)
+        get_blob_id = 'LASTVAL()'
         conn.prepare('active_storage_blobs', <<-SQL)
           INSERT INTO active_storage_blobs (
             key, filename, content_type, metadata, byte_size, checksum, created_at
@@ -29,13 +26,13 @@ class ConvertToActiveStorage < ActiveRecord::Migration[5.2]
           ) VALUES ($1, $2, $3, #{get_blob_id}, $4)
         SQL
       else
-        conn.raw_connection.prepare(<<-SQL)
+        conn.prepare(<<-SQL)
           INSERT INTO active_storage_blobs (
             `key`, filename, content_type, metadata, byte_size, checksum, created_at
           ) VALUES (?, ?, ?, '{}', ?, ?, ?)
         SQL
 
-        conn.raw_connection.prepare(<<-SQL)
+        conn.prepare(<<-SQL)
           INSERT INTO active_storage_attachments (
             name, record_type, record_id, blob_id, created_at
           ) VALUES (?, ?, ?, #{get_blob_id}, ?)