Unlock the pg gem since 1.4.1 was released

[jrafanie]

1.4.0 led to ged/ruby-pg#466
and was fixed in ged/ruby-pg#467

Since 1.4.1 is now released and fixes the issue, we can safely unlock pg except
for version 1.4.0.

[Fryguy]

I would prefer

Suggested change

	gem "pg", "!= 1.4.0", :require => false # 1.4.0 caused https://github.com/ged/ruby-pg/issues/466
	gem "pg", ">= 1.4.1", :require => false

otherwise the resolver could pick a lower version.

[Fryguy]

and yes, I see that the original code before the lockdown had it unversioned, but that was wrong IMO...we don't want it to suddenly resolve to 1.3.4, for example, for whatever reason

[jrafanie]

haha, now you're making me look up the changelog.

Do we want to backport this so other branches never install 1.4.0? It shouldn't happen but they could pull 1.4.1 at any time.

If we want to backport, I would say ">= 1.3", "!= 1.4.0" is probably best as 1.3.0 drops ruby 2.4 and below. See: https://github.com/ged/ruby-pg/blob/252512608a814de16bbad55911f9bbcef0e73cb9/History.rdoc#v130-2022-01-20-michael-granger-gedfaeriemudorg-

For master, I'm fine with >= 1.4.1 going forward

[Fryguy]

If we want to backport, I would say ">= 1.3", "!= 1.4.0" is probably best as 1.3.0 drops ruby 2.4 and below. See: https://github.com/ged/ruby-pg/blob/252512608a814de16bbad55911f9bbcef0e73cb9/History.rdoc#v130-2022-01-20-michael-granger-gedfaeriemudorg-

For master, I'm fine with >= 1.4.1 going forward

Yeah I'm good with that - we should definitely backport something so we don't accidentally unlock to a "bad" version.

[jrafanie]

Cool, I'll update this PR to do ">= 1.3", "!= 1.4.0" first for backport. I'll then do ">= 1.4.1" on master as a followup.

[jrafanie]

Ok, added backport request for this PR for najdorf. I've opened #21956 to be reviewed merged after this one is done.

[miq-bot]

Checked commits jrafanie/manageiq@7682c35~...18fa876 with ruby 2.6.9, rubocop 1.19.1, haml-lint 0.35.0, and yamllint
1 file checked, 0 offenses detected
Everything looks fine. 👍

[Fryguy]

@jrafanie A conflict occurred during the backport of this pull request to najdorf.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the najdorf branch in order to resolve this.

Conflict details:

diff --cc Gemfile
index 6a59153ce3,1348027710..0000000000
--- a/Gemfile
+++ b/Gemfile
@@@ -60,7 -59,7 +60,11 @@@ gem "net-ldap"
  gem "net-ping",                         "~>1.7.4",           :require => false
  gem "openscap",                         "~>0.4.8",           :require => false
  gem "optimist",                         "~>3.0",             :require => false
++<<<<<<< HEAD
 +gem "pg",                                                    :require => false
++=======
+ gem "pg",                               ">=1.3", "!= 1.4.0", :require => false # 1.4.0 caused https://github.com/ged/ruby-pg/issues/466
++>>>>>>> f0fcf7e4da (Merge pull request #21953 from jrafanie/unlock_pg_gem_since_1_4_1_released)
  gem "pg-dsn_parser",                    "~>0.1.0",           :require => false
  gem "query_relation",                   "~>0.1.0",           :require => false
  gem "rack",                             ">=2.2.3.1",         :require => false

[Fryguy]

I'll take care of this one manually

[Fryguy]

najdorf backport details:

commit 122935f57ee67f9339a99d0706b76f0463eb7ef0 (HEAD -> najdorf, upstream/najdorf)
Author: Jason Frey <fryguy9@gmail.com>
Date:   Thu Jun 30 15:29:28 2022 -0400

    Update Gemfile.lock.release for pg gem restriction

────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
modified: Gemfile.lock.release
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
@ Gemfile.lock.release:1227 @ DEPENDENCIES
   net-ping (~> 1.7.4)
   openscap (~> 0.4.8)
   optimist (~> 3.0)
-  pg
+  pg (>= 1.3, != 1.4.0)
   pg-dsn_parser (~> 0.1.0)
   pg-logical_replication (~> 1.2)
   puma (~> 4.2)

commit 893dfaf39034d6a9d03a4c086d62fec9a668ae05
Author: Jason Frey <fryguy9@gmail.com>
Date:   Fri Jun 24 17:19:51 2022 -0400

    Merge pull request #21953 from jrafanie/unlock_pg_gem_since_1_4_1_released

    Unlock the pg gem since 1.4.1 was released

    (cherry picked from commit f0fcf7e4da60c16615276cd19cf12e9ecadb94f1)

────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
modified: Gemfile
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
@ Gemfile:63 @ def manageiq_plugin(plugin_name)
 gem "net-ping",                         "~>1.7.4",           :require => false
 gem "openscap",                         "~>0.4.8",           :require => false
 gem "optimist",                         "~>3.0",             :require => false
-gem "pg",                                                    :require => false
+gem "pg",                               ">=1.3", "!= 1.4.0", :require => false # 1.4.0 caused https://github.com/ged/ruby-pg/issues/466
 gem "pg-dsn_parser",                    "~>0.1.0",           :require => false
 gem "query_relation",                   "~>0.1.0",           :require => false
 gem "rack",                             ">=2.2.3.1",         :require => false