active_storage_db 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a465e1b93b8ab6436f800b2a0ff6e38f049fae621587924d9b2299f3fa06946
-  data.tar.gz: 78583f7c6aa00b0a8c7ab1d98f05d4d34e8ff8a1846f0ed70a0c3e16e97275c7
+  metadata.gz: 5455342b089699d34e3f5e4386465431a93258ab9fa6610c8ba91b7c2c2f53f4
+  data.tar.gz: 86790589793eb8d0f6f5f4e781a3f5a161282d6a4f9409936a0ce0b5378ff243
 SHA512:
-  metadata.gz: 76ef220615b3e3704a99803a8bbe3af211855278d3532a97bbc9f325a5455ff393dde657180368d10bdecce8592afe99a41be7f6fe28e325d3671fa3b414087a
-  data.tar.gz: c555f306068194447e708c743abdc829f8043728585da32bbf504d689571d38a72725dbe97382665bd20fdaa95848b48ee018d45ab5d22692c1736ad9bcc59cb
+  metadata.gz: 2cc59ba9f5dd3510810412b6173b56b6e40f1a43570d1976a07c769c01a5f015d23c779f6ecde67e1d7e8471c4fa39a8dbc848c6ee943a24fc4f88c91d7017c3
+  data.tar.gz: 792e00cf27b413d645475dd500425b7e77b8ce96e82e32e4b5c474c025916dcc5b5593edf2fe13e1db8656ab429b9a60ed8ce6a1e78608af4392ee232a2423b0

data/README.md

@@ -8,7 +8,7 @@
 [![specs Postgres](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_postgres_71.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_postgres_71.yml)
 [![specs MySQL](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_mysql_71.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_mysql_71.yml)
 
-An Active Storage service upload/download plugin that stores files in a PostgreSQL or MySQL database.
+An Active Storage service upload/download plugin that stores files in a PostgreSQL or MySQL database. Experimental support also for MSSQL.
 
 Main features:
 - attachment data stored in a binary field (or blob);

data/lib/active_storage/service/db_service.rb

@@ -8,6 +8,7 @@ module ActiveStorage
   # Wraps a DB table as an Active Storage service. See ActiveStorage::Service
   # for the generic API documentation that applies to all services.
   class Service::DBService < Service
+    # :nocov:
     if Rails::VERSION::MAJOR >= 7
       include ActiveStorage::DBServiceRails70
     elsif Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR == 1
@@ -15,6 +16,7 @@ module ActiveStorage
     else
       include ActiveStorage::DBServiceRails60
     end
+    # :nocov:
 
     def initialize(public: false, **)
       @chunk_size = ENV.fetch('ASDB_CHUNK_SIZE') { 1.megabytes }
@@ -43,7 +45,10 @@ module ActiveStorage
 
     def download_chunk(key, range)
       instrument :download_chunk, key: key, range: range do
-        record = object_for(key, fields: "SUBSTRING(data FROM #{range.begin + 1} FOR #{range.size}) AS chunk")
+        from = range.begin + 1
+        size = range.size
+        args = adapter_sqlserver? ? "data, #{from}, #{size}" : "data FROM #{from} FOR #{size}"
+        record = object_for(key, fields: "SUBSTRING(#{args}) AS chunk")
         raise(ActiveStorage::FileNotFoundError) unless record
 
         record.chunk
@@ -97,6 +102,10 @@ module ActiveStorage
 
     private
 
+    def adapter_sqlserver?
+      @adapter_sqlserver ||= ActiveStorageDB::File.connection.adapter_name == 'SQLServer'
+    end
+
     def generate_url(key, expires_in:, filename:, content_type:, disposition:)
       content_disposition = content_disposition_with(type: disposition, filename: filename)
       verified_key_with_expiration = ActiveStorage.verifier.generate(
@@ -142,7 +151,8 @@ module ActiveStorage
     end
 
     def stream(key)
-      size = object_for(key, fields: 'OCTET_LENGTH(data) AS size')&.size || raise(ActiveStorage::FileNotFoundError)
+      data_size = adapter_sqlserver? ? 'DATALENGTH(data)' : 'OCTET_LENGTH(data)'
+      size = object_for(key, fields: "#{data_size} AS size")&.size || raise(ActiveStorage::FileNotFoundError)
       (size / @chunk_size.to_f).ceil.times.each do |i|
         range = (i * @chunk_size..((i + 1) * @chunk_size) - 1)
         yield download_chunk(key, range)

data/lib/active_storage/service/db_service_rails70.rb

@@ -19,8 +19,7 @@ module ActiveStorage
 
     def current_host
       opts = url_options || {}
-      url = "#{opts[:protocol]}#{opts[:host]}"
-      url + ":#{opts[:port]}" if opts[:port]
+      opts[:port] ? "#{opts[:protocol]}#{opts[:host]}:#{opts[:port]}" : "#{opts[:protocol]}#{opts[:host]}"
     end
 
     def private_url(key, expires_in:, filename:, content_type:, disposition:, **)

data/lib/active_storage_db/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageDB
-  VERSION = '1.2.0'
+  VERSION = '1.3.1'
 end

data/lib/tasks/active_storage_db_tasks.rake

@@ -19,12 +19,12 @@ end
 namespace :asdb do
   desc 'ActiveStorageDB: list attachments ordered by blob id desc'
   task list: [:environment] do |_t, _args|
-    query = ::ActiveStorage::Blob.order(id: :desc).limit(100)
+    query = ActiveStorage::Blob.order(id: :desc).limit(100)
     digits = query.ids.inject(0) { |ret, id| size = id.to_s.size; [size, ret].max }
 
-    ::ActiveStorage::Tasks.print_blob_header(digits: digits)
+    ActiveStorage::Tasks.print_blob_header(digits: digits)
     query.each do |blob|
-      ::ActiveStorage::Tasks.print_blob(blob, digits: digits)
+      ActiveStorage::Tasks.print_blob(blob, digits: digits)
     end
   end
 
@@ -34,7 +34,7 @@ namespace :asdb do
     destination = args[:destination]&.strip || Dir.pwd
     abort('Required arguments: source blob id, destination path') if blob_id.blank? || destination.blank?
 
-    blob = ::ActiveStorage::Blob.find_by(id: blob_id)
+    blob = ActiveStorage::Blob.find_by(id: blob_id)
     abort('Source file not found') unless blob
 
     destination = "#{destination}/#{blob.filename}" if Dir.exist?(destination)
@@ -50,12 +50,12 @@ namespace :asdb do
     filename = args[:filename]&.strip
     abort('Required arguments: filename') if filename.blank?
 
-    blobs = ::ActiveStorage::Blob.where('filename LIKE ?', "%#{filename}%").order(id: :desc)
+    blobs = ActiveStorage::Blob.where('filename LIKE ?', "%#{filename}%").order(id: :desc)
     if blobs.any?
       digits = blobs.ids.inject(0) { |ret, id| size = id.to_s.size; [size, ret].max }
-      ::ActiveStorage::Tasks.print_blob_header(digits: digits)
+      ActiveStorage::Tasks.print_blob_header(digits: digits)
       blobs.each do |blob|
-        ::ActiveStorage::Tasks.print_blob(blob, digits: digits)
+        ActiveStorage::Tasks.print_blob(blob, digits: digits)
       end
     else
       puts 'No results'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_db
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2024-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage