fix(plugin-postgresql): rename versioned capabilities to avoid name collision#1243
Merged
Merged
Conversation
…Capabilities collision
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Main is broken:
PostgreSQLPluginDriverdeclares two properties namedcapabilities—PostgreSQLCapabilities(from PR #1241) andPluginCapabilities(from the protocol). The compiler can't disambiguate at the call sites inPostgreSQLPluginDriver+Columns.swift.Also fixes a stray
majorVersionreference left over from the helper that PR #1241 removed.Changes
var capabilities: PostgreSQLCapabilities→var versionedCapabilities. Updates all call sites inPostgreSQLPluginDriver.swiftandPostgreSQLPluginDriver+Columns.swift.PostgreSQLCapabilities.hasModernICUSyntax(PG 16+) and replace the danglingmajorVersioncheck inCREATE DATABASEICU locale branch withversionedCapabilities.hasModernICUSyntax.Why two properties named
capabilities?PluginCapabilitiesis anOptionSetdeclared in the plugin protocol (alterTableDDL,materializedViews, etc.). Each plugin exposes the set it supports.PostgreSQLCapabilitiesfrom #1241 is per-server-version (gates againstpg_matviews,attidentity, etc.). The two are unrelated; same name was a collision, not a design choice.versionedCapabilitiesmakes the distinction explicit.Test plan
xcodebuild build— green (was failing on main).