Page MenuHomePhabricator
Differential D4529

[keyserver] Type ConnectionOptions passed to mysql2 library
ClosedPublic
Actions

Authored by ashoat on Jul 13 2022, 4:50 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 2, 12:37 AM
Unknown Object (File)
Tue, Mar 25, 4:50 PM
Unknown Object (File)
Wed, Mar 19, 7:13 PM
Unknown Object (File)
Sun, Mar 16, 9:43 AM
Unknown Object (File)
Wed, Mar 12, 10:20 PM
Unknown Object (File)
Wed, Mar 12, 3:32 PM
Unknown Object (File)
Wed, Mar 12, 3:32 PM
Unknown Object (File)
Wed, Mar 12, 3:32 PM
View All Files
Subscribers
• abosh
• adrian

Details

Reviewers
• jon
atul
tomek
Commits
rCOMMd402dc57f2e8: [keyserver] Type ConnectionOptions passed to mysql2 library
Summary

We should type this. (We use types from the mysql library because mysql2 is meant to be a drop-in replacement, and there is no Flow libdef for mysql2.)

Depends on D4515

Test Plan

Flow

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ashoat created this revision.Jul 13 2022, 4:50 PM
Herald added subscribers: • abosh, • adrian. · View Herald TranscriptJul 13 2022, 4:50 PM
ashoat added a child revision: D4516: [keyserver] Add dbType to DBConfig.Jul 13 2022, 4:57 PM
ashoat updated this revision to Diff 14451.Jul 13 2022, 4:58 PM

Make PoolOptions and ConnectionOptions exact objects to be consistent with this runtime warning we get from mysql2:

Ignoring invalid configuration option passed to Connection: dbType. This is currently a warning, but in future versions of MySQL2, an error will be thrown if you pass an invalid configuration option to a Connection

Harbormaster completed remote builds in B10501: Diff 14449.Jul 13 2022, 5:02 PM
Harbormaster completed remote builds in B10503: Diff 14451.Jul 13 2022, 5:11 PM
ashoat requested review of this revision.Jul 13 2022, 5:11 PM
atul accepted this revision.Jul 14 2022, 9:54 AM
This revision is now accepted and ready to land.Jul 14 2022, 9:54 AM
Closed by commit rCOMMd402dc57f2e8: [keyserver] Type ConnectionOptions passed to mysql2 library (authored by ashoat). · Explain WhyJul 17 2022, 8:13 PM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMMd402dc57f2e8: [keyserver] Type ConnectionOptions passed to mysql2 library.
ashoat mentioned this in D4676: [keyserver] Avoid passing dbType to mysql2 in getMigrationConnection.Jul 28 2022, 11:21 PM
ashoat mentioned this in rCOMMa89052e0558c: [keyserver] Avoid passing dbType to mysql2 in getMigrationConnection.Jul 29 2022, 8:33 AM

Revision Contents
Changeset List

PathSize
keyserver/
flow-typed/
npm/
5 lines
src/
database/
12 lines

Diff 14546

View Options

keyserver/flow-typed/npm/mysql_v2.x.x.js

Show All 37 Linesimport {
updateWindowDimensionsActionType, updateWindowDimensionsActionType,
updateCalendarCommunityFilter, updateCalendarCommunityFilter,
clearCalendarCommunityFilter, clearCalendarCommunityFilter,
} from './action-types.js'; } from './action-types.js';
import { reduceDeviceID } from './device-id-reducer.js'; import { reduceDeviceID } from './device-id-reducer.js';
import reduceNavInfo from './nav-reducer.js'; import reduceNavInfo from './nav-reducer.js';
import { import {
reducePrimaryIdentityPublicKey, reducePrimaryIdentityPublicKey,
setPrimaryIdentityPublicKey, setPrimaryIdentityKeys,
} from './primary-identity-public-key-reducer.js'; } from './primary-identity-public-key-reducer.js';
import { getVisibility } from './visibility.js'; import { getVisibility } from './visibility.js';
import { filterThreadIDsBelongingToCommunity } from '../selectors/calendar-selectors.js'; import { filterThreadIDsBelongingToCommunity } from '../selectors/calendar-selectors.js';
import { activeThreadSelector } from '../selectors/nav-selectors.js'; import { activeThreadSelector } from '../selectors/nav-selectors.js';
import { type NavInfo } from '../types/nav-types.js'; import { type NavInfo } from '../types/nav-types.js';
export type WindowDimensions = { width: number, height: number }; export type WindowDimensions = { width: number, height: number };
Show All 39 Linesexport type Action =
| { | {
type: 'UPDATE_WINDOW_ACTIVE', type: 'UPDATE_WINDOW_ACTIVE',
payload: boolean, payload: boolean,
} }
| { | {
type: 'SET_DEVICE_ID', type: 'SET_DEVICE_ID',
payload: string, payload: string,
} }
| { +type: 'SET_PRIMARY_IDENTITY_PUBLIC_KEY', payload: ?string } | { +type: 'SET_PRIMARY_IDENTITY_KEYS', payload: ?string }
| { | {
+type: 'UPDATE_CALENDAR_COMMUNITY_FILTER', +type: 'UPDATE_CALENDAR_COMMUNITY_FILTER',
+payload: string, +payload: string,
} }
| { | {
+type: 'CLEAR_CALENDAR_COMMUNITY_FILTER', +type: 'CLEAR_CALENDAR_COMMUNITY_FILTER',
+payload: void, +payload: void,
}; };
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines (action.type === deleteAccountActionTypes.success &&
)) ))
) { ) {
return oldState; return oldState;
} }
if ( if (
action.type !== updateNavInfoActionType && action.type !== updateNavInfoActionType &&
action.type !== setDeviceIDActionType && action.type !== setDeviceIDActionType &&
action.type !== setPrimaryIdentityPublicKey action.type !== setPrimaryIdentityKeys
) { ) {
state = baseReducer(state, action).state; state = baseReducer(state, action).state;
} }
state = { state = {
...state, ...state,
navInfo: reduceNavInfo( navInfo: reduceNavInfo(
state.navInfo, state.navInfo,
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines
View Options

keyserver/src/database/database.js

Show All 37 Linesimport {
updateWindowDimensionsActionType, updateWindowDimensionsActionType,
updateCalendarCommunityFilter, updateCalendarCommunityFilter,
clearCalendarCommunityFilter, clearCalendarCommunityFilter,
} from './action-types.js'; } from './action-types.js';
import { reduceDeviceID } from './device-id-reducer.js'; import { reduceDeviceID } from './device-id-reducer.js';
import reduceNavInfo from './nav-reducer.js'; import reduceNavInfo from './nav-reducer.js';
import { import {
reducePrimaryIdentityPublicKey, reducePrimaryIdentityPublicKey,
setPrimaryIdentityPublicKey, setPrimaryIdentityKeys,
} from './primary-identity-public-key-reducer.js'; } from './primary-identity-public-key-reducer.js';
import { getVisibility } from './visibility.js'; import { getVisibility } from './visibility.js';
import { filterThreadIDsBelongingToCommunity } from '../selectors/calendar-selectors.js'; import { filterThreadIDsBelongingToCommunity } from '../selectors/calendar-selectors.js';
import { activeThreadSelector } from '../selectors/nav-selectors.js'; import { activeThreadSelector } from '../selectors/nav-selectors.js';
import { type NavInfo } from '../types/nav-types.js'; import { type NavInfo } from '../types/nav-types.js';
export type WindowDimensions = { width: number, height: number }; export type WindowDimensions = { width: number, height: number };
Show All 39 Linesexport type Action =
| { | {
type: 'UPDATE_WINDOW_ACTIVE', type: 'UPDATE_WINDOW_ACTIVE',
payload: boolean, payload: boolean,
} }
| { | {
type: 'SET_DEVICE_ID', type: 'SET_DEVICE_ID',
payload: string, payload: string,
} }
| { +type: 'SET_PRIMARY_IDENTITY_PUBLIC_KEY', payload: ?string } | { +type: 'SET_PRIMARY_IDENTITY_KEYS', payload: ?string }
| { | {
+type: 'UPDATE_CALENDAR_COMMUNITY_FILTER', +type: 'UPDATE_CALENDAR_COMMUNITY_FILTER',
+payload: string, +payload: string,
} }
| { | {
+type: 'CLEAR_CALENDAR_COMMUNITY_FILTER', +type: 'CLEAR_CALENDAR_COMMUNITY_FILTER',
+payload: void, +payload: void,
}; };
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines (action.type === deleteAccountActionTypes.success &&
)) ))
) { ) {
return oldState; return oldState;
} }
if ( if (
action.type !== updateNavInfoActionType && action.type !== updateNavInfoActionType &&
action.type !== setDeviceIDActionType && action.type !== setDeviceIDActionType &&
action.type !== setPrimaryIdentityPublicKey action.type !== setPrimaryIdentityKeys
) { ) {
state = baseReducer(state, action).state; state = baseReducer(state, action).state;
} }
state = { state = {
...state, ...state,
navInfo: reduceNavInfo( navInfo: reduceNavInfo(
state.navInfo, state.navInfo,
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines