activerecord-beagle-turso 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4bdeec9d75fe6297e7f42aba4ab966b31407731a5992de2af9a214483c53c7
-  data.tar.gz: bc8dcf3930ec2eb8104712b5f910b38118cd75ae0840d0d98bcb9a145d958f21
+  metadata.gz: 954e05b945781cc01a630306c4cb5d9368ef5dcc54876269229afed57f3a56d1
+  data.tar.gz: e512726ed37adeeee5ce7fe6268d3ecda615c079a4b041cca7a1677cce9d55fd
 SHA512:
-  metadata.gz: 7b31dbac6656267e980d1fc85b7c8ce805ea538564750b9f537b957ba1d6443cddee350d375730a64a83c8444b35fe76df90952fd76f11661494f07ae0ea5683
-  data.tar.gz: 0e77f74a3dca74225fd169e4556b6b948ae42c2702b555e19c3e034cf1301da3267428b04198eefad73da422037de6574d61ee46ca77d06541a026eccb5ff60e
+  metadata.gz: e48728f8d4c61291db44090aab87067f31b76ef0503db34cdfcab18cb66e4d204a35b2ab7cdc3d6114ce555a49b347fdf88cc6406f5a08acb6cbc43e97d748e8
+  data.tar.gz: 70b9fb0e606a6e8e844a737d250016b800fdf21eb47e29ab3ead567821a5250ba95ff90a2e3dbaeb9283e1673624b3a8d31ed506bb0ce9e4217e5d5751e24965

data/lib/active_record/connection_adapters/beagle_turso_adapter.rb

@@ -223,6 +223,65 @@ module ActiveRecord
           "#{super} AND name NOT LIKE '\\_\\_turso\\_internal\\_%' ESCAPE '\\'"
         end
 
+        # A column definition in the DDL that carries a parenthesised type
+        # argument: `"price" decimal (10, 2) NOT NULL`, `a varchar (50)`. The
+        # name may be bare or quoted with ", ` or []; the type may be several
+        # words ("double precision"); the argument is one or two integers.
+        DECLARED_TYPE_REGEX = /
+          \A\s*
+          (?:"(?<name>[^"]*)" | `(?<name>[^`]*)` | \[(?<name>[^\]]*)\] | (?<name>\w+))
+          \s+
+          (?<type>[A-Za-z_][A-Za-z0-9_\ ]*?)
+          \s*\(\s*(?<args>\d+\s*(?:,\s*\d+)?)\s*\)
+        /x
+        private_constant :DECLARED_TYPE_REGEX
+
+        # Restore type arguments that beagle_turso's `PRAGMA table_info` drops.
+        #
+        # turso reports a column's declared type as the bare type name: a
+        # `decimal(10,2)` column comes back as `decimal`, `varchar(50)` as
+        # `varchar`, `datetime(6)` as `datetime`. Rails derives precision,
+        # scale and limit by parsing exactly that string, so all three silently
+        # become nil. Real SQLite returns the full declared type here, and the
+        # information is not lost on disk -- the CREATE TABLE in sqlite_master
+        # still says `decimal (10, 2)` -- so recover it from there.
+        #
+        # Left alone this is worse than cosmetic schema.rb churn: a dump emits
+        # `t.decimal "price"` with no precision/scale, and loading that dump
+        # builds a column whose values are no longer rounded to 2 decimal
+        # places. `super` already splits the DDL into per-column strings to
+        # recover COLLATE, AUTOINCREMENT and GENERATED ALWAYS AS for the same
+        # reason; this is the same trick for the type itself.
+        #
+        # Only fills in a missing argument -- a type that already arrived with
+        # one is left untouched, so this becomes an automatic no-op if turso
+        # starts reporting declared types in full.
+        def table_structure_with_collation(table_name, basic_structure)
+          columns = super
+          return columns unless columns.any? { |column| !column["type"].to_s.include?("(") }
+
+          declared = declared_column_types(table_name, columns.filter_map { |c| c["name"] })
+          return columns if declared.empty?
+
+          columns.each do |column|
+            next if column["type"].to_s.include?("(")
+
+            full_type = declared[column["name"]]
+            column["type"] = full_type if full_type
+          end
+        end
+
+        # Maps column name -> declared type with its argument normalised back
+        # to Rails' own spelling (`decimal (10, 2)` -> `decimal(10,2)`), which
+        # is what Rails' precision/scale/limit extraction expects to see.
+        def declared_column_types(table_name, column_names)
+          table_structure_sql(table_name, column_names).each_with_object({}) do |column_string, declared|
+            next unless (match = DECLARED_TYPE_REGEX.match(column_string))
+
+            declared[match[:name]] = "#{match[:type]}(#{match[:args].gsub(/\s+/, '')})"
+          end
+        end
+
         # The single seam. AbstractAdapter#raw_execute funnels every statement
         # here and expects an ActiveRecord::Result back, with the notification
         # payload's affected_rows/row_count filled in. cast_result (inherited)

data/lib/activerecord/beagle_turso/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module BeagleTurso
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-beagle-turso
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - BeagleSoftwareUK