Fix unscheduling backups for some config var configurations

lib/heroku/command/pg_backups.rb

@@ -513,12 +513,15 @@ def unschedule_backups
     db = shift_argument
     validate_arguments!
 
+    if db.nil?
+      abort("Must specify database to unschedule backups for")
+    end
+
     attachment = generate_resolver.resolve(db, "DATABASE_URL")
 
     schedule = hpg_client(attachment).schedules.find do |s|
-      # attachment.name is HEROKU_POSTGRESQL_COLOR
       # s[:name] is HEROKU_POSTGRESQL_COLOR_URL
-      s[:name] =~ /#{attachment.name}/ || attachment.name =~ /#{s[:name]}/
+      s[:name] =~ /#{db}/i
     end
 
     if schedule.nil?

spec/heroku/command/pg_backups_spec.rb

@@ -122,6 +122,40 @@ module Heroku::Command
       end
     end
 
+    describe "heroku pg:backups unschedule" do
+      let(:schedules) do
+        [ { name: 'HEROKU_POSTGRESQL_GREEN_URL',
+            uuid: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+          { name: 'DATABASE_URL',
+            uuid: 'ffffffff-ffff-ffff-ffff-fffffffffffe' } ]
+      end
+
+      before do
+        stub_pg.schedules.returns(schedules)
+        allow_any_instance_of(Heroku::Helpers::HerokuPostgresql::Resolver)
+          .to receive(:app_attachments).and_return(example_attachments)
+      end
+
+      it "unschedules the specified backup" do
+        stub_pg.unschedule
+        stderr, stdout = execute("pg:backups unschedule green --confirm example")
+        expect(stderr).to be_empty
+        expect(stdout).to match(/Stopped automatic daily backups for/)
+      end
+
+      it "complains when called without an argument" do
+        stderr, stdout = execute("pg:backups unschedule --confirm example")
+        expect(stderr).to match(/Must specify database to unschedule/)
+        expect(stdout).to be_empty
+      end
+
+      it "indicates when no matching backup can be unscheduled" do
+        stderr, stdout = execute("pg:backups unschedule red --confirm example")
+        expect(stderr).to be_empty
+        expect(stdout).to match(/No automatic daily backups for/)
+      end
+    end
+
     describe "heroku pg:backups" do
       let(:logged_at)  { Time.now }
       let(:started_at)  { Time.now }