Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix creating products in admin on SQLite and MySQL (#12454)

Łukasz Adamczykda2eb8acb35b
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index eda7247f58..74bc5cdbf4 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -16,7 +16,14 @@ module Spree
default_scope { includes(attachment_attachment: :blob) }
store_accessor :private_metadata, :session_uploaded_assets_uuid
- scope :with_session_uploaded_assets_uuid, ->(uuid) { where("#{table_name}.private_metadata @> ?", { session_uploaded_assets_uuid: uuid }.to_json) }
+ scope :with_session_uploaded_assets_uuid, lambda { |uuid|
+ case ActiveRecord::Base.connection.adapter_name
+ when 'PostgreSQL'
+ where("#{table_name}.private_metadata @> ?", { session_uploaded_assets_uuid: uuid }.to_json)
+ when 'Mysql2', 'SQLite'
+ where("JSON_EXTRACT(private_metadata, '$.session_uploaded_assets_uuid') = '#{uuid}'")
+ end
+ }
def product
@product ||= viewable_type == 'Spree::Variant' ? viewable&.product : nil
diff --git a/core/lib/spree/testing_support/metadata.rb b/core/lib/spree/testing_support/metadata.rb
index 467c88c840..c747cba4a6 100644
--- a/core/lib/spree/testing_support/metadata.rb
+++ b/core/lib/spree/testing_support/metadata.rb
@@ -38,7 +38,7 @@ shared_examples_for 'metadata' do |factory: described_class.name.demodulize.unde
expect(subject.public_metadata['additional_data']).to eq(hash.stringify_keys)
end
- it 'can query records by metadata properties', skip: ENV['DB'] == 'mysql' do
+ it 'can query records by metadata properties', skip: (ENV['DB'].blank? || ENV['DB'] == 'mysql') do
subject.public_metadata[:color] = 'red'
subject.public_metadata[:priority] = 1
subject.public_metadata[:keywords] = ['k1', 'k2']
@@ -51,4 +51,16 @@ shared_examples_for 'metadata' do |factory: described_class.name.demodulize.unde
expect(described_class.where("public_metadata -> 'keywords' ? :keyword", keyword: 'k1').count).to eq(1)
expect(described_class.where("public_metadata -> 'additional_data' ->> 'size' = :size", size: 'big').count).to eq(1)
end
+
+ it 'can query records by metadata properties', skip: ENV['DB'] == 'postgres' do
+ subject.public_metadata[:color] = 'red'
+ subject.public_metadata[:priority] = 1
+ subject.public_metadata[:additional_data] = { size: 'big', material: 'wool' }
+
+ subject.save!
+
+ expect(described_class.where("JSON_EXTRACT(public_metadata, '$.color') = ?", 'red').count).to eq(1)
+ expect(described_class.where("JSON_EXTRACT(public_metadata, '$.priority') = ?", 1).count).to eq(1)
+ expect(described_class.where("JSON_EXTRACT(public_metadata, '$.additional_data.size') = :size", size: 'big').count).to eq(1)
+ end
end
diff --git a/core/spec/models/spree/asset_spec.rb b/core/spec/models/spree/asset_spec.rb
index 2f214022aa..473104fe51 100644
--- a/core/spec/models/spree/asset_spec.rb
+++ b/core/spec/models/spree/asset_spec.rb
@@ -49,4 +49,17 @@ describe Spree::Asset, type: :model do
asset.filename
end
end
+
+ describe '.with_session_uploaded_assets_uuid' do
+ subject { described_class.with_session_uploaded_assets_uuid(uuid) }
+
+ let!(:assets) { create_list(:asset, 2, session_uploaded_assets_uuid: uuid) }
+ let!(:other_assets) { create_list(:asset, 2, session_uploaded_assets_uuid: SecureRandom.uuid) }
+
+ let(:uuid) { SecureRandom.uuid }
+
+ it 'returns assets with the given uuid' do
+ expect(subject).to contain_exactly(*assets)
+ end
+ end
end