litestream 0.7.2-arm64-darwin → 0.9.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfffc3c0f402bd96f43fc2801edb03957712ca9c3fe25faf4de6900ad4aa49e
-  data.tar.gz: b7515d580f591dbc4dca09c7344af9c84d2278aba72345c8567d8df14e0f9395
+  metadata.gz: 7ae7ada05f79c43a91fe4dab24d78e0f540594f149b81c158ae8c9de9a5e0102
+  data.tar.gz: 3663ac9db5970fdcd0c6ca4061107bb4617470c8a9eae92dd081fd2976a01305
 SHA512:
-  metadata.gz: 4f6b6a8405c4211c66f69071e98d53d1bb5d950d59ab3e2184b94c2cb9bf8c7de4f0a67a6b7680943d6622983f6e479f127fa7dbc0a2c86aec445fe12276d4f7
-  data.tar.gz: 9b361ace1eb8326a7b1373ba0960b120a3e429f8e0bd9ae60bddcde6ddfdc22d49d8a9d53fbd1b05eaec3df684e2fc521c17b4c7025219ff6e4291b802de3fb4
+  metadata.gz: e2288c916563650e6ce7fc341b60782811bffa01f25fb7c9b1c77b7b4d777cacacd76c0db62ffd5f2e1a09535449f22dfd785d9e36a0dc1198eed2a4008dfd5b
+  data.tar.gz: ae1e4efb3bf1e6d0a7bc6d5a0bf181c1f542aabaec5ce585988701e4de1b71c78e55422a59405b24e35720a920b90e8005b033733d6646b47cb643d5e05bf5ca

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: arm64-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