activerecord-virgodb-adapter 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0390e08c3ff3f57f95bce4609600461132e9af55122f1d9be076bd59171bc37d'
-  data.tar.gz: 216fb2576dd924f68d9e0e635824a825b0bc6863db6f3694438943343a630df3
+  metadata.gz: b21e3613bde955c3741ba92692bb2465036783609e4d11f9540ce0283ea83732
+  data.tar.gz: 34b1d14f797d629a6f09c029d422803353df2d86cb8c0682883bbb90d56fde18
 SHA512:
-  metadata.gz: d3bfd3b9cdad22f0385a1f9d13a84483aa26c89cc3c16f38d231f8c8885b2af9a1beac0ef7d53ee6237b87092c074026fab6370fab4b605230342a81a8c574b5
-  data.tar.gz: 52c0f3df23b6a21a97a6322f58d59aa2c75511c998a21ce4e3eb54d8049f674c97d1b61061f377fcd1e028832669b7573033d2a6409804ffc241749cf91492bf
+  metadata.gz: cbafb03b4df28cc059ed39deffd6504916232cb545b4ae2c7bce66e55121837e90cb3a76c8ecc6fd074277665abd6c438042ecce57530a5960b0fc6391a2d314
+  data.tar.gz: 79aae8c9a8cbcc419ac83295f371d24122cfddf291d5974c473d23cbafa512b3a177109197b86f090c349af594eb1533d47bea3e2bd84e7a2a28fe835d08c02a

data/lib/active_record/tasks/virgodb_database_tasks.rb

@@ -74,6 +74,7 @@ module ActiveRecord
         super
         strip_null_autoindex_blank_lines!(filename)
         reformat_create_table_statements!(filename)
+        separate_create_table_statements_with_blank_lines!(filename)
         annotate_physical_layout!(filename)
         dump_schema_versions!(filename)
       end
@@ -133,32 +134,45 @@ module ActiveRecord
       # history here isn't a correctness requirement. It also isn't a
       # readability win: each version's `columns` re-lists every column from
       # scratch, so N migrations means N near-duplicate JSON blobs, longer
-      # every time. The version count/dates are still worth one line for
-      # orientation -- the full column list per version isn't; the
-      # migration files themselves (db/migrate_virgodb_*/*.rb, timestamped,
-      # under git blame) are already the authoritative "what changed when"
-      # record. `register_schema_version`'s additive-only check is
-      # unaffected: it only ever compares a new migration's proposed columns
-      # against the CURRENT version, which is exactly what's still dumped.
+      # every time. The migration files themselves (db/migrate_virgodb_*/*.rb,
+      # timestamped, under git blame) are already the authoritative "what
+      # changed when" record. `register_schema_version`'s additive-only check
+      # is unaffected: it only ever compares a new migration's proposed
+      # columns against the CURRENT version, which is exactly what's still
+      # dumped.
+      #
+      # `applied_at` is dumped as a fixed `0`, and no per-version history
+      # comment is written -- both used to carry real wall-clock data
+      # (`Time.now.to_i` at migration time), which made this file diff on
+      # every clean rebuild (`db:drop` + `db:migrate`) even when the actual
+      # schema hadn't changed at all. Confirmed nothing reads either back:
+      # `current_schema_version` only ever selects `version, columns` (see
+      # above), and this adapter's own `assert_additive!`/
+      # `record_added_column!` only ever read `columns` too. The live
+      # manifest's real `schema_versions` table is untouched by this --
+      # `applied_at` still gets a real timestamp there at migration time,
+      # useful for a human inspecting the live table directly. This only
+      # changes what a fresh `structure_load` seeds into a NEW database,
+      # where a wall-clock value was never reproducible enough to belong in
+      # a checked-in file meant to represent "current schema shape," not
+      # "when someone last regenerated this file."
       def dump_schema_versions!(filename)
         return unless connection.data_source_exists?("schema_versions")
 
-        rows = connection.select_all("SELECT id, table_name, version, columns, applied_at FROM schema_versions ORDER BY table_name, version")
+        rows = connection.select_all("SELECT id, table_name, version, columns FROM schema_versions ORDER BY table_name, version")
         return if rows.to_a.empty?
 
         File.open(filename, "a") do |f|
           f.puts
           rows.to_a.group_by { |r| r["table_name"] }.each do |table_name, versions|
             latest = versions.max_by { |r| r["version"] }
-            history = versions.map { |r| "v#{r['version']} (#{Time.at(r['applied_at'].to_i).utc.strftime('%Y-%m-%d')})" }.join(", ")
 
-            f.puts "-- #{table_name} schema history: #{history} -- only the current version is dumped below; see db/migrate_virgodb_*/ for the rest"
             pretty_columns = JSON.pretty_generate(JSON.parse(latest["columns"]))
             f.puts(
               "INSERT INTO \"schema_versions\" (id, table_name, version, columns, applied_at) VALUES (\n" \
               "  #{latest['id']}, #{connection.quote(table_name)}, #{latest['version']},\n" \
               "  #{connection.quote(pretty_columns)},\n" \
-              "  #{latest['applied_at']}\n" \
+              "  0\n" \
               ");"
             )
             f.puts
@@ -198,7 +212,7 @@ module ActiveRecord
       # `SQLiteDatabaseTasks#structure_dump`'s `ignore_tables`-triggered
       # fallback (used whenever `ActiveRecord::SchemaDumper.ignore_tables` is
       # non-empty, e.g. excluding tables owned by a separate replication/
-      # backup mechanism -- exactly hintpot's own litestream initializer)
+      # backup mechanism -- exactly a host app's own Litestream initializer)
       # runs `SELECT sql || ';' FROM sqlite_master WHERE tbl_name NOT IN
       # (...) ORDER BY tbl_name, type DESC, name` through the `sqlite3` CLI.
       # Any table with a non-INTEGER (so non-rowid-alias) PRIMARY KEY --
@@ -217,11 +231,11 @@ module ActiveRecord
       # `ignore_tables` is empty) already skips these rows itself --
       # confirmed empirically too -- so this is purely a gap in the
       # raw-SQL fallback, not something either path does on purpose.
-      # Stripping now, before `reformat_create_table_statements!` touches
-      # anything, means later steps never have to reason about which blank
-      # lines are "real" -- there aren't any yet at this point in the
-      # pipeline (`dump_schema_versions!`'s own deliberate ones are added
-      # after this runs).
+      # Stripping now, before `reformat_create_table_statements!` and
+      # `separate_create_table_statements_with_blank_lines!` (below) touch
+      # anything, gives those steps a clean slate -- every blank line in the
+      # dump from this point on is one THEY deliberately added, not this
+      # accidental one.
       def strip_null_autoindex_blank_lines!(filename)
         content = File.read(filename)
         content.gsub!(/\n\n+/, "\n")
@@ -268,6 +282,29 @@ module ActiveRecord
         File.write(filename, content)
       end
 
+      # Matches `db/clickhouse_structure.sql` and `db/schema.rb`'s own
+      # convention (both, unprompted, separate every top-level table
+      # definition with a blank line -- confirmed directly against a real
+      # host app's dumps of each, not assumed) rather than inventing a
+      # new one here. Only CREATE TABLE gets a leading blank line, not
+      # CREATE INDEX/CREATE UNIQUE INDEX -- those stay glued directly under
+      # their own table, same as clickhouse_structure.sql has no equivalent
+      # to disagree with and virgodb's own tables (e.g. `inline_batches` +
+      # `idx_inline_batches_table_name`) already read naturally that way.
+      # Runs after `reformat_create_table_statements!` (so every `CREATE
+      # TABLE` is unambiguously alone at the start of its own line already,
+      # nothing left to normalize first) but before
+      # `annotate_physical_layout!` (so a table WITH a physical-layout
+      # comment gets the blank line ahead of the comment block, not
+      # wedged between the comment and its own `CREATE TABLE`).
+      # `(?<!\A)` skips the very first statement in the file, which should
+      # start right at the top with no leading blank line.
+      def separate_create_table_statements_with_blank_lines!(filename)
+        content = File.read(filename)
+        content.gsub!(/(?<!\A)^CREATE TABLE /) { |match| "\n#{match}" }
+        File.write(filename, content)
+      end
+
       # Splits a CREATE TABLE column list on commas that are NOT nested
       # inside a type's own parens (e.g. `Decimal(18,2)`) -- a plain
       # `String#split(",")` would wrongly cut `Decimal(18` and `2)` apart.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virgodb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - virgodb