Skip to content

Commit e2d4ae3

Browse files
datlechindatlechin
committed
fix(datagrid): drop stale xcstrings/xcscheme churn and set explicit access on makeColumnMeta
1 parent 9225af0 commit e2d4ae3

3 files changed

Lines changed: 166 additions & 52 deletions

File tree

‎Plugins/MySQLDriverPlugin/MariaDBPluginConnection.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal let mysqlBinaryCharset: UInt32 = 63
2222

2323
private let logger = Logger(subsystem: "com.TablePro", category: "MariaDBPluginConnection")
2424

25-
func makeColumnMeta(name: String, typeName: String, flags: UInt) -> PluginColumnInfo {
25+
internal func makeColumnMeta(name: String, typeName: String, flags: UInt) -> PluginColumnInfo {
2626
PluginColumnInfo(
2727
name: name,
2828
dataType: typeName,

‎TablePro.xcodeproj/xcshareddata/xcschemes/TablePro.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "2640"
4-
version = "1.7">
4+
version = "1.8">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES"

‎TablePro/Resources/Localizable.xcstrings‎

Lines changed: 164 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,26 +1613,6 @@
16131613
}
16141614
}
16151615
},
1616-
"%d of %d" : {
1617-
"localizations" : {
1618-
"en" : {
1619-
"stringUnit" : {
1620-
"state" : "new",
1621-
"value" : "%1$d of %2$d"
1622-
}
1623-
}
1624-
}
1625-
},
1626-
"%d of %d columns visible" : {
1627-
"localizations" : {
1628-
"en" : {
1629-
"stringUnit" : {
1630-
"state" : "new",
1631-
"value" : "%1$d of %2$d columns visible"
1632-
}
1633-
}
1634-
}
1635-
},
16361616
"%d of %d rows" : {
16371617
"localizations" : {
16381618
"en" : {
@@ -3770,6 +3750,9 @@
37703750
}
37713751
}
37723752
}
3753+
},
3754+
"Access Key ID and Secret Access Key are required for AWS IAM authentication." : {
3755+
37733756
},
37743757
"Account" : {
37753758
"localizations" : {
@@ -7452,6 +7435,15 @@
74527435
}
74537436
}
74547437
}
7438+
},
7439+
"AWS IAM (Access Key)" : {
7440+
7441+
},
7442+
"AWS IAM (Profile)" : {
7443+
7444+
},
7445+
"AWS IAM (SSO)" : {
7446+
74557447
},
74567448
"AWS managed key-value/document store" : {
74577449

@@ -7483,15 +7475,6 @@
74837475
}
74847476
}
74857477
}
7486-
},
7487-
"AWS SSO Sign-In Failed" : {
7488-
7489-
},
7490-
"AWS SSO sign-in finished. Test the connection again." : {
7491-
7492-
},
7493-
"AWS SSO Sign-In Required" : {
7494-
74957478
},
74967479
"Back" : {
74977480
"localizations" : {
@@ -8465,6 +8448,12 @@
84658448
}
84668449
}
84678450
}
8451+
},
8452+
"Cannot read ~/.aws/config." : {
8453+
8454+
},
8455+
"Cannot read ~/.aws/credentials." : {
8456+
84688457
},
84698458
"Cannot save changes: connection is read-only" : {
84708459
"extractionState" : "stale",
@@ -12928,6 +12917,9 @@
1292812917
},
1292912918
"Could not decode image" : {
1293012919

12920+
},
12921+
"Could not determine an AWS region for \"%@\". Set the AWS Region field." : {
12922+
1293112923
},
1293212924
"Could not encode image" : {
1293312925

@@ -13122,6 +13114,16 @@
1312213114
},
1312313115
"Could Not Reset Sample" : {
1312413116

13117+
},
13118+
"Could not run the credential_process command for profile \"%@\": %@" : {
13119+
"localizations" : {
13120+
"en" : {
13121+
"stringUnit" : {
13122+
"state" : "new",
13123+
"value" : "Could not run the credential_process command for profile \"%1$@\": %2$@"
13124+
}
13125+
}
13126+
}
1312513127
},
1312613128
"Could not save the connection. Check disk space and permissions, then try again." : {
1312713129

@@ -17852,9 +17854,6 @@
1785217854
}
1785317855
}
1785417856
}
17855-
},
17856-
"ElastiCache IAM authentication requires TLS. Enable SSL in the connection's SSL settings." : {
17857-
1785817857
},
1785917858
"Email:" : {
1786017859
"localizations" : {
@@ -18390,9 +18389,6 @@
1839018389
}
1839118390
}
1839218391
}
18393-
},
18394-
"Enter the ElastiCache cache name (replication group ID) to use IAM authentication." : {
18395-
1839618392
},
1839718393
"Enter the passphrase for SSH key \"%@\":" : {
1839818394
"localizations" : {
@@ -20416,6 +20412,9 @@
2041620412
}
2041720413
}
2041820414
}
20415+
},
20416+
"Failed to build the SSO portal URL for profile \"%@\"." : {
20417+
2041920418
},
2042020419
"Failed to compress data" : {
2042120420
"localizations" : {
@@ -20461,6 +20460,9 @@
2046120460
}
2046220461
}
2046320462
}
20463+
},
20464+
"Failed to decode the SSO portal response for profile \"%@\"." : {
20465+
2046420466
},
2046520467
"Failed to decompress .gz file" : {
2046620468
"localizations" : {
@@ -21217,6 +21219,16 @@
2121721219
}
2121821220
}
2121921221
},
21222+
"Failed to reach the SSO portal for profile \"%@\": %@" : {
21223+
"localizations" : {
21224+
"en" : {
21225+
"stringUnit" : {
21226+
"state" : "new",
21227+
"value" : "Failed to reach the SSO portal for profile \"%1$@\": %2$@"
21228+
}
21229+
}
21230+
}
21231+
},
2122021232
"Failed to read file: %@" : {
2122121233
"localizations" : {
2122221234
"tr" : {
@@ -27838,9 +27850,6 @@
2783827850
}
2783927851
}
2784027852
}
27841-
},
27842-
"Loading more rows" : {
27843-
2784427853
},
2784527854
"Loading options..." : {
2784627855
"extractionState" : "stale",
@@ -27867,9 +27876,6 @@
2786727876
},
2786827877
"Loading options…" : {
2786927878

27870-
},
27871-
"Loading page" : {
27872-
2787327879
},
2787427880
"Loading plugins..." : {
2787527881
"extractionState" : "stale",
@@ -33797,6 +33803,9 @@
3379733803
},
3379833804
"Optional one-line description" : {
3379933805

33806+
},
33807+
"Optional, for temporary credentials" : {
33808+
3380033809
},
3380133810
"Options" : {
3380233811
"localizations" : {
@@ -36582,6 +36591,18 @@
3658236591
}
3658336592
}
3658436593
}
36594+
},
36595+
"Profile \"%@\" in ~/.aws/config is missing sso_account_id or sso_role_name." : {
36596+
36597+
},
36598+
"Profile \"%@\" in ~/.aws/config is missing sso_start_url or sso_region." : {
36599+
36600+
},
36601+
"Profile \"%@\" not found in ~/.aws/config." : {
36602+
36603+
},
36604+
"Profile \"%@\" was not found, or has no access keys or credential_process, in ~/.aws/config or ~/.aws/credentials." : {
36605+
3658536606
},
3658636607
"Profile Details" : {
3658736608

@@ -39857,6 +39878,16 @@
3985739878
}
3985839879
}
3985939880
},
39881+
"Role \"%@\" in account \"%@\" is not accessible via SSO. Check role permissions in IAM Identity Center." : {
39882+
"localizations" : {
39883+
"en" : {
39884+
"stringUnit" : {
39885+
"state" : "new",
39886+
"value" : "Role \"%1$@\" in account \"%2$@\" is not accessible via SSO. Check role permissions in IAM Identity Center."
39887+
}
39888+
}
39889+
}
39890+
},
3986039891
"root" : {
3986139892
"localizations" : {
3986239893
"tr" : {
@@ -43403,9 +43434,6 @@
4340343434
}
4340443435
}
4340543436
}
43406-
},
43407-
"Sign In" : {
43408-
4340943437
},
4341043438
"Sign in to iCloud in System Settings to enable sync." : {
4341143439
"localizations" : {
@@ -43541,9 +43569,6 @@
4354143569
}
4354243570
}
4354343571
}
43544-
},
43545-
"Signed In" : {
43546-
4354743572
},
4354843573
"Signed in as %@" : {
4354943574
"localizations" : {
@@ -45146,6 +45171,69 @@
4514645171
}
4514745172
}
4514845173
},
45174+
"SSO portal returned HTTP %lld for profile \"%@\"." : {
45175+
"localizations" : {
45176+
"en" : {
45177+
"stringUnit" : {
45178+
"state" : "new",
45179+
"value" : "SSO portal returned HTTP %1$lld for profile \"%2$@\"."
45180+
}
45181+
}
45182+
}
45183+
},
45184+
"SSO role credentials for profile \"%@\" were already expired. Run 'aws sso login --profile %@' to refresh." : {
45185+
"localizations" : {
45186+
"en" : {
45187+
"stringUnit" : {
45188+
"state" : "new",
45189+
"value" : "SSO role credentials for profile \"%1$@\" were already expired. Run 'aws sso login --profile %2$@' to refresh."
45190+
}
45191+
}
45192+
}
45193+
},
45194+
"SSO session \"%@\" in ~/.aws/config is missing sso_start_url or sso_region." : {
45195+
45196+
},
45197+
"SSO session \"%@\" referenced by profile \"%@\" was not found in ~/.aws/config." : {
45198+
"localizations" : {
45199+
"en" : {
45200+
"stringUnit" : {
45201+
"state" : "new",
45202+
"value" : "SSO session \"%1$@\" referenced by profile \"%2$@\" was not found in ~/.aws/config."
45203+
}
45204+
}
45205+
}
45206+
},
45207+
"SSO session for profile \"%@\" has expired. Run 'aws sso login --profile %@' to refresh." : {
45208+
"localizations" : {
45209+
"en" : {
45210+
"stringUnit" : {
45211+
"state" : "new",
45212+
"value" : "SSO session for profile \"%1$@\" has expired. Run 'aws sso login --profile %2$@' to refresh."
45213+
}
45214+
}
45215+
}
45216+
},
45217+
"SSO token cache for profile \"%@\" is malformed. Run 'aws sso login --profile %@' to refresh." : {
45218+
"localizations" : {
45219+
"en" : {
45220+
"stringUnit" : {
45221+
"state" : "new",
45222+
"value" : "SSO token cache for profile \"%1$@\" is malformed. Run 'aws sso login --profile %2$@' to refresh."
45223+
}
45224+
}
45225+
}
45226+
},
45227+
"SSO token cache not found for profile \"%@\". Run 'aws sso login --profile %@' first." : {
45228+
"localizations" : {
45229+
"en" : {
45230+
"stringUnit" : {
45231+
"state" : "new",
45232+
"value" : "SSO token cache not found for profile \"%1$@\". Run 'aws sso login --profile %2$@' first."
45233+
}
45234+
}
45235+
}
45236+
},
4514945237
"Starting service…" : {
4515045238
"localizations" : {
4515145239
"tr" : {
@@ -47638,6 +47726,32 @@
4763847726
}
4763947727
}
4764047728
},
47729+
"The credential_process command for profile \"%@\" did not return valid credentials JSON." : {
47730+
47731+
},
47732+
"The credential_process command for profile \"%@\" exited with status %lld.%@" : {
47733+
"localizations" : {
47734+
"en" : {
47735+
"stringUnit" : {
47736+
"state" : "new",
47737+
"value" : "The credential_process command for profile \"%1$@\" exited with status %2$lld.%3$@"
47738+
}
47739+
}
47740+
}
47741+
},
47742+
"The credential_process command for profile \"%@\" is empty or invalid." : {
47743+
47744+
},
47745+
"The credential_process command for profile \"%@\" returned unsupported Version %lld (expected 1)." : {
47746+
"localizations" : {
47747+
"en" : {
47748+
"stringUnit" : {
47749+
"state" : "new",
47750+
"value" : "The credential_process command for profile \"%1$@\" returned unsupported Version %2$lld (expected 1)."
47751+
}
47752+
}
47753+
}
47754+
},
4764147755
"The destructive query to execute" : {
4764247756

4764347757
},
@@ -47914,9 +48028,6 @@
4791448028
}
4791548029
}
4791648030
}
47917-
},
47918-
"The SSO session for profile \"%@\" has expired. Sign in with your browser?" : {
47919-
4792048031
},
4792148032
"The target database may be in a partial state. Review the database and clean up as needed." : {
4792248033
"comment" : "A message that appears when restoring a database and the user is advised to review and clean up the database.",
@@ -50552,6 +50663,9 @@
5055250663
}
5055350664
}
5055450665
}
50666+
},
50667+
"Unexpected response from the SSO portal for profile \"%@\"." : {
50668+
5055550669
},
5055650670
"Uninstall" : {
5055750671
"localizations" : {

0 commit comments

Comments
 (0)