litestream 0.7.2-x86_64-darwin → 0.9.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e42df5e3a4192b9b1aaf2ad78d934419c6db0a5e687a7b60da72e6e162223cb
-  data.tar.gz: a7710f8160f888305e2fb8ebbef2dbbd15136d04f057d5f1f01833e770cd3f7f
+  metadata.gz: bc937c14c8cdbc08db031431903637338b95fed9cee32fcffa945da97bcc5927
+  data.tar.gz: 8b305efd28e72ef7316fc53e790ca10ef29cc317d74fd72474ed4007a0469936
 SHA512:
-  metadata.gz: 633fe0f89a2a187cb1a07646ce7bced92f9024e93d0ae616741a7ce66d507f4915a8d9593be213bd399c22a24001ee66745126bed723fd7c376f2960f1f29755
-  data.tar.gz: f3661e0473a3c1dea76f3f57fb5d96d39dc4e45c5e34ad291b7720913858d9137acae1209e8632caea73b9b443c796e3b7c57a008d295cf152c35a40310e1c76
+  metadata.gz: 672231f8716e812ee516d13cfab97386001cd9084f2aa03418d1f17838bbaaa8442e6ccc4ddf3c3edd654743e2f2f11b8f72b5d887f79060d405ac03d2de9832
+  data.tar.gz: e19b81794bfc2fae07aff2bc1b6c9084a10bd309fda38f2a1f8340791262475fd4d0a5171bd067322a4342c31bb69fcfbf8eea9fd27ec497b76b37dd3bf746ad

data/lib/litestream/commands.rb

@@ -102,16 +102,29 @@ module Litestream
         }.merge(argv)
         restore(database, async: false, **args)
 
-        restored_tables_count = `sqlite3 #{backup} "select count(*) from sqlite_schema where type='table';"`.chomp.to_i
-        restored_size = File.size(backup)
-        original_tables_count = `sqlite3 #{database} "select count(*) from sqlite_schema where type='table';"`.chomp.to_i
-        original_size = File.size(database)
+        restored_schema = `sqlite3 #{backup} "select name, type from sqlite_schema;"`.chomp.split("\n")
+        restored_data = restored_schema.map { _1.split("|") }.group_by(&:last)
+        restored_rows_count = restored_data["table"]&.sum { |tbl, _| `sqlite3 #{backup} "select count(*) from #{tbl};"`.chomp.to_i }
+
+        original_schema = `sqlite3 #{database} "select name, type from sqlite_schema;"`.chomp.split("\n")
+        original_data = original_schema.map { _1.split("|") }.group_by(&:last)
+        original_rows_count = original_data["table"]&.sum { |tbl, _| `sqlite3 #{database} "select count(*) from #{tbl};"`.chomp.to_i }
 
         Dir.glob(backup + "*").each { |file| File.delete(file) }
 
         {
-          "size" => {"original" => original_size, "restored" => restored_size},
-          "tables" => {"original" => original_tables_count, "restored" => restored_tables_count}
+          "original" => {
+            "path" => database,
+            "tables" => original_data["table"]&.size,
+            "indexes" => original_data["index"]&.size,
+            "rows" => original_rows_count
+          },
+          "restored" => {
+            "path" => backup,
+            "tables" => restored_data["table"]&.size,
+            "indexes" => restored_data["index"]&.size,
+            "rows" => restored_rows_count
+          }
         }
       end
 

data/lib/litestream/version.rb

@@ -1,3 +1,3 @@
 module Litestream
-  VERSION = "0.7.2"
+  VERSION = "0.9.0"
 end

data/lib/tasks/litestream_tasks.rake

@@ -93,18 +93,53 @@ namespace :litestream do
     options.symbolize_keys!
 
     result = Litestream::Commands.verify(database, async: true, **options)
-
-    puts <<~TXT if result
-
-      size
-        original          #{result["size"]["original"]}
-        restored          #{result["size"]["restored"]}
-        delta             #{result["size"]["original"] - result["size"]["restored"]}
-
-      tables
-        original          #{result["tables"]["original"]}
-        restored          #{result["tables"]["restored"]}
-        delta             #{result["tables"]["original"] - result["tables"]["restored"]}
-    TXT
+    original_tables = result["original"]["tables"]
+    restored_tables = result["restored"]["tables"]
+    original_indexes = result["original"]["indexes"]
+    restored_indexes = result["restored"]["indexes"]
+    original_rows = result["original"]["rows"]
+    restored_rows = result["restored"]["rows"]
+
+    same_number_of_tables = original_tables == restored_tables
+    same_number_of_indexes = original_indexes == restored_indexes
+    same_number_of_rows = original_rows == restored_rows
+
+    if same_number_of_tables && same_number_of_indexes && same_number_of_rows
+      puts "Backup for `#{database}` verified as consistent!\n" + [
+        "  tables   #{original_tables}",
+        "  indexes  #{original_indexes}",
+        "  rows     #{original_rows}"
+      ].compact.join("\n")
+    else
+      abort "Verification failed for #{database}:\n" + [
+        (unless same_number_of_tables
+           if original_tables > restored_tables
+             diff = original_tables - restored_tables
+             "  Backup is missing #{diff} table#{"s" if diff > 1}"
+           else
+             diff = restored_tables - original_tables
+             "  Backup has extra #{diff} table#{"s" if diff > 1}"
+           end
+         end),
+        (unless same_number_of_indexes
+           if original_indexes > restored_indexes
+             diff = original_indexes - restored_indexes
+             "  Backup is missing #{diff} index#{"es" if diff > 1}"
+           else
+             diff = restored_indexes - original_indexes
+             "  Backup has extra #{diff} index#{"es" if diff > 1}"
+           end
+         end),
+        (unless same_number_of_rows
+           if original_rows > restored_rows
+             diff = original_rows - restored_rows
+             "  Backup is missing #{diff} row#{"s" if diff > 1}"
+           else
+             diff = restored_rows - original_rows
+             "  Backup has extra #{diff} row#{"s" if diff > 1}"
+           end
+         end)
+      ].compact.join("\n")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litestream
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.9.0
 platform: x86_64-darwin
 authors:
 - Stephen Margheim
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logfmt