activerecord-virgodb-adapter 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0390e08c3ff3f57f95bce4609600461132e9af55122f1d9be076bd59171bc37d'
-  data.tar.gz: 216fb2576dd924f68d9e0e635824a825b0bc6863db6f3694438943343a630df3
+  metadata.gz: d70a70ab0e46de3acd4d283c69e7c385873c7bb9ec817423f62ff09dbc601350
+  data.tar.gz: 1f7b6259306a3d61f2e3d05fb345373a5d350b2742309804be1d91ac096886a1
 SHA512:
-  metadata.gz: d3bfd3b9cdad22f0385a1f9d13a84483aa26c89cc3c16f38d231f8c8885b2af9a1beac0ef7d53ee6237b87092c074026fab6370fab4b605230342a81a8c574b5
-  data.tar.gz: 52c0f3df23b6a21a97a6322f58d59aa2c75511c998a21ce4e3eb54d8049f674c97d1b61061f377fcd1e028832669b7573033d2a6409804ffc241749cf91492bf
+  metadata.gz: 64c5716aa1f9d1ea110aacd562ad131acb5d8d76bbd4e8d0ed459a2191530d7b27c6c1f924b59a70840defed6f285c668e6fc9a56f97b134719bd2033ed42b6f
+  data.tar.gz: 9f2de20a524c86e2bafc0a43b6f49b8d86bdf127a54b8a5276972f75b10e937c5c7fe3b89b88172eaca32b4aaee09aa0aa52a34f947c614dc3926c3d1878f82e

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
@@ -217,11 +218,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 +269,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
+      # hintpot's real 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.7
 platform: ruby
 authors:
 - virgodb