+
+ );
+ }
+}
diff --git a/public/app/features/plugins/__snapshots__/PluginActionBar.test.tsx.snap b/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
similarity index 84%
rename from public/app/features/plugins/__snapshots__/PluginActionBar.test.tsx.snap
rename to public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
index 30cb53cea27..dc53e7863ea 100644
--- a/public/app/features/plugins/__snapshots__/PluginActionBar.test.tsx.snap
+++ b/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
@@ -22,7 +22,6 @@ exports[`Render should render component 1`] = `
/>
+
+ onSetLayoutMode(mode)} />
+
+
+
+ {linkButton.title}
+
+
-
- );
- }
-}
-
-function mapStateToProps(state) {
- return {
- searchQuery: getDataSourcesSearchQuery(state.dataSources),
- layoutMode: getDataSourcesLayoutMode(state.dataSources),
- };
-}
-
-const mapDispatchToProps = {
- setDataSourcesLayoutMode,
- setDataSourcesSearchQuery,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(DataSourcesActionBar);
diff --git a/public/app/features/datasources/DataSourcesListPage.test.tsx b/public/app/features/datasources/DataSourcesListPage.test.tsx
index fed7954d716..96f6c304b16 100644
--- a/public/app/features/datasources/DataSourcesListPage.test.tsx
+++ b/public/app/features/datasources/DataSourcesListPage.test.tsx
@@ -12,6 +12,9 @@ const setup = (propOverrides?: object) => {
loadDataSources: jest.fn(),
navModel: {} as NavModel,
dataSourcesCount: 0,
+ searchQuery: '',
+ setDataSourcesSearchQuery: jest.fn(),
+ setDataSourcesLayoutMode: jest.fn(),
};
Object.assign(props, propOverrides);
diff --git a/public/app/features/datasources/DataSourcesListPage.tsx b/public/app/features/datasources/DataSourcesListPage.tsx
index c6db6ee7889..a5887973a6b 100644
--- a/public/app/features/datasources/DataSourcesListPage.tsx
+++ b/public/app/features/datasources/DataSourcesListPage.tsx
@@ -2,21 +2,29 @@ import React, { PureComponent } from 'react';
import { connect } from 'react-redux';
import { hot } from 'react-hot-loader';
import PageHeader from '../../core/components/PageHeader/PageHeader';
-import DataSourcesActionBar from './DataSourcesActionBar';
+import OrgActionBar from '../../core/components/OrgActionBar/OrgActionBar';
+import EmptyListCTA from '../../core/components/EmptyListCTA/EmptyListCTA';
import DataSourcesList from './DataSourcesList';
-import { loadDataSources } from './state/actions';
-import { getDataSources, getDataSourcesCount, getDataSourcesLayoutMode } from './state/selectors';
-import { getNavModel } from '../../core/selectors/navModel';
import { DataSource, NavModel } from 'app/types';
import { LayoutMode } from '../../core/components/LayoutSelector/LayoutSelector';
-import EmptyListCTA from '../../core/components/EmptyListCTA/EmptyListCTA';
+import { loadDataSources, setDataSourcesLayoutMode, setDataSourcesSearchQuery } from './state/actions';
+import { getNavModel } from '../../core/selectors/navModel';
+import {
+ getDataSources,
+ getDataSourcesCount,
+ getDataSourcesLayoutMode,
+ getDataSourcesSearchQuery,
+} from './state/selectors';
export interface Props {
navModel: NavModel;
dataSources: DataSource[];
dataSourcesCount: number;
layoutMode: LayoutMode;
+ searchQuery: string;
loadDataSources: typeof loadDataSources;
+ setDataSourcesLayoutMode: typeof setDataSourcesLayoutMode;
+ setDataSourcesSearchQuery: typeof setDataSourcesSearchQuery;
}
const emptyListModel = {
@@ -40,7 +48,20 @@ export class DataSourcesListPage extends PureComponent
-
- setDataSourcesLayoutMode(mode)}
- />
-
-
-
-
- Add data source
-
-
@@ -50,7 +71,14 @@ export class DataSourcesListPage extends PureComponent {
setDataSourcesLayoutMode(mode)}
+ setSearchQuery={query => setDataSourcesSearchQuery(query)}
+ linkButton={linkButton}
+ key="action-bar"
+ />,
-
-`;
diff --git a/public/app/features/datasources/__snapshots__/DataSourcesListPage.test.tsx.snap b/public/app/features/datasources/__snapshots__/DataSourcesListPage.test.tsx.snap
index c19ee641e1b..3f9dbab72ab 100644
--- a/public/app/features/datasources/__snapshots__/DataSourcesListPage.test.tsx.snap
+++ b/public/app/features/datasources/__snapshots__/DataSourcesListPage.test.tsx.snap
@@ -8,8 +8,18 @@ exports[`Render should render action bar and datasources 1`] = `
-
-
-
-
-
- Add data source
-
-
- {
el: any;
+ /**
+ * Current query expressions of the rows including their modifications, used for running queries.
+ * Not kept in component state to prevent edit-render roundtrips.
+ */
+ queryExpressions: string[];
constructor(props) {
super(props);
- // Split state overrides everything
const splitState: ExploreState = props.splitState;
- const { datasource, queries, range } = props.urlState;
- this.state = {
- datasource: null,
- datasourceError: null,
- datasourceLoading: null,
- datasourceMissing: false,
- datasourceName: datasource,
- graphResult: null,
- history: [],
- latency: 0,
- loading: false,
- logsResult: null,
- queries: ensureQueries(queries),
- queryErrors: [],
- queryHints: [],
- range: range || { ...DEFAULT_RANGE },
- requestOptions: null,
- showingGraph: true,
- showingLogs: true,
- showingTable: true,
- supportsGraph: null,
- supportsLogs: null,
- supportsTable: null,
- tableResult: null,
- ...splitState,
- };
+ let initialQueries: Query[];
+ if (splitState) {
+ // Split state overrides everything
+ this.state = splitState;
+ initialQueries = splitState.queries;
+ } else {
+ const { datasource, queries, range } = props.urlState as ExploreUrlState;
+ initialQueries = ensureQueries(queries);
+ this.state = {
+ datasource: null,
+ datasourceError: null,
+ datasourceLoading: null,
+ datasourceMissing: false,
+ datasourceName: datasource,
+ exploreDatasources: [],
+ graphResult: null,
+ history: [],
+ latency: 0,
+ loading: false,
+ logsResult: null,
+ queries: initialQueries,
+ queryErrors: [],
+ queryHints: [],
+ range: range || { ...DEFAULT_RANGE },
+ requestOptions: null,
+ showingGraph: true,
+ showingLogs: true,
+ showingTable: true,
+ supportsGraph: null,
+ supportsLogs: null,
+ supportsTable: null,
+ tableResult: null,
+ };
+ }
+ this.queryExpressions = initialQueries.map(q => q.query);
}
async componentDidMount() {
@@ -125,8 +114,13 @@ export class Explore extends React.PureComponent {
throw new Error('No datasource service passed as props.');
}
const datasources = datasourceSrv.getExploreSources();
+ const exploreDatasources = datasources.map(ds => ({
+ value: ds.name,
+ label: ds.name,
+ }));
+
if (datasources.length > 0) {
- this.setState({ datasourceLoading: true });
+ this.setState({ datasourceLoading: true, exploreDatasources });
// Priority: datasource in url, default datasource, first explore datasource
let datasource;
if (datasourceName) {
@@ -170,9 +164,10 @@ export class Explore extends React.PureComponent {
}
// Keep queries but reset edit state
- const nextQueries = this.state.queries.map(q => ({
+ const nextQueries = this.state.queries.map((q, i) => ({
...q,
- edited: false,
+ key: generateQueryKey(i),
+ query: this.queryExpressions[i],
}));
this.setState(
@@ -201,6 +196,7 @@ export class Explore extends React.PureComponent {
onAddQueryRow = index => {
const { queries } = this.state;
+ this.queryExpressions[index + 1] = '';
const nextQueries = [
...queries.slice(0, index + 1),
{ query: '', key: generateQueryKey() },
@@ -227,29 +223,28 @@ export class Explore extends React.PureComponent {
};
onChangeQuery = (value: string, index: number, override?: boolean) => {
- const { queries } = this.state;
- let { queryErrors, queryHints } = this.state;
- const prevQuery = queries[index];
- const edited = override ? false : prevQuery.query !== value;
- const nextQuery = {
- ...queries[index],
- edited,
- query: value,
- };
- const nextQueries = [...queries];
- nextQueries[index] = nextQuery;
+ // Keep current value in local cache
+ this.queryExpressions[index] = value;
+
+ // Replace query row on override
if (override) {
- queryErrors = [];
- queryHints = [];
+ const { queries } = this.state;
+ const nextQuery: Query = {
+ key: generateQueryKey(index),
+ query: value,
+ };
+ const nextQueries = [...queries];
+ nextQueries[index] = nextQuery;
+
+ this.setState(
+ {
+ queryErrors: [],
+ queryHints: [],
+ queries: nextQueries,
+ },
+ this.onSubmit
+ );
}
- this.setState(
- {
- queryErrors,
- queryHints,
- queries: nextQueries,
- },
- override ? () => this.onSubmit() : undefined
- );
};
onChangeTime = nextRange => {
@@ -261,6 +256,7 @@ export class Explore extends React.PureComponent {
};
onClickClear = () => {
+ this.queryExpressions = [''];
this.setState(
{
graphResult: null,
@@ -293,9 +289,8 @@ export class Explore extends React.PureComponent {
onClickSplit = () => {
const { onChangeSplit } = this.props;
- const state = { ...this.state };
- state.queries = state.queries.map(({ edited, ...rest }) => rest);
if (onChangeSplit) {
+ const state = this.cloneState();
onChangeSplit(true, state);
this.saveState();
}
@@ -315,23 +310,22 @@ export class Explore extends React.PureComponent {
let nextQueries;
if (index === undefined) {
// Modify all queries
- nextQueries = queries.map(q => ({
- ...q,
- edited: false,
- query: datasource.modifyQuery(q.query, action),
+ nextQueries = queries.map((q, i) => ({
+ key: generateQueryKey(i),
+ query: datasource.modifyQuery(this.queryExpressions[i], action),
}));
} else {
// Modify query only at index
nextQueries = [
...queries.slice(0, index),
{
- ...queries[index],
- edited: false,
- query: datasource.modifyQuery(queries[index].query, action),
+ key: generateQueryKey(index),
+ query: datasource.modifyQuery(this.queryExpressions[index], action),
},
...queries.slice(index + 1),
];
}
+ this.queryExpressions = nextQueries.map(q => q.query);
this.setState({ queries: nextQueries }, () => this.onSubmit());
}
};
@@ -342,6 +336,7 @@ export class Explore extends React.PureComponent {
return;
}
const nextQueries = [...queries.slice(0, index), ...queries.slice(index + 1)];
+ this.queryExpressions = nextQueries.map(q => q.query);
this.setState({ queries: nextQueries }, () => this.onSubmit());
};
@@ -359,7 +354,7 @@ export class Explore extends React.PureComponent {
this.saveState();
};
- onQuerySuccess(datasourceId: string, queries: any[]): void {
+ onQuerySuccess(datasourceId: string, queries: string[]): void {
// save queries to history
let { history } = this.state;
const { datasource } = this.state;
@@ -370,8 +365,7 @@ export class Explore extends React.PureComponent {
}
const ts = Date.now();
- queries.forEach(q => {
- const { query } = q;
+ queries.forEach(query => {
history = [{ query, ts }, ...history];
});
@@ -386,16 +380,16 @@ export class Explore extends React.PureComponent {
}
buildQueryOptions(targetOptions: { format: string; hinting?: boolean; instant?: boolean }) {
- const { datasource, queries, range } = this.state;
+ const { datasource, range } = this.state;
const resolution = this.el.offsetWidth;
const absoluteRange = {
from: parseDate(range.from, false),
to: parseDate(range.to, true),
};
const { interval } = kbn.calculateInterval(absoluteRange, resolution, datasource.interval);
- const targets = queries.map(q => ({
+ const targets = this.queryExpressions.map(q => ({
...targetOptions,
- expr: q.query,
+ expr: q,
}));
return {
interval,
@@ -405,7 +399,8 @@ export class Explore extends React.PureComponent {
}
async runGraphQuery() {
- const { datasource, queries } = this.state;
+ const { datasource } = this.state;
+ const queries = [...this.queryExpressions];
if (!hasQuery(queries)) {
return;
}
@@ -427,7 +422,8 @@ export class Explore extends React.PureComponent {
}
async runTableQuery() {
- const { datasource, queries } = this.state;
+ const queries = [...this.queryExpressions];
+ const { datasource } = this.state;
if (!hasQuery(queries)) {
return;
}
@@ -451,7 +447,8 @@ export class Explore extends React.PureComponent {
}
async runLogsQuery() {
- const { datasource, queries } = this.state;
+ const queries = [...this.queryExpressions];
+ const { datasource } = this.state;
if (!hasQuery(queries)) {
return;
}
@@ -479,18 +476,27 @@ export class Explore extends React.PureComponent {
return datasource.metadataRequest(url);
};
+ cloneState(): ExploreState {
+ // Copy state, but copy queries including modifications
+ return {
+ ...this.state,
+ queries: ensureQueries(this.queryExpressions.map(query => ({ query }))),
+ };
+ }
+
saveState = () => {
const { stateKey, onSaveState } = this.props;
- onSaveState(stateKey, this.state);
+ onSaveState(stateKey, this.cloneState());
};
render() {
- const { datasourceSrv, position, split } = this.props;
+ const { position, split } = this.props;
const {
datasource,
datasourceError,
datasourceLoading,
datasourceMissing,
+ exploreDatasources,
graphResult,
history,
latency,
@@ -515,10 +521,6 @@ export class Explore extends React.PureComponent {
const logsButtonActive = showingLogs ? 'active' : '';
const tableButtonActive = showingBoth || showingTable ? 'active' : '';
const exploreClass = split ? 'explore explore-split' : 'explore';
- const datasources = datasourceSrv.getExploreSources().map(ds => ({
- value: ds.name,
- label: ds.name,
- }));
const selectedDatasource = datasource ? datasource.name : undefined;
return (
@@ -544,7 +546,7 @@ export class Explore extends React.PureComponent {
clearable={false}
className="gf-form-input gf-form-input--form-dropdown datasource-picker"
onChange={this.onChangeDatasource}
- options={datasources}
+ options={exploreDatasources}
isOpen={true}
placeholder="Loading datasources..."
value={selectedDatasource}
diff --git a/public/app/features/explore/PromQueryField.tsx b/public/app/features/explore/PromQueryField.tsx
index 293688276dc..20c36ee87f3 100644
--- a/public/app/features/explore/PromQueryField.tsx
+++ b/public/app/features/explore/PromQueryField.tsx
@@ -156,6 +156,7 @@ interface PromQueryFieldState {
labelValues: { [index: string]: { [index: string]: string[] } }; // metric -> labelKey -> [labelValue,...]
logLabelOptions: any[];
metrics: string[];
+ metricsOptions: any[];
metricsByPrefix: CascaderOption[];
}
@@ -167,7 +168,7 @@ interface PromTypeaheadInput {
value?: Value;
}
-class PromQueryField extends React.Component {
+class PromQueryField extends React.PureComponent {
plugins: any[];
constructor(props: PromQueryFieldProps, context) {
@@ -189,6 +190,7 @@ class PromQueryField extends React.Component {
- if (!this.state.metrics) {
+ const { histogramMetrics, metrics, metricsByPrefix } = this.state;
+ if (!metrics) {
return;
}
+
+ // Update global prism config
setPrismTokens(PRISM_SYNTAX, METRIC_MARK, this.state.metrics);
+
+ // Build metrics tree
+ const histogramOptions = histogramMetrics.map(hm => ({ label: hm, value: hm }));
+ const metricsOptions = [
+ { label: 'Histograms', value: HISTOGRAM_GROUP, children: histogramOptions },
+ ...metricsByPrefix,
+ ];
+
+ this.setState({ metricsOptions });
};
onTypeahead = (typeahead: TypeaheadInput): TypeaheadOutput => {
@@ -453,7 +467,7 @@ class PromQueryField extends React.Component ({ label: hm, value: hm }));
- const metricsOptions = [
- { label: 'Histograms', value: HISTOGRAM_GROUP, children: histogramOptions },
- ...metricsByPrefix,
- ];
+ const { logLabelOptions, metricsOptions } = this.state;
return (
{
+class QueryField extends React.PureComponent {
menuEl: HTMLElement | null;
plugins: any[];
resetTimer: any;
@@ -154,8 +161,14 @@ class QueryField extends React.Component {
- const changed = value.document !== this.state.value.document;
+ const textChanged = value.document !== this.state.value.document;
+
+ // Control editor loop, then pass text change up to parent
this.setState({ value }, () => {
- if (changed) {
+ if (textChanged) {
this.handleChangeValue();
}
});
- if (changed) {
+ // Show suggest menu on text input
+ if (textChanged && value.selection.isCollapsed) {
+ // Need one paint to allow DOM-based typeahead rules to work
window.requestAnimationFrame(this.handleTypeahead);
+ } else {
+ this.resetTypeahead();
}
};
@@ -216,7 +235,7 @@ class QueryField extends React.Component {
if (group.items) {
if (prefix) {
@@ -241,6 +260,11 @@ class QueryField extends React.Component group.items && group.items.length > 0); // Filter out empty groups
+ // Keep same object for equality checking later
+ if (_.isEqual(filteredSuggestions, this.state.suggestions)) {
+ filteredSuggestions = this.state.suggestions;
+ }
+
this.setState(
{
suggestions: filteredSuggestions,
@@ -326,12 +350,7 @@ class QueryField extends React.Component 0;
- if (!hasSuggesstions) {
+ if (!hasSuggestions(suggestions)) {
menu.removeAttribute('style');
return;
}
@@ -436,18 +454,12 @@ class QueryField extends React.Component {
const { portalPrefix } = this.props;
- const { suggestions } = this.state;
- const hasSuggesstions = suggestions && suggestions.length > 0;
- if (!hasSuggesstions) {
+ const { suggestions, typeaheadIndex } = this.state;
+ if (!hasSuggestions(suggestions)) {
return null;
}
- // Guard selectedIndex to be within the length of the suggestions
- let selectedIndex = Math.max(this.state.typeaheadIndex, 0);
- const flattenedSuggestions = flattenSuggestions(suggestions);
- selectedIndex = selectedIndex % flattenedSuggestions.length || 0;
- const selectedItem: Suggestion | null =
- flattenedSuggestions.length > 0 ? flattenedSuggestions[selectedIndex] : null;
+ const selectedItem = getSuggestionByIndex(suggestions, typeaheadIndex);
// Create typeahead in DOM root so we can later position it absolutely
return (
@@ -482,7 +494,7 @@ class QueryField extends React.Component {
+class Portal extends React.PureComponent<{ index?: number; prefix: string }, {}> {
node: HTMLElement;
constructor(props) {
diff --git a/public/app/features/explore/QueryRows.tsx b/public/app/features/explore/QueryRows.tsx
index 51adfa81c68..4dee3813ca8 100644
--- a/public/app/features/explore/QueryRows.tsx
+++ b/public/app/features/explore/QueryRows.tsx
@@ -44,14 +44,14 @@ class QueryRow extends PureComponent {
};
render() {
- const { edited, history, query, queryError, queryHint, request, supportsLogs } = this.props;
+ const { history, query, queryError, queryHint, request, supportsLogs } = this.props;
return (
{
export default class QueryRows extends PureComponent {
render() {
- const { className = '', queries, queryErrors = [], queryHints = [], ...handlers } = this.props;
+ const { className = '', queries, queryErrors, queryHints, ...handlers } = this.props;
return (
@@ -575,6 +584,7 @@ class PromQueryField extends React.Component
{error ? {error}
: null}
diff --git a/public/app/features/explore/QueryField.tsx b/public/app/features/explore/QueryField.tsx
index 13364729e7e..ea23ea81b93 100644
--- a/public/app/features/explore/QueryField.tsx
+++ b/public/app/features/explore/QueryField.tsx
@@ -11,10 +11,17 @@ import NewlinePlugin from './slate-plugins/newline';
import Typeahead from './Typeahead';
import { makeFragment, makeValue } from './Value';
-export const TYPEAHEAD_DEBOUNCE = 300;
+export const TYPEAHEAD_DEBOUNCE = 100;
-function flattenSuggestions(s: any[]): any[] {
- return s ? s.reduce((acc, g) => acc.concat(g.items), []) : [];
+function getSuggestionByIndex(suggestions: SuggestionGroup[], index: number): Suggestion {
+ // Flatten suggestion groups
+ const flattenedSuggestions = suggestions.reduce((acc, g) => acc.concat(g.items), []);
+ const correctedIndex = Math.max(index, 0) % flattenedSuggestions.length;
+ return flattenedSuggestions[correctedIndex];
+}
+
+function hasSuggestions(suggestions: SuggestionGroup[]): boolean {
+ return suggestions && suggestions.length > 0;
}
export interface Suggestion {
@@ -125,7 +132,7 @@ export interface TypeaheadOutput {
suggestions: SuggestionGroup[];
}
-class QueryField extends React.Component
{queries.map((q, index) => (
@@ -89,7 +89,6 @@ export default class QueryRows extends PureComponent {
query={q.query}
queryError={queryErrors[index]}
queryHint={queryHints[index]}
- edited={q.edited}
{...handlers}
/>
))}
diff --git a/public/app/features/explore/TimePicker.tsx b/public/app/features/explore/TimePicker.tsx
index 08867f8d0fc..f9c740073d0 100644
--- a/public/app/features/explore/TimePicker.tsx
+++ b/public/app/features/explore/TimePicker.tsx
@@ -5,7 +5,6 @@ import * as dateMath from 'app/core/utils/datemath';
import * as rangeUtil from 'app/core/utils/rangeutil';
const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
-
export const DEFAULT_RANGE = {
from: 'now-6h',
to: 'now',
diff --git a/public/app/features/explore/Typeahead.tsx b/public/app/features/explore/Typeahead.tsx
index 9924488035c..999e5003eaf 100644
--- a/public/app/features/explore/Typeahead.tsx
+++ b/public/app/features/explore/Typeahead.tsx
@@ -23,7 +23,9 @@ class TypeaheadItem extends React.PureComponent {
componentDidUpdate(prevProps) {
if (this.props.isSelected && !prevProps.isSelected) {
- scrollIntoView(this.el);
+ requestAnimationFrame(() => {
+ scrollIntoView(this.el);
+ });
}
}
diff --git a/public/app/features/explore/Wrapper.tsx b/public/app/features/explore/Wrapper.tsx
index 5a1b3f2831c..7045910c7c4 100644
--- a/public/app/features/explore/Wrapper.tsx
+++ b/public/app/features/explore/Wrapper.tsx
@@ -3,31 +3,11 @@ import { hot } from 'react-hot-loader';
import { connect } from 'react-redux';
import { updateLocation } from 'app/core/actions';
+import { serializeStateToUrlParam, parseUrlState } from 'app/core/utils/explore';
import { StoreState } from 'app/types';
-import { ExploreUrlState } from 'app/types/explore';
+import { ExploreState } from 'app/types/explore';
-import Explore, { ExploreState } from './Explore';
-import { DEFAULT_RANGE } from './TimePicker';
-
-export function parseUrlState(initial: string | undefined): ExploreUrlState {
- if (initial) {
- try {
- return JSON.parse(decodeURI(initial));
- } catch (e) {
- console.error(e);
- }
- }
- return { datasource: null, queries: [], range: DEFAULT_RANGE };
-}
-
-export function serializeStateToUrlParam(state: ExploreState): string {
- const urlState: ExploreUrlState = {
- datasource: state.datasourceName,
- queries: state.queries.map(q => ({ query: q.query })),
- range: state.range,
- };
- return JSON.stringify(urlState);
-}
+import Explore from './Explore';
interface WrapperProps {
backendSrv?: any;
diff --git a/public/app/features/explore/utils/query.ts b/public/app/features/explore/utils/query.ts
index 4766b85f040..193ee2dbc52 100644
--- a/public/app/features/explore/utils/query.ts
+++ b/public/app/features/explore/utils/query.ts
@@ -1,14 +1,16 @@
-export function generateQueryKey(index = 0) {
+import { Query } from 'app/types/explore';
+
+export function generateQueryKey(index = 0): string {
return `Q-${Date.now()}-${Math.random()}-${index}`;
}
-export function ensureQueries(queries?) {
+export function ensureQueries(queries?: Query[]): Query[] {
if (queries && typeof queries === 'object' && queries.length > 0 && typeof queries[0].query === 'string') {
return queries.map(({ query }, i) => ({ key: generateQueryKey(i), query }));
}
return [{ key: generateQueryKey(), query: '' }];
}
-export function hasQuery(queries) {
- return queries.some(q => q.query);
+export function hasQuery(queries: string[]): boolean {
+ return queries.some(q => Boolean(q));
}
diff --git a/public/app/features/folders/state/actions.ts b/public/app/features/folders/state/actions.ts
index df81acb91eb..cd02915e586 100644
--- a/public/app/features/folders/state/actions.ts
+++ b/public/app/features/folders/state/actions.ts
@@ -110,7 +110,7 @@ export function updateFolderPermission(itemToUpdate: DashboardAcl, level: Permis
continue;
}
- const updated = toUpdateItem(itemToUpdate);
+ const updated = toUpdateItem(item);
// if this is the item we want to update, update it's permisssion
if (itemToUpdate === item) {
diff --git a/public/app/features/org/all.ts b/public/app/features/org/all.ts
index 1cbca483138..9cbcec8de0d 100644
--- a/public/app/features/org/all.ts
+++ b/public/app/features/org/all.ts
@@ -1,6 +1,4 @@
-import './org_users_ctrl';
import './profile_ctrl';
-import './org_users_ctrl';
import './select_org_ctrl';
import './change_password_ctrl';
import './new_org_ctrl';
diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts
deleted file mode 100644
index 625e2749399..00000000000
--- a/public/app/features/org/org_users_ctrl.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import config from 'app/core/config';
-import coreModule from 'app/core/core_module';
-import Remarkable from 'remarkable';
-import _ from 'lodash';
-
-export class OrgUsersCtrl {
- unfiltered: any;
- users: any;
- pendingInvites: any;
- editor: any;
- navModel: any;
- externalUserMngLinkUrl: string;
- externalUserMngLinkName: string;
- externalUserMngInfo: string;
- canInvite: boolean;
- searchQuery: string;
- showInvites: boolean;
-
- /** @ngInject */
- constructor(private $scope, private backendSrv, navModelSrv, $sce) {
- this.navModel = navModelSrv.getNav('cfg', 'users', 0);
-
- this.get();
- this.externalUserMngLinkUrl = config.externalUserMngLinkUrl;
- this.externalUserMngLinkName = config.externalUserMngLinkName;
- this.canInvite = !config.disableLoginForm && !config.externalUserMngLinkName;
-
- // render external user management info markdown
- if (config.externalUserMngInfo) {
- this.externalUserMngInfo = new Remarkable({
- linkTarget: '__blank',
- }).render(config.externalUserMngInfo);
- }
- }
-
- get() {
- this.backendSrv.get('/api/org/users').then(users => {
- this.users = users;
- this.unfiltered = users;
- });
- this.backendSrv.get('/api/org/invites').then(pendingInvites => {
- this.pendingInvites = pendingInvites;
- });
- }
-
- onQueryUpdated() {
- const regex = new RegExp(this.searchQuery, 'ig');
- this.users = _.filter(this.unfiltered, item => {
- return regex.test(item.email) || regex.test(item.login);
- });
- }
-
- updateOrgUser(user) {
- this.backendSrv.patch('/api/org/users/' + user.userId, user);
- }
-
- removeUser(user) {
- this.$scope.appEvent('confirm-modal', {
- title: 'Delete',
- text: 'Are you sure you want to delete user ' + user.login + '?',
- yesText: 'Delete',
- icon: 'fa-warning',
- onConfirm: () => {
- this.removeUserConfirmed(user);
- },
- });
- }
-
- removeUserConfirmed(user) {
- this.backendSrv.delete('/api/org/users/' + user.userId).then(this.get.bind(this));
- }
-
- revokeInvite(invite, evt) {
- evt.stopPropagation();
- this.backendSrv.patch('/api/org/invites/' + invite.code + '/revoke').then(this.get.bind(this));
- }
-
- copyInviteToClipboard(evt) {
- evt.stopPropagation();
- }
-
- getInviteUrl(invite) {
- return invite.url;
- }
-}
-
-coreModule.controller('OrgUsersCtrl', OrgUsersCtrl);
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
deleted file mode 100644
index 8f75625b506..00000000000
--- a/public/app/features/org/partials/orgUsers.html
+++ /dev/null
@@ -1,105 +0,0 @@
- {
- onSearchQueryChange = event => {
- this.props.setPluginsSearchQuery(event.target.value);
- };
-
- render() {
- const { searchQuery, layoutMode, setLayoutMode } = this.props;
-
- return (
- {
@@ -27,13 +30,23 @@ export class PluginListPage extends PureComponent {
}
render() {
- const { navModel, plugins, layoutMode } = this.props;
+ const { navModel, plugins, layoutMode, setPluginsLayoutMode, setPluginsSearchQuery, searchQuery } = this.props;
+ const linkButton = {
+ href: 'https://grafana.com/plugins?utm_source=grafana_plugin_list',
+ title: 'Find more plugins on Grafana.com',
+ };
return (
-
-
-
-
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index c74c0716cc8..b42b06f1238 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -6,7 +6,7 @@ import kbn from 'app/core/utils/kbn';
import { PanelCtrl } from 'app/features/panel/panel_ctrl';
import * as rangeUtil from 'app/core/utils/rangeutil';
import * as dateMath from 'app/core/utils/datemath';
-import { renderUrl } from 'app/core/utils/url';
+import { getExploreUrl } from 'app/core/utils/explore';
import { metricsTabDirective } from './metrics_tab';
@@ -314,7 +314,12 @@ class MetricsPanelCtrl extends PanelCtrl {
getAdditionalMenuItems() {
const items = [];
- if (config.exploreEnabled && this.contextSrv.isEditor && this.datasource && this.datasource.supportsExplore) {
+ if (
+ config.exploreEnabled &&
+ this.contextSrv.isEditor &&
+ this.datasource &&
+ (this.datasource.meta.explore || this.datasource.meta.id === 'mixed')
+ ) {
items.push({
text: 'Explore',
click: 'ctrl.explore();',
@@ -325,14 +330,11 @@ class MetricsPanelCtrl extends PanelCtrl {
return items;
}
- explore() {
- const range = this.timeSrv.timeRangeForUrl();
- const state = {
- ...this.datasource.getExploreState(this.panel),
- range,
- };
- const exploreState = JSON.stringify(state);
- this.$location.url(renderUrl('/explore', { state: exploreState }));
+ async explore() {
+ const url = await getExploreUrl(this.panel, this.panel.targets, this.datasource, this.datasourceSrv, this.timeSrv);
+ if (url) {
+ this.$timeout(() => this.$location.url(url));
+ }
}
addQuery(target) {
diff --git a/public/app/features/panel/specs/metrics_panel_ctrl.test.ts b/public/app/features/panel/specs/metrics_panel_ctrl.test.ts
index a28bf92e63b..913a2461fd0 100644
--- a/public/app/features/panel/specs/metrics_panel_ctrl.test.ts
+++ b/public/app/features/panel/specs/metrics_panel_ctrl.test.ts
@@ -38,7 +38,7 @@ describe('MetricsPanelCtrl', () => {
describe('and has datasource set that supports explore and user has powers', () => {
beforeEach(() => {
ctrl.contextSrv = { isEditor: true };
- ctrl.datasource = { supportsExplore: true };
+ ctrl.datasource = { meta: { explore: true } };
additionalItems = ctrl.getAdditionalMenuItems();
});
diff --git a/public/app/features/plugins/PluginActionBar.test.tsx b/public/app/features/plugins/PluginActionBar.test.tsx
deleted file mode 100644
index be3f37e89fa..00000000000
--- a/public/app/features/plugins/PluginActionBar.test.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import { PluginActionBar, Props } from './PluginActionBar';
-import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector';
-
-const setup = (propOverrides?: object) => {
- const props: Props = {
- searchQuery: '',
- layoutMode: LayoutModes.Grid,
- setLayoutMode: jest.fn(),
- setPluginsSearchQuery: jest.fn(),
- };
-
- Object.assign(props, propOverrides);
-
- const wrapper = shallow(
-
-
-
-
-
-
-
-
-
- | - | Login | -
- Seen
- |
- Role | -- | |
|---|---|---|---|---|---|
|
- |
- {{user.login}} | -{{user.email}} | -{{user.lastSeenAtAge}} | -
-
-
-
- |
- - - - - | -
-
-
-
-
-| Name | -- | - | |
|---|---|---|---|
| {{invite.email}} | -{{invite.name}} | -- - - | -- - | -
-
- );
- }
-}
-
-function mapStateToProps(state) {
- return {
- searchQuery: getPluginsSearchQuery(state.plugins),
- layoutMode: getLayoutMode(state.plugins),
- };
-}
-
-const mapDispatchToProps = {
- setPluginsSearchQuery,
- setLayoutMode,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(PluginActionBar);
diff --git a/public/app/features/plugins/PluginListPage.test.tsx b/public/app/features/plugins/PluginListPage.test.tsx
index 452a89837c7..b173ef51a2a 100644
--- a/public/app/features/plugins/PluginListPage.test.tsx
+++ b/public/app/features/plugins/PluginListPage.test.tsx
@@ -8,6 +8,9 @@ const setup = (propOverrides?: object) => {
const props: Props = {
navModel: {} as NavModel,
plugins: [] as Plugin[],
+ searchQuery: '',
+ setPluginsSearchQuery: jest.fn(),
+ setPluginsLayoutMode: jest.fn(),
layoutMode: LayoutModes.Grid,
loadPlugins: jest.fn(),
};
diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx
index de2968b126c..d654ebd7cff 100644
--- a/public/app/features/plugins/PluginListPage.tsx
+++ b/public/app/features/plugins/PluginListPage.tsx
@@ -1,20 +1,23 @@
import React, { PureComponent } from 'react';
import { hot } from 'react-hot-loader';
import { connect } from 'react-redux';
-import PageHeader from '../../core/components/PageHeader/PageHeader';
-import PluginActionBar from './PluginActionBar';
+import PageHeader from 'app/core/components/PageHeader/PageHeader';
+import OrgActionBar from 'app/core/components/OrgActionBar/OrgActionBar';
import PluginList from './PluginList';
-import { NavModel, Plugin } from '../../types';
-import { loadPlugins } from './state/actions';
+import { NavModel, Plugin } from 'app/types';
+import { loadPlugins, setPluginsLayoutMode, setPluginsSearchQuery } from './state/actions';
import { getNavModel } from '../../core/selectors/navModel';
-import { getLayoutMode, getPlugins } from './state/selectors';
+import { getLayoutMode, getPlugins, getPluginsSearchQuery } from './state/selectors';
import { LayoutMode } from '../../core/components/LayoutSelector/LayoutSelector';
export interface Props {
navModel: NavModel;
plugins: Plugin[];
layoutMode: LayoutMode;
+ searchQuery: string;
loadPlugins: typeof loadPlugins;
+ setPluginsLayoutMode: typeof setPluginsLayoutMode;
+ setPluginsSearchQuery: typeof setPluginsSearchQuery;
}
export class PluginListPage extends PureComponent
-
- setLayoutMode(mode)} />
-
-
-
- Find more plugins on Grafana.com
-
-
- setPluginsLayoutMode(mode)}
+ setSearchQuery={query => setPluginsSearchQuery(query)}
+ linkButton={linkButton}
+ />
{plugins &&
- ({
+export const setPluginsLayoutMode = (mode: LayoutMode): SetLayoutModeAction => ({
type: ActionTypes.SetLayoutMode,
payload: mode,
});
diff --git a/public/app/features/users/InviteesTable.test.tsx b/public/app/features/users/InviteesTable.test.tsx
new file mode 100644
index 00000000000..e40ad033c57
--- /dev/null
+++ b/public/app/features/users/InviteesTable.test.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import InviteesTable, { Props } from './InviteesTable';
+import { Invitee } from 'app/types';
+import { getMockInvitees } from './__mocks__/userMocks';
+
+const setup = (propOverrides?: object) => {
+ const props: Props = {
+ invitees: [] as Invitee[],
+ onRevokeInvite: jest.fn(),
+ };
+
+ Object.assign(props, propOverrides);
+
+ return shallow( {
+ private copyUrlRef = createRef();
+
+ copyToClipboard = () => {
+ const node = this.copyUrlRef.current;
+
+ if (node) {
+ node.select();
+ document.execCommand('copy');
+ }
+ };
+
+ render() {
+ const { invitees, onRevokeInvite } = this.props;
+
+ return (
+
+
+
+ );
+ }
+}
diff --git a/public/app/features/users/UsersActionBar.test.tsx b/public/app/features/users/UsersActionBar.test.tsx
new file mode 100644
index 00000000000..7326de4d247
--- /dev/null
+++ b/public/app/features/users/UsersActionBar.test.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { UsersActionBar, Props } from './UsersActionBar';
+
+const setup = (propOverrides?: object) => {
+ const props: Props = {
+ searchQuery: '',
+ setUsersSearchQuery: jest.fn(),
+ onShowInvites: jest.fn(),
+ pendingInvitesCount: 0,
+ canInvite: false,
+ externalUserMngLinkUrl: '',
+ externalUserMngLinkName: '',
+ showInvites: false,
+ };
+
+ Object.assign(props, propOverrides);
+
+ return shallow( {
+ render() {
+ const {
+ canInvite,
+ externalUserMngLinkName,
+ externalUserMngLinkUrl,
+ searchQuery,
+ pendingInvitesCount,
+ setUsersSearchQuery,
+ onShowInvites,
+ showInvites,
+ } = this.props;
+
+ const pendingInvitesButtonStyle = classNames({
+ btn: true,
+ 'toggle-btn': true,
+ active: showInvites,
+ });
+
+ const usersButtonStyle = classNames({
+ btn: true,
+ 'toggle-btn': true,
+ active: !showInvites,
+ });
+
+ return (
+ {
+ externalUserMngInfoHtml: string;
+
+ constructor(props) {
+ super(props);
+
+ if (this.props.externalUserMngInfo) {
+ const markdownRenderer = new Remarkable();
+ this.externalUserMngInfoHtml = markdownRenderer.render(this.props.externalUserMngInfo);
+ }
+
+ this.state = {
+ showInvites: false,
+ };
+ }
+
+ componentDidMount() {
+ this.fetchUsers();
+ this.fetchInvitees();
+ }
+
+ async fetchUsers() {
+ return await this.props.loadUsers();
+ }
+
+ async fetchInvitees() {
+ return await this.props.loadInvitees();
+ }
+
+ onRoleChange = (role, user) => {
+ const updatedUser = { ...user, role: role };
+
+ this.props.updateUser(updatedUser);
+ };
+
+ onRemoveUser = user => {
+ appEvents.emit('confirm-modal', {
+ title: 'Delete',
+ text: 'Are you sure you want to delete user ' + user.login + '?',
+ yesText: 'Delete',
+ icon: 'fa-warning',
+ onConfirm: () => {
+ this.props.removeUser(user.userId);
+ },
+ });
+ };
+
+ onRevokeInvite = code => {
+ this.props.revokeInvite(code);
+ };
+
+ onShowInvites = () => {
+ this.setState(prevState => ({
+ showInvites: !prevState.showInvites,
+ }));
+ };
+
+ render() {
+ const { invitees, navModel, users } = this.props;
+ const externalUserMngInfoHtml = this.externalUserMngInfoHtml;
+
+ return (
+ = props => {
+ const { users, onRoleChange, onRemoveUser } = props;
+
+ return (
+
+
+
+ );
+};
+
+export default UsersTable;
diff --git a/public/app/features/users/__mocks__/userMocks.ts b/public/app/features/users/__mocks__/userMocks.ts
new file mode 100644
index 00000000000..ce299484c13
--- /dev/null
+++ b/public/app/features/users/__mocks__/userMocks.ts
@@ -0,0 +1,56 @@
+export const getMockUsers = (amount: number) => {
+ const users = [];
+
+ for (let i = 0; i <= amount; i++) {
+ users.push({
+ avatarUrl: 'url/to/avatar',
+ email: `user-${i}@test.com`,
+ lastSeenAt: '2018-10-01',
+ lastSeenAtAge: '',
+ login: `user-${i}`,
+ orgId: 1,
+ role: 'Admin',
+ userId: i,
+ });
+ }
+
+ return users;
+};
+
+export const getMockUser = () => {
+ return {
+ avatarUrl: 'url/to/avatar',
+ email: `user@test.com`,
+ lastSeenAt: '2018-10-01',
+ lastSeenAtAge: '',
+ login: `user`,
+ orgId: 1,
+ role: 'Admin',
+ userId: 2,
+ };
+};
+
+export const getMockInvitees = (amount: number) => {
+ const invitees = [];
+
+ for (let i = 0; i <= amount; i++) {
+ invitees.push({
+ code: `asdfasdfsadf-${i}`,
+ createdOn: '2018-10-02',
+ email: `invitee-${i}@test.com`,
+ emailSent: true,
+ emailSentOn: '2018-10-02',
+ id: i,
+ invitedByEmail: 'admin@grafana.com',
+ invitedByLogin: 'admin',
+ invitedByName: 'admin',
+ name: `invitee-${i}`,
+ orgId: 1,
+ role: 'viewer',
+ status: 'not accepted',
+ url: `localhost/invite/$${i}`,
+ });
+ }
+
+ return invitees;
+};
diff --git a/public/app/features/users/__snapshots__/InviteesTable.test.tsx.snap b/public/app/features/users/__snapshots__/InviteesTable.test.tsx.snap
new file mode 100644
index 00000000000..57622bbd9eb
--- /dev/null
+++ b/public/app/features/users/__snapshots__/InviteesTable.test.tsx.snap
@@ -0,0 +1,318 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render component 1`] = `
+
+
+
+`;
+
+exports[`Render should render invitees 1`] = `
+
+
+
+`;
diff --git a/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap b/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap
new file mode 100644
index 00000000000..e69accb011b
--- /dev/null
+++ b/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap
@@ -0,0 +1,155 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render component 1`] = `
+
+
+
+`;
+
+exports[`Render should render users table 1`] = `
+
+
+
+`;
diff --git a/public/app/features/users/state/actions.ts b/public/app/features/users/state/actions.ts
new file mode 100644
index 00000000000..5c50aa29096
--- /dev/null
+++ b/public/app/features/users/state/actions.ts
@@ -0,0 +1,79 @@
+import { ThunkAction } from 'redux-thunk';
+import { StoreState } from '../../../types';
+import { getBackendSrv } from '../../../core/services/backend_srv';
+import { Invitee, OrgUser } from 'app/types';
+
+export enum ActionTypes {
+ LoadUsers = 'LOAD_USERS',
+ LoadInvitees = 'LOAD_INVITEES',
+ SetUsersSearchQuery = 'SET_USERS_SEARCH_QUERY',
+}
+
+export interface LoadUsersAction {
+ type: ActionTypes.LoadUsers;
+ payload: OrgUser[];
+}
+
+export interface LoadInviteesAction {
+ type: ActionTypes.LoadInvitees;
+ payload: Invitee[];
+}
+
+export interface SetUsersSearchQueryAction {
+ type: ActionTypes.SetUsersSearchQuery;
+ payload: string;
+}
+
+const usersLoaded = (users: OrgUser[]): LoadUsersAction => ({
+ type: ActionTypes.LoadUsers,
+ payload: users,
+});
+
+const inviteesLoaded = (invitees: Invitee[]): LoadInviteesAction => ({
+ type: ActionTypes.LoadInvitees,
+ payload: invitees,
+});
+
+export const setUsersSearchQuery = (query: string): SetUsersSearchQueryAction => ({
+ type: ActionTypes.SetUsersSearchQuery,
+ payload: query,
+});
+
+export type Action = LoadUsersAction | SetUsersSearchQueryAction | LoadInviteesAction;
+
+type ThunkResult = ThunkAction;
+
+export function loadUsers(): ThunkResult {
+ return async dispatch => {
+ const users = await getBackendSrv().get('/api/org/users');
+ dispatch(usersLoaded(users));
+ };
+}
+
+export function loadInvitees(): ThunkResult {
+ return async dispatch => {
+ const invitees = await getBackendSrv().get('/api/org/invites');
+ dispatch(inviteesLoaded(invitees));
+ };
+}
+
+export function updateUser(user: OrgUser): ThunkResult {
+ return async dispatch => {
+ await getBackendSrv().patch(`/api/org/users/${user.userId}`, { role: user.role });
+ dispatch(loadUsers());
+ };
+}
+
+export function removeUser(userId: number): ThunkResult {
+ return async dispatch => {
+ await getBackendSrv().delete(`/api/org/users/${userId}`);
+ dispatch(loadUsers());
+ };
+}
+
+export function revokeInvite(code: string): ThunkResult {
+ return async dispatch => {
+ await getBackendSrv().patch(`/api/org/invites/${code}/revoke`, {});
+ dispatch(loadInvitees());
+ };
+}
diff --git a/public/app/features/users/state/reducers.ts b/public/app/features/users/state/reducers.ts
new file mode 100644
index 00000000000..9bbfdd5595f
--- /dev/null
+++ b/public/app/features/users/state/reducers.ts
@@ -0,0 +1,32 @@
+import { Invitee, OrgUser, UsersState } from 'app/types';
+import { Action, ActionTypes } from './actions';
+import config from '../../../core/config';
+
+export const initialState: UsersState = {
+ invitees: [] as Invitee[],
+ users: [] as OrgUser[],
+ searchQuery: '',
+ canInvite: !config.disableLoginForm && !config.externalUserMngLinkName,
+ externalUserMngInfo: config.externalUserMngInfo,
+ externalUserMngLinkName: config.externalUserMngLinkName,
+ externalUserMngLinkUrl: config.externalUserMngLinkUrl,
+};
+
+export const usersReducer = (state = initialState, action: Action): UsersState => {
+ switch (action.type) {
+ case ActionTypes.LoadUsers:
+ return { ...state, users: action.payload };
+
+ case ActionTypes.LoadInvitees:
+ return { ...state, invitees: action.payload };
+
+ case ActionTypes.SetUsersSearchQuery:
+ return { ...state, searchQuery: action.payload };
+ }
+
+ return state;
+};
+
+export default {
+ users: usersReducer,
+};
diff --git a/public/app/features/users/state/selectors.ts b/public/app/features/users/state/selectors.ts
new file mode 100644
index 00000000000..8bf052f61bd
--- /dev/null
+++ b/public/app/features/users/state/selectors.ts
@@ -0,0 +1,18 @@
+export const getUsers = state => {
+ const regex = new RegExp(state.searchQuery, 'i');
+
+ return state.users.filter(user => {
+ return regex.test(user.login) || regex.test(user.email);
+ });
+};
+
+export const getInvitees = state => {
+ const regex = new RegExp(state.searchQuery, 'i');
+
+ return state.invitees.filter(invitee => {
+ return regex.test(invitee.name) || regex.test(invitee.email);
+ });
+};
+
+export const getInviteesCount = state => state.invitees.length;
+export const getUsersSearchQuery = state => state.searchQuery;
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index 34771618095..e2b99d69df9 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -8,7 +8,6 @@ import * as templatingVariable from 'app/features/templating/variable';
export default class CloudWatchDatasource {
type: any;
name: any;
- supportMetrics: any;
proxyUrl: any;
defaultRegion: any;
instanceSettings: any;
@@ -17,7 +16,6 @@ export default class CloudWatchDatasource {
constructor(instanceSettings, private $q, private backendSrv, private templateSrv, private timeSrv) {
this.type = 'cloudwatch';
this.name = instanceSettings.name;
- this.supportMetrics = true;
this.proxyUrl = instanceSettings.url;
this.defaultRegion = instanceSettings.jsonData.defaultRegion;
this.instanceSettings = instanceSettings;
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 5ffbf7cf418..cf9b95882bc 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -16,8 +16,6 @@ export default class InfluxDatasource {
basicAuth: any;
withCredentials: any;
interval: any;
- supportAnnotations: boolean;
- supportMetrics: boolean;
responseParser: any;
/** @ngInject */
@@ -34,8 +32,6 @@ export default class InfluxDatasource {
this.basicAuth = instanceSettings.basicAuth;
this.withCredentials = instanceSettings.withCredentials;
this.interval = (instanceSettings.jsonData || {}).timeInterval;
- this.supportAnnotations = true;
- this.supportMetrics = true;
this.responseParser = new ResponseParser();
}
diff --git a/public/app/plugins/datasource/opentsdb/datasource.ts b/public/app/plugins/datasource/opentsdb/datasource.ts
index 7cb0806359d..772f2aa7ff9 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.ts
+++ b/public/app/plugins/datasource/opentsdb/datasource.ts
@@ -10,7 +10,6 @@ export default class OpenTsDatasource {
basicAuth: any;
tsdbVersion: any;
tsdbResolution: any;
- supportMetrics: any;
tagKeys: any;
aggregatorsPromise: any;
@@ -26,7 +25,6 @@ export default class OpenTsDatasource {
instanceSettings.jsonData = instanceSettings.jsonData || {};
this.tsdbVersion = instanceSettings.jsonData.tsdbVersion || 1;
this.tsdbResolution = instanceSettings.jsonData.tsdbResolution || 1;
- this.supportMetrics = true;
this.tagKeys = {};
this.aggregatorsPromise = null;
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index b53b9eb34c1..856ab035ea0 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -8,6 +8,7 @@ import { ResultTransformer } from './result_transformer';
import { BackendSrv } from 'app/core/services/backend_srv';
import addLabelToQuery from './add_label_to_query';
+import { getQueryHints } from './query_hints';
export function alignRange(start, end, step) {
const alignedEnd = Math.ceil(end / step) * step;
@@ -18,104 +19,6 @@ export function alignRange(start, end, step) {
};
}
-export function determineQueryHints(series: any[], datasource?: any): any[] {
- const hints = series.map((s, i) => {
- const query: string = s.query;
- const index: number = s.responseIndex;
- if (query === undefined || index === undefined) {
- return null;
- }
-
- // ..._bucket metric needs a histogram_quantile()
- const histogramMetric = query.trim().match(/^\w+_bucket$/);
- if (histogramMetric) {
- const label = 'Time series has buckets, you probably wanted a histogram.';
- return {
- index,
- label,
- fix: {
- label: 'Fix by adding histogram_quantile().',
- action: {
- type: 'ADD_HISTOGRAM_QUANTILE',
- query,
- index,
- },
- },
- };
- }
-
- // Check for monotony
- const datapoints: number[][] = s.datapoints;
- if (query.indexOf('rate(') === -1 && datapoints.length > 1) {
- let increasing = false;
- const monotonic = datapoints.filter(dp => dp[0] !== null).every((dp, index) => {
- if (index === 0) {
- return true;
- }
- increasing = increasing || dp[0] > datapoints[index - 1][0];
- // monotonic?
- return dp[0] >= datapoints[index - 1][0];
- });
- if (increasing && monotonic) {
- const simpleMetric = query.trim().match(/^\w+$/);
- let label = 'Time series is monotonously increasing.';
- let fix;
- if (simpleMetric) {
- fix = {
- label: 'Fix by adding rate().',
- action: {
- type: 'ADD_RATE',
- query,
- index,
- },
- };
- } else {
- label = `${label} Try applying a rate() function.`;
- }
- return {
- label,
- index,
- fix,
- };
- }
- }
-
- // Check for recording rules expansion
- if (datasource && datasource.ruleMappings) {
- const mapping = datasource.ruleMappings;
- const mappingForQuery = Object.keys(mapping).reduce((acc, ruleName) => {
- if (query.search(ruleName) > -1) {
- return {
- ...acc,
- [ruleName]: mapping[ruleName],
- };
- }
- return acc;
- }, {});
- if (_.size(mappingForQuery) > 0) {
- const label = 'Query contains recording rules.';
- return {
- label,
- index,
- fix: {
- label: 'Expand rules',
- action: {
- type: 'EXPAND_RULES',
- query,
- index,
- mapping: mappingForQuery,
- },
- },
- };
- }
- }
-
- // No hint found
- return null;
- });
- return hints;
-}
-
export function extractRuleMappingFromGroups(groups: any[]) {
return groups.reduce(
(mapping, group) =>
@@ -149,8 +52,6 @@ export class PrometheusDatasource {
editorSrc: string;
name: string;
ruleMappings: { [index: string]: string };
- supportsExplore: boolean;
- supportMetrics: boolean;
url: string;
directUrl: string;
basicAuth: any;
@@ -166,8 +67,6 @@ export class PrometheusDatasource {
this.type = 'prometheus';
this.editorSrc = 'app/features/prometheus/partials/query.editor.html';
this.name = instanceSettings.name;
- this.supportsExplore = true;
- this.supportMetrics = true;
this.url = instanceSettings.url;
this.directUrl = instanceSettings.directUrl;
this.basicAuth = instanceSettings.basicAuth;
@@ -304,7 +203,7 @@ export class PrometheusDatasource {
result = [...result, ...series];
if (queries[index].hinting) {
- const queryHints = determineQueryHints(series, this);
+ const queryHints = getQueryHints(series, this);
hints = [...hints, ...queryHints];
}
});
@@ -522,10 +421,10 @@ export class PrometheusDatasource {
});
}
- getExploreState(panel) {
+ getExploreState(targets: any[]) {
let state = {};
- if (panel.targets) {
- const queries = panel.targets.map(t => ({
+ if (targets && targets.length > 0) {
+ const queries = targets.map(t => ({
query: this.templateSrv.replace(t.expr, {}, this.interpolateQueryExpr),
format: t.format,
}));
diff --git a/public/app/plugins/datasource/prometheus/query_hints.ts b/public/app/plugins/datasource/prometheus/query_hints.ts
new file mode 100644
index 00000000000..5efaadb77be
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/query_hints.ts
@@ -0,0 +1,100 @@
+import _ from 'lodash';
+
+export function getQueryHints(series: any[], datasource?: any): any[] {
+ const hints = series.map((s, i) => {
+ const query: string = s.query;
+ const index: number = s.responseIndex;
+ if (query === undefined || index === undefined) {
+ return null;
+ }
+
+ // ..._bucket metric needs a histogram_quantile()
+ const histogramMetric = query.trim().match(/^\w+_bucket$/);
+ if (histogramMetric) {
+ const label = 'Time series has buckets, you probably wanted a histogram.';
+ return {
+ index,
+ label,
+ fix: {
+ label: 'Fix by adding histogram_quantile().',
+ action: {
+ type: 'ADD_HISTOGRAM_QUANTILE',
+ query,
+ index,
+ },
+ },
+ };
+ }
+
+ // Check for monotony
+ const datapoints: number[][] = s.datapoints;
+ if (query.indexOf('rate(') === -1 && datapoints.length > 1) {
+ let increasing = false;
+ const nonNullData = datapoints.filter(dp => dp[0] !== null);
+ const monotonic = nonNullData.every((dp, index) => {
+ if (index === 0) {
+ return true;
+ }
+ increasing = increasing || dp[0] > nonNullData[index - 1][0];
+ // monotonic?
+ return dp[0] >= nonNullData[index - 1][0];
+ });
+ if (increasing && monotonic) {
+ const simpleMetric = query.trim().match(/^\w+$/);
+ let label = 'Time series is monotonously increasing.';
+ let fix;
+ if (simpleMetric) {
+ fix = {
+ label: 'Fix by adding rate().',
+ action: {
+ type: 'ADD_RATE',
+ query,
+ index,
+ },
+ };
+ } else {
+ label = `${label} Try applying a rate() function.`;
+ }
+ return {
+ label,
+ index,
+ fix,
+ };
+ }
+ }
+
+ // Check for recording rules expansion
+ if (datasource && datasource.ruleMappings) {
+ const mapping = datasource.ruleMappings;
+ const mappingForQuery = Object.keys(mapping).reduce((acc, ruleName) => {
+ if (query.search(ruleName) > -1) {
+ return {
+ ...acc,
+ [ruleName]: mapping[ruleName],
+ };
+ }
+ return acc;
+ }, {});
+ if (_.size(mappingForQuery) > 0) {
+ const label = 'Query contains recording rules.';
+ return {
+ label,
+ index,
+ fix: {
+ label: 'Expand rules',
+ action: {
+ type: 'EXPAND_RULES',
+ query,
+ index,
+ mapping: mappingForQuery,
+ },
+ },
+ };
+ }
+ }
+
+ // No hint found
+ return null;
+ });
+ return hints;
+}
diff --git a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
index 692a1827247..bff35c7ba88 100644
--- a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
@@ -3,7 +3,6 @@ import moment from 'moment';
import q from 'q';
import {
alignRange,
- determineQueryHints,
extractRuleMappingFromGroups,
PrometheusDatasource,
prometheusSpecialRegexEscape,
@@ -216,84 +215,6 @@ describe('PrometheusDatasource', () => {
});
});
- describe('determineQueryHints()', () => {
- it('returns no hints for no series', () => {
- expect(determineQueryHints([])).toEqual([]);
- });
-
- it('returns no hints for empty series', () => {
- expect(determineQueryHints([{ datapoints: [], query: '' }])).toEqual([null]);
- });
-
- it('returns no hint for a monotonously decreasing series', () => {
- const series = [{ datapoints: [[23, 1000], [22, 1001]], query: 'metric', responseIndex: 0 }];
- const hints = determineQueryHints(series);
- expect(hints).toEqual([null]);
- });
-
- it('returns a rate hint for a monotonously increasing series', () => {
- const series = [{ datapoints: [[23, 1000], [24, 1001]], query: 'metric', responseIndex: 0 }];
- const hints = determineQueryHints(series);
- expect(hints.length).toBe(1);
- expect(hints[0]).toMatchObject({
- label: 'Time series is monotonously increasing.',
- index: 0,
- fix: {
- action: {
- type: 'ADD_RATE',
- query: 'metric',
- },
- },
- });
- });
-
- it('returns no rate hint for a monotonously increasing series that already has a rate', () => {
- const series = [{ datapoints: [[23, 1000], [24, 1001]], query: 'rate(metric[1m])', responseIndex: 0 }];
- const hints = determineQueryHints(series);
- expect(hints).toEqual([null]);
- });
-
- it('returns a rate hint w/o action for a complex monotonously increasing series', () => {
- const series = [{ datapoints: [[23, 1000], [24, 1001]], query: 'sum(metric)', responseIndex: 0 }];
- const hints = determineQueryHints(series);
- expect(hints.length).toBe(1);
- expect(hints[0].label).toContain('rate()');
- expect(hints[0].fix).toBeUndefined();
- });
-
- it('returns a rate hint for a monotonously increasing series with missing data', () => {
- const series = [{ datapoints: [[23, 1000], [null, 1001], [24, 1002]], query: 'metric', responseIndex: 0 }];
- const hints = determineQueryHints(series);
- expect(hints.length).toBe(1);
- expect(hints[0]).toMatchObject({
- label: 'Time series is monotonously increasing.',
- index: 0,
- fix: {
- action: {
- type: 'ADD_RATE',
- query: 'metric',
- },
- },
- });
- });
-
- it('returns a histogram hint for a bucket series', () => {
- const series = [{ datapoints: [[23, 1000]], query: 'metric_bucket', responseIndex: 0 }];
- const hints = determineQueryHints(series);
- expect(hints.length).toBe(1);
- expect(hints[0]).toMatchObject({
- label: 'Time series has buckets, you probably wanted a histogram.',
- index: 0,
- fix: {
- action: {
- type: 'ADD_HISTOGRAM_QUANTILE',
- query: 'metric_bucket',
- },
- },
- });
- });
- });
-
describe('extractRuleMappingFromGroups()', () => {
it('returns empty mapping for no rule groups', () => {
expect(extractRuleMappingFromGroups([])).toEqual({});
diff --git a/public/app/plugins/datasource/prometheus/specs/query_hints.test.ts b/public/app/plugins/datasource/prometheus/specs/query_hints.test.ts
new file mode 100644
index 00000000000..2c72203137d
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/specs/query_hints.test.ts
@@ -0,0 +1,87 @@
+import { getQueryHints } from '../query_hints';
+
+describe('getQueryHints()', () => {
+ it('returns no hints for no series', () => {
+ expect(getQueryHints([])).toEqual([]);
+ });
+
+ it('returns no hints for empty series', () => {
+ expect(getQueryHints([{ datapoints: [], query: '' }])).toEqual([null]);
+ });
+
+ it('returns no hint for a monotonously decreasing series', () => {
+ const series = [{ datapoints: [[23, 1000], [22, 1001]], query: 'metric', responseIndex: 0 }];
+ const hints = getQueryHints(series);
+ expect(hints).toEqual([null]);
+ });
+
+ it('returns no hint for a flat series', () => {
+ const series = [
+ { datapoints: [[null, 1000], [23, 1001], [null, 1002], [23, 1003]], query: 'metric', responseIndex: 0 },
+ ];
+ const hints = getQueryHints(series);
+ expect(hints).toEqual([null]);
+ });
+
+ it('returns a rate hint for a monotonously increasing series', () => {
+ const series = [{ datapoints: [[23, 1000], [24, 1001]], query: 'metric', responseIndex: 0 }];
+ const hints = getQueryHints(series);
+ expect(hints.length).toBe(1);
+ expect(hints[0]).toMatchObject({
+ label: 'Time series is monotonously increasing.',
+ index: 0,
+ fix: {
+ action: {
+ type: 'ADD_RATE',
+ query: 'metric',
+ },
+ },
+ });
+ });
+
+ it('returns no rate hint for a monotonously increasing series that already has a rate', () => {
+ const series = [{ datapoints: [[23, 1000], [24, 1001]], query: 'rate(metric[1m])', responseIndex: 0 }];
+ const hints = getQueryHints(series);
+ expect(hints).toEqual([null]);
+ });
+
+ it('returns a rate hint w/o action for a complex monotonously increasing series', () => {
+ const series = [{ datapoints: [[23, 1000], [24, 1001]], query: 'sum(metric)', responseIndex: 0 }];
+ const hints = getQueryHints(series);
+ expect(hints.length).toBe(1);
+ expect(hints[0].label).toContain('rate()');
+ expect(hints[0].fix).toBeUndefined();
+ });
+
+ it('returns a rate hint for a monotonously increasing series with missing data', () => {
+ const series = [{ datapoints: [[23, 1000], [null, 1001], [24, 1002]], query: 'metric', responseIndex: 0 }];
+ const hints = getQueryHints(series);
+ expect(hints.length).toBe(1);
+ expect(hints[0]).toMatchObject({
+ label: 'Time series is monotonously increasing.',
+ index: 0,
+ fix: {
+ action: {
+ type: 'ADD_RATE',
+ query: 'metric',
+ },
+ },
+ });
+ });
+
+ it('returns a histogram hint for a bucket series', () => {
+ const series = [{ datapoints: [[23, 1000]], query: 'metric_bucket', responseIndex: 0 }];
+ const hints = getQueryHints(series);
+ expect(hints.length).toBe(1);
+ expect(hints[0]).toMatchObject({
+ label: 'Time series has buckets, you probably wanted a histogram.',
+ index: 0,
+ fix: {
+ action: {
+ type: 'ADD_HISTOGRAM_QUANTILE',
+ query: 'metric_bucket',
+ },
+ },
+ });
+ });
+});
diff --git a/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts b/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
index de144071b93..98a1258cb15 100644
--- a/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
+++ b/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
@@ -24,6 +24,7 @@ export class StackdriverAggregationCtrl {
alignOptions: any[];
target: any;
+ /** @ngInject */
constructor(private $scope) {
this.$scope.ctrl = this;
this.target = $scope.target;
diff --git a/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts b/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
index 37625b559f0..ac279eec0d5 100644
--- a/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
+++ b/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
@@ -4,6 +4,7 @@ import { FilterSegments, DefaultRemoveFilterValue } from './filter_segments';
import appEvents from 'app/core/app_events';
export class StackdriverFilter {
+ /** @ngInject */
constructor() {
return {
templateUrl: 'public/app/plugins/datasource/stackdriver/partials/query.filter.html',
diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts
index cdd5478c4fd..d112e656f3f 100644
--- a/public/app/plugins/datasource/testdata/datasource.ts
+++ b/public/app/plugins/datasource/testdata/datasource.ts
@@ -1,4 +1,5 @@
import _ from 'lodash';
+import TableModel from 'app/core/table_model';
class TestDataDatasource {
id: any;
@@ -29,16 +30,29 @@ class TestDataDatasource {
}
return this.backendSrv
- .post('/api/tsdb/query', {
- from: options.range.from.valueOf().toString(),
- to: options.range.to.valueOf().toString(),
- queries: queries,
+ .datasourceRequest({
+ method: 'POST',
+ url: '/api/tsdb/query',
+ data: {
+ from: options.range.from.valueOf().toString(),
+ to: options.range.to.valueOf().toString(),
+ queries: queries,
+ },
})
.then(res => {
const data = [];
- if (res.results) {
- _.forEach(res.results, queryRes => {
+ if (res.data.results) {
+ _.forEach(res.data.results, queryRes => {
+ if (queryRes.tables) {
+ for (const table of queryRes.tables) {
+ const model = new TableModel();
+ model.rows = table.rows;
+ model.columns = table.columns;
+
+ data.push(model);
+ }
+ }
for (const series of queryRes.series) {
data.push({
target: series.name,
@@ -48,17 +62,28 @@ class TestDataDatasource {
});
}
+ console.log(res);
return { data: data };
});
}
annotationQuery(options) {
- return this.backendSrv.get('/api/annotations', {
- from: options.range.from.valueOf(),
- to: options.range.to.valueOf(),
- limit: options.limit,
- type: options.type,
- });
+ let timeWalker = options.range.from.valueOf();
+ const to = options.range.to.valueOf();
+ const events = [];
+ const eventCount = 10;
+ const step = (to - timeWalker) / eventCount;
+
+ for (let i = 0; i < eventCount; i++) {
+ events.push({
+ annotation: options.annotation,
+ time: timeWalker,
+ text: 'This is the text, Grafana.com',
+ tags: ['text', 'server'],
+ });
+ timeWalker += step;
+ }
+ return this.$q.when(events);
}
}
diff --git a/public/app/plugins/datasource/testdata/module.ts b/public/app/plugins/datasource/testdata/module.ts
index f0db2d4e341..ea01849b997 100644
--- a/public/app/plugins/datasource/testdata/module.ts
+++ b/public/app/plugins/datasource/testdata/module.ts
@@ -6,7 +6,7 @@ class TestDataAnnotationsQueryCtrl {
constructor() {}
- static template = ' --wn --rn --apikey --dry-run false")
+ fmt.Println("example: go run publisher.go main.go --version v5.2.0-beta2 --wn http://docs.grafana.org/guides/whats-new-in-v5-2/ --rn https://community.grafana.com/t/release-notes-v5-2-x/7894 --apikey ASDF123 --dry-run true")
+ os.Exit(1)
+ }
+
+ if dryRun {
+ log.Println("Dry-run has been enabled.")
+ }
+
+ p := publisher{apiKey: apiKey}
+ if err := p.doRelease(version, whatsNewUrl, releaseNotesUrl, dryRun); err != nil {
+ log.Fatalf("error: %v", err)
+ }
+}
diff --git a/scripts/build/release_publisher/publisher.go b/scripts/build/release_publisher/publisher.go
new file mode 100644
index 00000000000..60b60ca55f7
--- /dev/null
+++ b/scripts/build/release_publisher/publisher.go
@@ -0,0 +1,266 @@
+package main
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "io/ioutil"
+ "log"
+ "net/http"
+ "strings"
+ "time"
+)
+
+type publisher struct {
+ apiKey string
+}
+
+func (p *publisher) doRelease(version string, whatsNewUrl string, releaseNotesUrl string, dryRun bool) error {
+ currentRelease, err := newRelease(version, whatsNewUrl, releaseNotesUrl, buildArtifactConfigurations, getHttpContents{})
+ if err != nil {
+ return err
+ }
+
+ if dryRun {
+ relJson, err := json.Marshal(currentRelease)
+ if err != nil {
+ return err
+ }
+ log.Println(string(relJson))
+
+ for _, b := range currentRelease.Builds {
+ artifactJson, err := json.Marshal(b)
+ if err != nil {
+ return err
+ }
+ log.Println(string(artifactJson))
+ }
+ } else {
+ if err := p.postRelease(currentRelease); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (p *publisher) postRelease(r *release) error {
+ err := p.postRequest("/grafana/versions", r, fmt.Sprintf("Create Release %s", r.Version))
+ if err != nil {
+ return err
+ }
+ err = p.postRequest("/grafana/versions/"+r.Version, r, fmt.Sprintf("Update Release %s", r.Version))
+ if err != nil {
+ return err
+ }
+ for _, b := range r.Builds {
+ err = p.postRequest(fmt.Sprintf("/grafana/versions/%s/packages", r.Version), b, fmt.Sprintf("Create Build %s %s", b.Os, b.Arch))
+ if err != nil {
+ return err
+ }
+ err = p.postRequest(fmt.Sprintf("/grafana/versions/%s/packages/%s/%s", r.Version, b.Arch, b.Os), b, fmt.Sprintf("Update Build %s %s", b.Os, b.Arch))
+ if err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+const baseArhiveUrl = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana"
+
+type buildArtifact struct {
+ os string
+ arch string
+ urlPostfix string
+}
+
+func (t buildArtifact) getUrl(version string, isBeta bool) string {
+ prefix := "-"
+ rhelReleaseExtra := ""
+
+ if t.os == "deb" {
+ prefix = "_"
+ }
+
+ if !isBeta && t.os == "rhel" {
+ rhelReleaseExtra = "-1"
+ }
+
+ url := strings.Join([]string{baseArhiveUrl, prefix, version, rhelReleaseExtra, t.urlPostfix}, "")
+ return url
+}
+
+var buildArtifactConfigurations = []buildArtifact{
+ {
+ os: "deb",
+ arch: "arm64",
+ urlPostfix: "_arm64.deb",
+ },
+ {
+ os: "rhel",
+ arch: "arm64",
+ urlPostfix: ".aarch64.rpm",
+ },
+ {
+ os: "linux",
+ arch: "arm64",
+ urlPostfix: ".linux-arm64.tar.gz",
+ },
+ {
+ os: "deb",
+ arch: "armv7",
+ urlPostfix: "_armhf.deb",
+ },
+ {
+ os: "rhel",
+ arch: "armv7",
+ urlPostfix: ".armhfp.rpm",
+ },
+ {
+ os: "linux",
+ arch: "armv7",
+ urlPostfix: ".linux-armv7.tar.gz",
+ },
+ {
+ os: "darwin",
+ arch: "amd64",
+ urlPostfix: ".darwin-amd64.tar.gz",
+ },
+ {
+ os: "deb",
+ arch: "amd64",
+ urlPostfix: "_amd64.deb",
+ },
+ {
+ os: "rhel",
+ arch: "amd64",
+ urlPostfix: ".x86_64.rpm",
+ },
+ {
+ os: "linux",
+ arch: "amd64",
+ urlPostfix: ".linux-amd64.tar.gz",
+ },
+ {
+ os: "win",
+ arch: "amd64",
+ urlPostfix: ".windows-amd64.zip",
+ },
+}
+
+func newRelease(rawVersion string, whatsNewUrl string, releaseNotesUrl string, artifactConfigurations []buildArtifact, getter urlGetter) (*release, error) {
+ version := rawVersion[1:]
+ now := time.Now()
+ isBeta := strings.Contains(version, "beta")
+
+ builds := []build{}
+ for _, ba := range artifactConfigurations {
+ sha256, err := getter.getContents(fmt.Sprintf("%s.sha256", ba.getUrl(version, isBeta)))
+ if err != nil {
+ return nil, err
+ }
+ builds = append(builds, newBuild(ba, version, isBeta, sha256))
+ }
+
+ r := release{
+ Version: version,
+ ReleaseDate: time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local),
+ Stable: !isBeta,
+ Beta: isBeta,
+ Nightly: false,
+ WhatsNewUrl: whatsNewUrl,
+ ReleaseNotesUrl: releaseNotesUrl,
+ Builds: builds,
+ }
+ return &r, nil
+}
+
+func newBuild(ba buildArtifact, version string, isBeta bool, sha256 string) build {
+ return build{
+ Os: ba.os,
+ Url: ba.getUrl(version, isBeta),
+ Sha256: sha256,
+ Arch: ba.arch,
+ }
+}
+
+func (p *publisher) postRequest(url string, obj interface{}, desc string) error {
+ jsonBytes, err := json.Marshal(obj)
+ if err != nil {
+ return err
+ }
+ req, err := http.NewRequest(http.MethodPost, baseUri+url, bytes.NewReader(jsonBytes))
+ if err != nil {
+ return err
+ }
+ req.Header.Add("Authorization", "Bearer "+p.apiKey)
+ req.Header.Add("Content-Type", "application/json")
+
+ res, err := http.DefaultClient.Do(req)
+ if err != nil {
+ return err
+ }
+
+ if res.StatusCode == http.StatusOK {
+ log.Printf("Action: %s \t OK", desc)
+ return nil
+ }
+
+ if res.Body != nil {
+ defer res.Body.Close()
+ body, err := ioutil.ReadAll(res.Body)
+ if err != nil {
+ return err
+ }
+
+ if strings.Contains(string(body), "already exists") || strings.Contains(string(body), "Nothing to update") {
+ log.Printf("Action: %s \t Already exists", desc)
+ } else {
+ log.Printf("Action: %s \t Failed - Status: %v", desc, res.Status)
+ log.Printf("Resp: %s", body)
+ log.Fatalf("Quiting")
+ }
+ }
+
+ return nil
+}
+
+type release struct {
+ Version string `json:"version"`
+ ReleaseDate time.Time `json:"releaseDate"`
+ Stable bool `json:"stable"`
+ Beta bool `json:"beta"`
+ Nightly bool `json:"nightly"`
+ WhatsNewUrl string `json:"whatsNewUrl"`
+ ReleaseNotesUrl string `json:"releaseNotesUrl"`
+ Builds []build `json:"-"`
+}
+
+type build struct {
+ Os string `json:"os"`
+ Url string `json:"url"`
+ Sha256 string `json:"sha256"`
+ Arch string `json:"arch"`
+}
+
+type urlGetter interface {
+ getContents(url string) (string, error)
+}
+
+type getHttpContents struct{}
+
+func (getHttpContents) getContents(url string) (string, error) {
+ response, err := http.Get(url)
+ if err != nil {
+ return "", err
+ }
+
+ defer response.Body.Close()
+ all, err := ioutil.ReadAll(response.Body)
+ if err != nil {
+ return "", err
+ }
+
+ return string(all), nil
+}
diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go
new file mode 100644
index 00000000000..9bc350e6a54
--- /dev/null
+++ b/scripts/build/release_publisher/publisher_test.go
@@ -0,0 +1,43 @@
+package main
+
+import "testing"
+
+func TestNewRelease(t *testing.T) {
+ versionIn := "v5.2.0-beta1"
+ expectedVersion := "5.2.0-beta1"
+ whatsNewUrl := "https://whatsnews.foo/"
+ relNotesUrl := "https://relnotes.foo/"
+ expectedArch := "amd64"
+ expectedOs := "linux"
+ buildArtifacts := []buildArtifact{{expectedOs, expectedArch, ".linux-amd64.tar.gz"}}
+
+ rel, _ := newRelease(versionIn, whatsNewUrl, relNotesUrl, buildArtifacts, mockHttpGetter{})
+
+ if !rel.Beta || rel.Stable {
+ t.Errorf("%s should have been tagged as beta (not stable), but wasn't .", versionIn)
+ }
+
+ if rel.Version != expectedVersion {
+ t.Errorf("Expected version to be %s, but it was %s.", expectedVersion, rel.Version)
+ }
+
+ expectedBuilds := len(buildArtifacts)
+ if len(rel.Builds) != expectedBuilds {
+ t.Errorf("Expected %v builds, but got %v.", expectedBuilds, len(rel.Builds))
+ }
+
+ build := rel.Builds[0]
+ if build.Arch != expectedArch {
+ t.Errorf("Expected arch to be %v, but it was %v", expectedArch, build.Arch)
+ }
+
+ if build.Os != expectedOs {
+ t.Errorf("Expected arch to be %v, but it was %v", expectedOs, build.Os)
+ }
+}
+
+type mockHttpGetter struct{}
+
+func (mockHttpGetter) getContents(url string) (string, error) {
+ return url, nil
+}
diff --git a/vendor/github.com/VividCortex/mysqlerr/LICENSE b/vendor/github.com/VividCortex/mysqlerr/LICENSE
new file mode 100644
index 00000000000..92bb301a02f
--- /dev/null
+++ b/vendor/github.com/VividCortex/mysqlerr/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 VividCortex
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/github.com/VividCortex/mysqlerr/mysqlerr.go b/vendor/github.com/VividCortex/mysqlerr/mysqlerr.go
new file mode 100644
index 00000000000..ce62e7d5041
--- /dev/null
+++ b/vendor/github.com/VividCortex/mysqlerr/mysqlerr.go
@@ -0,0 +1,1080 @@
+package mysqlerr
+
+const (
+ ER_HASHCHK = 1000
+ ER_NISAMCHK = 1001
+ ER_NO = 1002
+ ER_YES = 1003
+ ER_CANT_CREATE_FILE = 1004
+ ER_CANT_CREATE_TABLE = 1005
+ ER_CANT_CREATE_DB = 1006
+ ER_DB_CREATE_EXISTS = 1007
+ ER_DB_DROP_EXISTS = 1008
+ ER_DB_DROP_DELETE = 1009
+ ER_DB_DROP_RMDIR = 1010
+ ER_CANT_DELETE_FILE = 1011
+ ER_CANT_FIND_SYSTEM_REC = 1012
+ ER_CANT_GET_STAT = 1013
+ ER_CANT_GET_WD = 1014
+ ER_CANT_LOCK = 1015
+ ER_CANT_OPEN_FILE = 1016
+ ER_FILE_NOT_FOUND = 1017
+ ER_CANT_READ_DIR = 1018
+ ER_CANT_SET_WD = 1019
+ ER_CHECKREAD = 1020
+ ER_DISK_FULL = 1021
+ ER_DUP_KEY = 1022
+ ER_ERROR_ON_CLOSE = 1023
+ ER_ERROR_ON_READ = 1024
+ ER_ERROR_ON_RENAME = 1025
+ ER_ERROR_ON_WRITE = 1026
+ ER_FILE_USED = 1027
+ ER_FILSORT_ABORT = 1028
+ ER_FORM_NOT_FOUND = 1029
+ ER_GET_ERRNO = 1030
+ ER_ILLEGAL_HA = 1031
+ ER_KEY_NOT_FOUND = 1032
+ ER_NOT_FORM_FILE = 1033
+ ER_NOT_KEYFILE = 1034
+ ER_OLD_KEYFILE = 1035
+ ER_OPEN_AS_READONLY = 1036
+ ER_OUTOFMEMORY = 1037
+ ER_OUT_OF_SORTMEMORY = 1038
+ ER_UNEXPECTED_EOF = 1039
+ ER_CON_COUNT_ERROR = 1040
+ ER_OUT_OF_RESOURCES = 1041
+ ER_BAD_HOST_ERROR = 1042
+ ER_HANDSHAKE_ERROR = 1043
+ ER_DBACCESS_DENIED_ERROR = 1044
+ ER_ACCESS_DENIED_ERROR = 1045
+ ER_NO_DB_ERROR = 1046
+ ER_UNKNOWN_COM_ERROR = 1047
+ ER_BAD_NULL_ERROR = 1048
+ ER_BAD_DB_ERROR = 1049
+ ER_TABLE_EXISTS_ERROR = 1050
+ ER_BAD_TABLE_ERROR = 1051
+ ER_NON_UNIQ_ERROR = 1052
+ ER_SERVER_SHUTDOWN = 1053
+ ER_BAD_FIELD_ERROR = 1054
+ ER_WRONG_FIELD_WITH_GROUP = 1055
+ ER_WRONG_GROUP_FIELD = 1056
+ ER_WRONG_SUM_SELECT = 1057
+ ER_WRONG_VALUE_COUNT = 1058
+ ER_TOO_LONG_IDENT = 1059
+ ER_DUP_FIELDNAME = 1060
+ ER_DUP_KEYNAME = 1061
+ ER_DUP_ENTRY = 1062
+ ER_WRONG_FIELD_SPEC = 1063
+ ER_PARSE_ERROR = 1064
+ ER_EMPTY_QUERY = 1065
+ ER_NONUNIQ_TABLE = 1066
+ ER_INVALID_DEFAULT = 1067
+ ER_MULTIPLE_PRI_KEY = 1068
+ ER_TOO_MANY_KEYS = 1069
+ ER_TOO_MANY_KEY_PARTS = 1070
+ ER_TOO_LONG_KEY = 1071
+ ER_KEY_COLUMN_DOES_NOT_EXITS = 1072
+ ER_BLOB_USED_AS_KEY = 1073
+ ER_TOO_BIG_FIELDLENGTH = 1074
+ ER_WRONG_AUTO_KEY = 1075
+ ER_READY = 1076
+ ER_NORMAL_SHUTDOWN = 1077
+ ER_GOT_SIGNAL = 1078
+ ER_SHUTDOWN_COMPLETE = 1079
+ ER_FORCING_CLOSE = 1080
+ ER_IPSOCK_ERROR = 1081
+ ER_NO_SUCH_INDEX = 1082
+ ER_WRONG_FIELD_TERMINATORS = 1083
+ ER_BLOBS_AND_NO_TERMINATED = 1084
+ ER_TEXTFILE_NOT_READABLE = 1085
+ ER_FILE_EXISTS_ERROR = 1086
+ ER_LOAD_INFO = 1087
+ ER_ALTER_INFO = 1088
+ ER_WRONG_SUB_KEY = 1089
+ ER_CANT_REMOVE_ALL_FIELDS = 1090
+ ER_CANT_DROP_FIELD_OR_KEY = 1091
+ ER_INSERT_INFO = 1092
+ ER_UPDATE_TABLE_USED = 1093
+ ER_NO_SUCH_THREAD = 1094
+ ER_KILL_DENIED_ERROR = 1095
+ ER_NO_TABLES_USED = 1096
+ ER_TOO_BIG_SET = 1097
+ ER_NO_UNIQUE_LOGFILE = 1098
+ ER_TABLE_NOT_LOCKED_FOR_WRITE = 1099
+ ER_TABLE_NOT_LOCKED = 1100
+ ER_BLOB_CANT_HAVE_DEFAULT = 1101
+ ER_WRONG_DB_NAME = 1102
+ ER_WRONG_TABLE_NAME = 1103
+ ER_TOO_BIG_SELECT = 1104
+ ER_UNKNOWN_ERROR = 1105
+ ER_UNKNOWN_PROCEDURE = 1106
+ ER_WRONG_PARAMCOUNT_TO_PROCEDURE = 1107
+ ER_WRONG_PARAMETERS_TO_PROCEDURE = 1108
+ ER_UNKNOWN_TABLE = 1109
+ ER_FIELD_SPECIFIED_TWICE = 1110
+ ER_INVALID_GROUP_FUNC_USE = 1111
+ ER_UNSUPPORTED_EXTENSION = 1112
+ ER_TABLE_MUST_HAVE_COLUMNS = 1113
+ ER_RECORD_FILE_FULL = 1114
+ ER_UNKNOWN_CHARACTER_SET = 1115
+ ER_TOO_MANY_TABLES = 1116
+ ER_TOO_MANY_FIELDS = 1117
+ ER_TOO_BIG_ROWSIZE = 1118
+ ER_STACK_OVERRUN = 1119
+ ER_WRONG_OUTER_JOIN = 1120
+ ER_NULL_COLUMN_IN_INDEX = 1121
+ ER_CANT_FIND_UDF = 1122
+ ER_CANT_INITIALIZE_UDF = 1123
+ ER_UDF_NO_PATHS = 1124
+ ER_UDF_EXISTS = 1125
+ ER_CANT_OPEN_LIBRARY = 1126
+ ER_CANT_FIND_DL_ENTRY = 1127
+ ER_FUNCTION_NOT_DEFINED = 1128
+ ER_HOST_IS_BLOCKED = 1129
+ ER_HOST_NOT_PRIVILEGED = 1130
+ ER_PASSWORD_ANONYMOUS_USER = 1131
+ ER_PASSWORD_NOT_ALLOWED = 1132
+ ER_PASSWORD_NO_MATCH = 1133
+ ER_UPDATE_INFO = 1134
+ ER_CANT_CREATE_THREAD = 1135
+ ER_WRONG_VALUE_COUNT_ON_ROW = 1136
+ ER_CANT_REOPEN_TABLE = 1137
+ ER_INVALID_USE_OF_NULL = 1138
+ ER_REGEXP_ERROR = 1139
+ ER_MIX_OF_GROUP_FUNC_AND_FIELDS = 1140
+ ER_NONEXISTING_GRANT = 1141
+ ER_TABLEACCESS_DENIED_ERROR = 1142
+ ER_COLUMNACCESS_DENIED_ERROR = 1143
+ ER_ILLEGAL_GRANT_FOR_TABLE = 1144
+ ER_GRANT_WRONG_HOST_OR_USER = 1145
+ ER_NO_SUCH_TABLE = 1146
+ ER_NONEXISTING_TABLE_GRANT = 1147
+ ER_NOT_ALLOWED_COMMAND = 1148
+ ER_SYNTAX_ERROR = 1149
+ ER_DELAYED_CANT_CHANGE_LOCK = 1150
+ ER_TOO_MANY_DELAYED_THREADS = 1151
+ ER_ABORTING_CONNECTION = 1152
+ ER_NET_PACKET_TOO_LARGE = 1153
+ ER_NET_READ_ERROR_FROM_PIPE = 1154
+ ER_NET_FCNTL_ERROR = 1155
+ ER_NET_PACKETS_OUT_OF_ORDER = 1156
+ ER_NET_UNCOMPRESS_ERROR = 1157
+ ER_NET_READ_ERROR = 1158
+ ER_NET_READ_INTERRUPTED = 1159
+ ER_NET_ERROR_ON_WRITE = 1160
+ ER_NET_WRITE_INTERRUPTED = 1161
+ ER_TOO_LONG_STRING = 1162
+ ER_TABLE_CANT_HANDLE_BLOB = 1163
+ ER_TABLE_CANT_HANDLE_AUTO_INCREMENT = 1164
+ ER_DELAYED_INSERT_TABLE_LOCKED = 1165
+ ER_WRONG_COLUMN_NAME = 1166
+ ER_WRONG_KEY_COLUMN = 1167
+ ER_WRONG_MRG_TABLE = 1168
+ ER_DUP_UNIQUE = 1169
+ ER_BLOB_KEY_WITHOUT_LENGTH = 1170
+ ER_PRIMARY_CANT_HAVE_NULL = 1171
+ ER_TOO_MANY_ROWS = 1172
+ ER_REQUIRES_PRIMARY_KEY = 1173
+ ER_NO_RAID_COMPILED = 1174
+ ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE = 1175
+ ER_KEY_DOES_NOT_EXITS = 1176
+ ER_CHECK_NO_SUCH_TABLE = 1177
+ ER_CHECK_NOT_IMPLEMENTED = 1178
+ ER_CANT_DO_THIS_DURING_AN_TRANSACTION = 1179
+ ER_ERROR_DURING_COMMIT = 1180
+ ER_ERROR_DURING_ROLLBACK = 1181
+ ER_ERROR_DURING_FLUSH_LOGS = 1182
+ ER_ERROR_DURING_CHECKPOINT = 1183
+ ER_NEW_ABORTING_CONNECTION = 1184
+ ER_DUMP_NOT_IMPLEMENTED = 1185
+ ER_FLUSH_MASTER_BINLOG_CLOSED = 1186
+ ER_INDEX_REBUILD = 1187
+ ER_MASTER = 1188
+ ER_MASTER_NET_READ = 1189
+ ER_MASTER_NET_WRITE = 1190
+ ER_FT_MATCHING_KEY_NOT_FOUND = 1191
+ ER_LOCK_OR_ACTIVE_TRANSACTION = 1192
+ ER_UNKNOWN_SYSTEM_VARIABLE = 1193
+ ER_CRASHED_ON_USAGE = 1194
+ ER_CRASHED_ON_REPAIR = 1195
+ ER_WARNING_NOT_COMPLETE_ROLLBACK = 1196
+ ER_TRANS_CACHE_FULL = 1197
+ ER_SLAVE_MUST_STOP = 1198
+ ER_SLAVE_NOT_RUNNING = 1199
+ ER_BAD_SLAVE = 1200
+ ER_MASTER_INFO = 1201
+ ER_SLAVE_THREAD = 1202
+ ER_TOO_MANY_USER_CONNECTIONS = 1203
+ ER_SET_CONSTANTS_ONLY = 1204
+ ER_LOCK_WAIT_TIMEOUT = 1205
+ ER_LOCK_TABLE_FULL = 1206
+ ER_READ_ONLY_TRANSACTION = 1207
+ ER_DROP_DB_WITH_READ_LOCK = 1208
+ ER_CREATE_DB_WITH_READ_LOCK = 1209
+ ER_WRONG_ARGUMENTS = 1210
+ ER_NO_PERMISSION_TO_CREATE_USER = 1211
+ ER_UNION_TABLES_IN_DIFFERENT_DIR = 1212
+ ER_LOCK_DEADLOCK = 1213
+ ER_TABLE_CANT_HANDLE_FT = 1214
+ ER_CANNOT_ADD_FOREIGN = 1215
+ ER_NO_REFERENCED_ROW = 1216
+ ER_ROW_IS_REFERENCED = 1217
+ ER_CONNECT_TO_MASTER = 1218
+ ER_QUERY_ON_MASTER = 1219
+ ER_ERROR_WHEN_EXECUTING_COMMAND = 1220
+ ER_WRONG_USAGE = 1221
+ ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT = 1222
+ ER_CANT_UPDATE_WITH_READLOCK = 1223
+ ER_MIXING_NOT_ALLOWED = 1224
+ ER_DUP_ARGUMENT = 1225
+ ER_USER_LIMIT_REACHED = 1226
+ ER_SPECIFIC_ACCESS_DENIED_ERROR = 1227
+ ER_LOCAL_VARIABLE = 1228
+ ER_GLOBAL_VARIABLE = 1229
+ ER_NO_DEFAULT = 1230
+ ER_WRONG_VALUE_FOR_VAR = 1231
+ ER_WRONG_TYPE_FOR_VAR = 1232
+ ER_VAR_CANT_BE_READ = 1233
+ ER_CANT_USE_OPTION_HERE = 1234
+ ER_NOT_SUPPORTED_YET = 1235
+ ER_MASTER_FATAL_ERROR_READING_BINLOG = 1236
+ ER_SLAVE_IGNORED_TABLE = 1237
+ ER_INCORRECT_GLOBAL_LOCAL_VAR = 1238
+ ER_WRONG_FK_DEF = 1239
+ ER_KEY_REF_DO_NOT_MATCH_TABLE_REF = 1240
+ ER_OPERAND_COLUMNS = 1241
+ ER_SUBQUERY_NO_1_ROW = 1242
+ ER_UNKNOWN_STMT_HANDLER = 1243
+ ER_CORRUPT_HELP_DB = 1244
+ ER_CYCLIC_REFERENCE = 1245
+ ER_AUTO_CONVERT = 1246
+ ER_ILLEGAL_REFERENCE = 1247
+ ER_DERIVED_MUST_HAVE_ALIAS = 1248
+ ER_SELECT_REDUCED = 1249
+ ER_TABLENAME_NOT_ALLOWED_HERE = 1250
+ ER_NOT_SUPPORTED_AUTH_MODE = 1251
+ ER_SPATIAL_CANT_HAVE_NULL = 1252
+ ER_COLLATION_CHARSET_MISMATCH = 1253
+ ER_SLAVE_WAS_RUNNING = 1254
+ ER_SLAVE_WAS_NOT_RUNNING = 1255
+ ER_TOO_BIG_FOR_UNCOMPRESS = 1256
+ ER_ZLIB_Z_MEM_ERROR = 1257
+ ER_ZLIB_Z_BUF_ERROR = 1258
+ ER_ZLIB_Z_DATA_ERROR = 1259
+ ER_CUT_VALUE_GROUP_CONCAT = 1260
+ ER_WARN_TOO_FEW_RECORDS = 1261
+ ER_WARN_TOO_MANY_RECORDS = 1262
+ ER_WARN_NULL_TO_NOTNULL = 1263
+ ER_WARN_DATA_OUT_OF_RANGE = 1264
+ WARN_DATA_TRUNCATED = 1265
+ ER_WARN_USING_OTHER_HANDLER = 1266
+ ER_CANT_AGGREGATE_2COLLATIONS = 1267
+ ER_DROP_USER = 1268
+ ER_REVOKE_GRANTS = 1269
+ ER_CANT_AGGREGATE_3COLLATIONS = 1270
+ ER_CANT_AGGREGATE_NCOLLATIONS = 1271
+ ER_VARIABLE_IS_NOT_STRUCT = 1272
+ ER_UNKNOWN_COLLATION = 1273
+ ER_SLAVE_IGNORED_SSL_PARAMS = 1274
+ ER_SERVER_IS_IN_SECURE_AUTH_MODE = 1275
+ ER_WARN_FIELD_RESOLVED = 1276
+ ER_BAD_SLAVE_UNTIL_COND = 1277
+ ER_MISSING_SKIP_SLAVE = 1278
+ ER_UNTIL_COND_IGNORED = 1279
+ ER_WRONG_NAME_FOR_INDEX = 1280
+ ER_WRONG_NAME_FOR_CATALOG = 1281
+ ER_WARN_QC_RESIZE = 1282
+ ER_BAD_FT_COLUMN = 1283
+ ER_UNKNOWN_KEY_CACHE = 1284
+ ER_WARN_HOSTNAME_WONT_WORK = 1285
+ ER_UNKNOWN_STORAGE_ENGINE = 1286
+ ER_WARN_DEPRECATED_SYNTAX = 1287
+ ER_NON_UPDATABLE_TABLE = 1288
+ ER_FEATURE_DISABLED = 1289
+ ER_OPTION_PREVENTS_STATEMENT = 1290
+ ER_DUPLICATED_VALUE_IN_TYPE = 1291
+ ER_TRUNCATED_WRONG_VALUE = 1292
+ ER_TOO_MUCH_AUTO_TIMESTAMP_COLS = 1293
+ ER_INVALID_ON_UPDATE = 1294
+ ER_UNSUPPORTED_PS = 1295
+ ER_GET_ERRMSG = 1296
+ ER_GET_TEMPORARY_ERRMSG = 1297
+ ER_UNKNOWN_TIME_ZONE = 1298
+ ER_WARN_INVALID_TIMESTAMP = 1299
+ ER_INVALID_CHARACTER_STRING = 1300
+ ER_WARN_ALLOWED_PACKET_OVERFLOWED = 1301
+ ER_CONFLICTING_DECLARATIONS = 1302
+ ER_SP_NO_RECURSIVE_CREATE = 1303
+ ER_SP_ALREADY_EXISTS = 1304
+ ER_SP_DOES_NOT_EXIST = 1305
+ ER_SP_DROP_FAILED = 1306
+ ER_SP_STORE_FAILED = 1307
+ ER_SP_LILABEL_MISMATCH = 1308
+ ER_SP_LABEL_REDEFINE = 1309
+ ER_SP_LABEL_MISMATCH = 1310
+ ER_SP_UNINIT_VAR = 1311
+ ER_SP_BADSELECT = 1312
+ ER_SP_BADRETURN = 1313
+ ER_SP_BADSTATEMENT = 1314
+ ER_UPDATE_LOG_DEPRECATED_IGNORED = 1315
+ ER_UPDATE_LOG_DEPRECATED_TRANSLATED = 1316
+ ER_QUERY_INTERRUPTED = 1317
+ ER_SP_WRONG_NO_OF_ARGS = 1318
+ ER_SP_COND_MISMATCH = 1319
+ ER_SP_NORETURN = 1320
+ ER_SP_NORETURNEND = 1321
+ ER_SP_BAD_CURSOR_QUERY = 1322
+ ER_SP_BAD_CURSOR_SELECT = 1323
+ ER_SP_CURSOR_MISMATCH = 1324
+ ER_SP_CURSOR_ALREADY_OPEN = 1325
+ ER_SP_CURSOR_NOT_OPEN = 1326
+ ER_SP_UNDECLARED_VAR = 1327
+ ER_SP_WRONG_NO_OF_FETCH_ARGS = 1328
+ ER_SP_FETCH_NO_DATA = 1329
+ ER_SP_DUP_PARAM = 1330
+ ER_SP_DUP_VAR = 1331
+ ER_SP_DUP_COND = 1332
+ ER_SP_DUP_CURS = 1333
+ ER_SP_CANT_ALTER = 1334
+ ER_SP_SUBSELECT_NYI = 1335
+ ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG = 1336
+ ER_SP_VARCOND_AFTER_CURSHNDLR = 1337
+ ER_SP_CURSOR_AFTER_HANDLER = 1338
+ ER_SP_CASE_NOT_FOUND = 1339
+ ER_FPARSER_TOO_BIG_FILE = 1340
+ ER_FPARSER_BAD_HEADER = 1341
+ ER_FPARSER_EOF_IN_COMMENT = 1342
+ ER_FPARSER_ERROR_IN_PARAMETER = 1343
+ ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER = 1344
+ ER_VIEW_NO_EXPLAIN = 1345
+ ER_FRM_UNKNOWN_TYPE = 1346
+ ER_WRONG_OBJECT = 1347
+ ER_NONUPDATEABLE_COLUMN = 1348
+ ER_VIEW_SELECT_DERIVED = 1349
+ ER_VIEW_SELECT_CLAUSE = 1350
+ ER_VIEW_SELECT_VARIABLE = 1351
+ ER_VIEW_SELECT_TMPTABLE = 1352
+ ER_VIEW_WRONG_LIST = 1353
+ ER_WARN_VIEW_MERGE = 1354
+ ER_WARN_VIEW_WITHOUT_KEY = 1355
+ ER_VIEW_INVALID = 1356
+ ER_SP_NO_DROP_SP = 1357
+ ER_SP_GOTO_IN_HNDLR = 1358
+ ER_TRG_ALREADY_EXISTS = 1359
+ ER_TRG_DOES_NOT_EXIST = 1360
+ ER_TRG_ON_VIEW_OR_TEMP_TABLE = 1361
+ ER_TRG_CANT_CHANGE_ROW = 1362
+ ER_TRG_NO_SUCH_ROW_IN_TRG = 1363
+ ER_NO_DEFAULT_FOR_FIELD = 1364
+ ER_DIVISION_BY_ZERO = 1365
+ ER_TRUNCATED_WRONG_VALUE_FOR_FIELD = 1366
+ ER_ILLEGAL_VALUE_FOR_TYPE = 1367
+ ER_VIEW_NONUPD_CHECK = 1368
+ ER_VIEW_CHECK_FAILED = 1369
+ ER_PROCACCESS_DENIED_ERROR = 1370
+ ER_RELAY_LOG_FAIL = 1371
+ ER_PASSWD_LENGTH = 1372
+ ER_UNKNOWN_TARGET_BINLOG = 1373
+ ER_IO_ERR_LOG_INDEX_READ = 1374
+ ER_BINLOG_PURGE_PROHIBITED = 1375
+ ER_FSEEK_FAIL = 1376
+ ER_BINLOG_PURGE_FATAL_ERR = 1377
+ ER_LOG_IN_USE = 1378
+ ER_LOG_PURGE_UNKNOWN_ERR = 1379
+ ER_RELAY_LOG_INIT = 1380
+ ER_NO_BINARY_LOGGING = 1381
+ ER_RESERVED_SYNTAX = 1382
+ ER_WSAS_FAILED = 1383
+ ER_DIFF_GROUPS_PROC = 1384
+ ER_NO_GROUP_FOR_PROC = 1385
+ ER_ORDER_WITH_PROC = 1386
+ ER_LOGGING_PROHIBIT_CHANGING_OF = 1387
+ ER_NO_FILE_MAPPING = 1388
+ ER_WRONG_MAGIC = 1389
+ ER_PS_MANY_PARAM = 1390
+ ER_KEY_PART_0 = 1391
+ ER_VIEW_CHECKSUM = 1392
+ ER_VIEW_MULTIUPDATE = 1393
+ ER_VIEW_NO_INSERT_FIELD_LIST = 1394
+ ER_VIEW_DELETE_MERGE_VIEW = 1395
+ ER_CANNOT_USER = 1396
+ ER_XAER_NOTA = 1397
+ ER_XAER_INVAL = 1398
+ ER_XAER_RMFAIL = 1399
+ ER_XAER_OUTSIDE = 1400
+ ER_XAER_RMERR = 1401
+ ER_XA_RBROLLBACK = 1402
+ ER_NONEXISTING_PROC_GRANT = 1403
+ ER_PROC_AUTO_GRANT_FAIL = 1404
+ ER_PROC_AUTO_REVOKE_FAIL = 1405
+ ER_DATA_TOO_LONG = 1406
+ ER_SP_BAD_SQLSTATE = 1407
+ ER_STARTUP = 1408
+ ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR = 1409
+ ER_CANT_CREATE_USER_WITH_GRANT = 1410
+ ER_WRONG_VALUE_FOR_TYPE = 1411
+ ER_TABLE_DEF_CHANGED = 1412
+ ER_SP_DUP_HANDLER = 1413
+ ER_SP_NOT_VAR_ARG = 1414
+ ER_SP_NO_RETSET = 1415
+ ER_CANT_CREATE_GEOMETRY_OBJECT = 1416
+ ER_FAILED_ROUTINE_BREAK_BINLOG = 1417
+ ER_BINLOG_UNSAFE_ROUTINE = 1418
+ ER_BINLOG_CREATE_ROUTINE_NEED_SUPER = 1419
+ ER_EXEC_STMT_WITH_OPEN_CURSOR = 1420
+ ER_STMT_HAS_NO_OPEN_CURSOR = 1421
+ ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG = 1422
+ ER_NO_DEFAULT_FOR_VIEW_FIELD = 1423
+ ER_SP_NO_RECURSION = 1424
+ ER_TOO_BIG_SCALE = 1425
+ ER_TOO_BIG_PRECISION = 1426
+ ER_M_BIGGER_THAN_D = 1427
+ ER_WRONG_LOCK_OF_SYSTEM_TABLE = 1428
+ ER_CONNECT_TO_FOREIGN_DATA_SOURCE = 1429
+ ER_QUERY_ON_FOREIGN_DATA_SOURCE = 1430
+ ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST = 1431
+ ER_FOREIGN_DATA_STRING_INVALID_CANT_CREATE = 1432
+ ER_FOREIGN_DATA_STRING_INVALID = 1433
+ ER_CANT_CREATE_FEDERATED_TABLE = 1434
+ ER_TRG_IN_WRONG_SCHEMA = 1435
+ ER_STACK_OVERRUN_NEED_MORE = 1436
+ ER_TOO_LONG_BODY = 1437
+ ER_WARN_CANT_DROP_DEFAULT_KEYCACHE = 1438
+ ER_TOO_BIG_DISPLAYWIDTH = 1439
+ ER_XAER_DUPID = 1440
+ ER_DATETIME_FUNCTION_OVERFLOW = 1441
+ ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG = 1442
+ ER_VIEW_PREVENT_UPDATE = 1443
+ ER_PS_NO_RECURSION = 1444
+ ER_SP_CANT_SET_AUTOCOMMIT = 1445
+ ER_MALFORMED_DEFINER = 1446
+ ER_VIEW_FRM_NO_USER = 1447
+ ER_VIEW_OTHER_USER = 1448
+ ER_NO_SUCH_USER = 1449
+ ER_FORBID_SCHEMA_CHANGE = 1450
+ ER_ROW_IS_REFERENCED_2 = 1451
+ ER_NO_REFERENCED_ROW_2 = 1452
+ ER_SP_BAD_VAR_SHADOW = 1453
+ ER_TRG_NO_DEFINER = 1454
+ ER_OLD_FILE_FORMAT = 1455
+ ER_SP_RECURSION_LIMIT = 1456
+ ER_SP_PROC_TABLE_CORRUPT = 1457
+ ER_SP_WRONG_NAME = 1458
+ ER_TABLE_NEEDS_UPGRADE = 1459
+ ER_SP_NO_AGGREGATE = 1460
+ ER_MAX_PREPARED_STMT_COUNT_REACHED = 1461
+ ER_VIEW_RECURSIVE = 1462
+ ER_NON_GROUPING_FIELD_USED = 1463
+ ER_TABLE_CANT_HANDLE_SPKEYS = 1464
+ ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA = 1465
+ ER_REMOVED_SPACES = 1466
+ ER_AUTOINC_READ_FAILED = 1467
+ ER_USERNAME = 1468
+ ER_HOSTNAME = 1469
+ ER_WRONG_STRING_LENGTH = 1470
+ ER_NON_INSERTABLE_TABLE = 1471
+ ER_ADMIN_WRONG_MRG_TABLE = 1472
+ ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT = 1473
+ ER_NAME_BECOMES_EMPTY = 1474
+ ER_AMBIGUOUS_FIELD_TERM = 1475
+ ER_FOREIGN_SERVER_EXISTS = 1476
+ ER_FOREIGN_SERVER_DOESNT_EXIST = 1477
+ ER_ILLEGAL_HA_CREATE_OPTION = 1478
+ ER_PARTITION_REQUIRES_VALUES_ERROR = 1479
+ ER_PARTITION_WRONG_VALUES_ERROR = 1480
+ ER_PARTITION_MAXVALUE_ERROR = 1481
+ ER_PARTITION_SUBPARTITION_ERROR = 1482
+ ER_PARTITION_SUBPART_MIX_ERROR = 1483
+ ER_PARTITION_WRONG_NO_PART_ERROR = 1484
+ ER_PARTITION_WRONG_NO_SUBPART_ERROR = 1485
+ ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR = 1486
+ ER_NO_CONST_EXPR_IN_RANGE_OR_LIST_ERROR = 1487
+ ER_FIELD_NOT_FOUND_PART_ERROR = 1488
+ ER_LIST_OF_FIELDS_ONLY_IN_HASH_ERROR = 1489
+ ER_INCONSISTENT_PARTITION_INFO_ERROR = 1490
+ ER_PARTITION_FUNC_NOT_ALLOWED_ERROR = 1491
+ ER_PARTITIONS_MUST_BE_DEFINED_ERROR = 1492
+ ER_RANGE_NOT_INCREASING_ERROR = 1493
+ ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR = 1494
+ ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR = 1495
+ ER_PARTITION_ENTRY_ERROR = 1496
+ ER_MIX_HANDLER_ERROR = 1497
+ ER_PARTITION_NOT_DEFINED_ERROR = 1498
+ ER_TOO_MANY_PARTITIONS_ERROR = 1499
+ ER_SUBPARTITION_ERROR = 1500
+ ER_CANT_CREATE_HANDLER_FILE = 1501
+ ER_BLOB_FIELD_IN_PART_FUNC_ERROR = 1502
+ ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF = 1503
+ ER_NO_PARTS_ERROR = 1504
+ ER_PARTITION_MGMT_ON_NONPARTITIONED = 1505
+ ER_FOREIGN_KEY_ON_PARTITIONED = 1506
+ ER_DROP_PARTITION_NON_EXISTENT = 1507
+ ER_DROP_LAST_PARTITION = 1508
+ ER_COALESCE_ONLY_ON_HASH_PARTITION = 1509
+ ER_REORG_HASH_ONLY_ON_SAME_NO = 1510
+ ER_REORG_NO_PARAM_ERROR = 1511
+ ER_ONLY_ON_RANGE_LIST_PARTITION = 1512
+ ER_ADD_PARTITION_SUBPART_ERROR = 1513
+ ER_ADD_PARTITION_NO_NEW_PARTITION = 1514
+ ER_COALESCE_PARTITION_NO_PARTITION = 1515
+ ER_REORG_PARTITION_NOT_EXIST = 1516
+ ER_SAME_NAME_PARTITION = 1517
+ ER_NO_BINLOG_ERROR = 1518
+ ER_CONSECUTIVE_REORG_PARTITIONS = 1519
+ ER_REORG_OUTSIDE_RANGE = 1520
+ ER_PARTITION_FUNCTION_FAILURE = 1521
+ ER_PART_STATE_ERROR = 1522
+ ER_LIMITED_PART_RANGE = 1523
+ ER_PLUGIN_IS_NOT_LOADED = 1524
+ ER_WRONG_VALUE = 1525
+ ER_NO_PARTITION_FOR_GIVEN_VALUE = 1526
+ ER_FILEGROUP_OPTION_ONLY_ONCE = 1527
+ ER_CREATE_FILEGROUP_FAILED = 1528
+ ER_DROP_FILEGROUP_FAILED = 1529
+ ER_TABLESPACE_AUTO_EXTEND_ERROR = 1530
+ ER_WRONG_SIZE_NUMBER = 1531
+ ER_SIZE_OVERFLOW_ERROR = 1532
+ ER_ALTER_FILEGROUP_FAILED = 1533
+ ER_BINLOG_ROW_LOGGING_FAILED = 1534
+ ER_BINLOG_ROW_WRONG_TABLE_DEF = 1535
+ ER_BINLOG_ROW_RBR_TO_SBR = 1536
+ ER_EVENT_ALREADY_EXISTS = 1537
+ ER_EVENT_STORE_FAILED = 1538
+ ER_EVENT_DOES_NOT_EXIST = 1539
+ ER_EVENT_CANT_ALTER = 1540
+ ER_EVENT_DROP_FAILED = 1541
+ ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG = 1542
+ ER_EVENT_ENDS_BEFORE_STARTS = 1543
+ ER_EVENT_EXEC_TIME_IN_THE_PAST = 1544
+ ER_EVENT_OPEN_TABLE_FAILED = 1545
+ ER_EVENT_NEITHER_M_EXPR_NOR_M_AT = 1546
+ ER_OBSOLETE_COL_COUNT_DOESNT_MATCH_CORRUPTED = 1547
+ ER_OBSOLETE_CANNOT_LOAD_FROM_TABLE = 1548
+ ER_EVENT_CANNOT_DELETE = 1549
+ ER_EVENT_COMPILE_ERROR = 1550
+ ER_EVENT_SAME_NAME = 1551
+ ER_EVENT_DATA_TOO_LONG = 1552
+ ER_DROP_INDEX_FK = 1553
+ ER_WARN_DEPRECATED_SYNTAX_WITH_VER = 1554
+ ER_CANT_WRITE_LOCK_LOG_TABLE = 1555
+ ER_CANT_LOCK_LOG_TABLE = 1556
+ ER_FOREIGN_DUPLICATE_KEY_OLD_UNUSED = 1557
+ ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE = 1558
+ ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR = 1559
+ ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT = 1560
+ ER_NDB_CANT_SWITCH_BINLOG_FORMAT = 1561
+ ER_PARTITION_NO_TEMPORARY = 1562
+ ER_PARTITION_CONST_DOMAIN_ERROR = 1563
+ ER_PARTITION_FUNCTION_IS_NOT_ALLOWED = 1564
+ ER_DDL_LOG_ERROR = 1565
+ ER_NULL_IN_VALUES_LESS_THAN = 1566
+ ER_WRONG_PARTITION_NAME = 1567
+ ER_CANT_CHANGE_TX_CHARACTERISTICS = 1568
+ ER_DUP_ENTRY_AUTOINCREMENT_CASE = 1569
+ ER_EVENT_MODIFY_QUEUE_ERROR = 1570
+ ER_EVENT_SET_VAR_ERROR = 1571
+ ER_PARTITION_MERGE_ERROR = 1572
+ ER_CANT_ACTIVATE_LOG = 1573
+ ER_RBR_NOT_AVAILABLE = 1574
+ ER_BASE64_DECODE_ERROR = 1575
+ ER_EVENT_RECURSION_FORBIDDEN = 1576
+ ER_EVENTS_DB_ERROR = 1577
+ ER_ONLY_INTEGERS_ALLOWED = 1578
+ ER_UNSUPORTED_LOG_ENGINE = 1579
+ ER_BAD_LOG_STATEMENT = 1580
+ ER_CANT_RENAME_LOG_TABLE = 1581
+ ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT = 1582
+ ER_WRONG_PARAMETERS_TO_NATIVE_FCT = 1583
+ ER_WRONG_PARAMETERS_TO_STORED_FCT = 1584
+ ER_NATIVE_FCT_NAME_COLLISION = 1585
+ ER_DUP_ENTRY_WITH_KEY_NAME = 1586
+ ER_BINLOG_PURGE_EMFILE = 1587
+ ER_EVENT_CANNOT_CREATE_IN_THE_PAST = 1588
+ ER_EVENT_CANNOT_ALTER_IN_THE_PAST = 1589
+ ER_SLAVE_INCIDENT = 1590
+ ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT = 1591
+ ER_BINLOG_UNSAFE_STATEMENT = 1592
+ ER_SLAVE_FATAL_ERROR = 1593
+ ER_SLAVE_RELAY_LOG_READ_FAILURE = 1594
+ ER_SLAVE_RELAY_LOG_WRITE_FAILURE = 1595
+ ER_SLAVE_CREATE_EVENT_FAILURE = 1596
+ ER_SLAVE_MASTER_COM_FAILURE = 1597
+ ER_BINLOG_LOGGING_IMPOSSIBLE = 1598
+ ER_VIEW_NO_CREATION_CTX = 1599
+ ER_VIEW_INVALID_CREATION_CTX = 1600
+ ER_SR_INVALID_CREATION_CTX = 1601
+ ER_TRG_CORRUPTED_FILE = 1602
+ ER_TRG_NO_CREATION_CTX = 1603
+ ER_TRG_INVALID_CREATION_CTX = 1604
+ ER_EVENT_INVALID_CREATION_CTX = 1605
+ ER_TRG_CANT_OPEN_TABLE = 1606
+ ER_CANT_CREATE_SROUTINE = 1607
+ ER_NEVER_USED = 1608
+ ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT = 1609
+ ER_SLAVE_CORRUPT_EVENT = 1610
+ ER_LOAD_DATA_INVALID_COLUMN_UNUSED = 1611
+ ER_LOG_PURGE_NO_FILE = 1612
+ ER_XA_RBTIMEOUT = 1613
+ ER_XA_RBDEADLOCK = 1614
+ ER_NEED_REPREPARE = 1615
+ ER_DELAYED_NOT_SUPPORTED = 1616
+ WARN_NO_MASTER_INFO = 1617
+ WARN_OPTION_IGNORED = 1618
+ ER_PLUGIN_DELETE_BUILTIN = 1619
+ WARN_PLUGIN_BUSY = 1620
+ ER_VARIABLE_IS_READONLY = 1621
+ ER_WARN_ENGINE_TRANSACTION_ROLLBACK = 1622
+ ER_SLAVE_HEARTBEAT_FAILURE = 1623
+ ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE = 1624
+ ER_NDB_REPLICATION_SCHEMA_ERROR = 1625
+ ER_CONFLICT_FN_PARSE_ERROR = 1626
+ ER_EXCEPTIONS_WRITE_ERROR = 1627
+ ER_TOO_LONG_TABLE_COMMENT = 1628
+ ER_TOO_LONG_FIELD_COMMENT = 1629
+ ER_FUNC_INEXISTENT_NAME_COLLISION = 1630
+ ER_DATABASE_NAME = 1631
+ ER_TABLE_NAME = 1632
+ ER_PARTITION_NAME = 1633
+ ER_SUBPARTITION_NAME = 1634
+ ER_TEMPORARY_NAME = 1635
+ ER_RENAMED_NAME = 1636
+ ER_TOO_MANY_CONCURRENT_TRXS = 1637
+ WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED = 1638
+ ER_DEBUG_SYNC_TIMEOUT = 1639
+ ER_DEBUG_SYNC_HIT_LIMIT = 1640
+ ER_DUP_SIGNAL_SET = 1641
+ ER_SIGNAL_WARN = 1642
+ ER_SIGNAL_NOT_FOUND = 1643
+ ER_SIGNAL_EXCEPTION = 1644
+ ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER = 1645
+ ER_SIGNAL_BAD_CONDITION_TYPE = 1646
+ WARN_COND_ITEM_TRUNCATED = 1647
+ ER_COND_ITEM_TOO_LONG = 1648
+ ER_UNKNOWN_LOCALE = 1649
+ ER_SLAVE_IGNORE_SERVER_IDS = 1650
+ ER_QUERY_CACHE_DISABLED = 1651
+ ER_SAME_NAME_PARTITION_FIELD = 1652
+ ER_PARTITION_COLUMN_LIST_ERROR = 1653
+ ER_WRONG_TYPE_COLUMN_VALUE_ERROR = 1654
+ ER_TOO_MANY_PARTITION_FUNC_FIELDS_ERROR = 1655
+ ER_MAXVALUE_IN_VALUES_IN = 1656
+ ER_TOO_MANY_VALUES_ERROR = 1657
+ ER_ROW_SINGLE_PARTITION_FIELD_ERROR = 1658
+ ER_FIELD_TYPE_NOT_ALLOWED_AS_PARTITION_FIELD = 1659
+ ER_PARTITION_FIELDS_TOO_LONG = 1660
+ ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE = 1661
+ ER_BINLOG_ROW_MODE_AND_STMT_ENGINE = 1662
+ ER_BINLOG_UNSAFE_AND_STMT_ENGINE = 1663
+ ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE = 1664
+ ER_BINLOG_STMT_MODE_AND_ROW_ENGINE = 1665
+ ER_BINLOG_ROW_INJECTION_AND_STMT_MODE = 1666
+ ER_BINLOG_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE = 1667
+ ER_BINLOG_UNSAFE_LIMIT = 1668
+ ER_UNUSED4 = 1669
+ ER_BINLOG_UNSAFE_SYSTEM_TABLE = 1670
+ ER_BINLOG_UNSAFE_AUTOINC_COLUMNS = 1671
+ ER_BINLOG_UNSAFE_UDF = 1672
+ ER_BINLOG_UNSAFE_SYSTEM_VARIABLE = 1673
+ ER_BINLOG_UNSAFE_SYSTEM_FUNCTION = 1674
+ ER_BINLOG_UNSAFE_NONTRANS_AFTER_TRANS = 1675
+ ER_MESSAGE_AND_STATEMENT = 1676
+ ER_SLAVE_CONVERSION_FAILED = 1677
+ ER_SLAVE_CANT_CREATE_CONVERSION = 1678
+ ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT = 1679
+ ER_PATH_LENGTH = 1680
+ ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT = 1681
+ ER_WRONG_NATIVE_TABLE_STRUCTURE = 1682
+ ER_WRONG_PERFSCHEMA_USAGE = 1683
+ ER_WARN_I_S_SKIPPED_TABLE = 1684
+ ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT = 1685
+ ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_DIRECT = 1686
+ ER_SPATIAL_MUST_HAVE_GEOM_COL = 1687
+ ER_TOO_LONG_INDEX_COMMENT = 1688
+ ER_LOCK_ABORTED = 1689
+ ER_DATA_OUT_OF_RANGE = 1690
+ ER_WRONG_SPVAR_TYPE_IN_LIMIT = 1691
+ ER_BINLOG_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE = 1692
+ ER_BINLOG_UNSAFE_MIXED_STATEMENT = 1693
+ ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_SQL_LOG_BIN = 1694
+ ER_STORED_FUNCTION_PREVENTS_SWITCH_SQL_LOG_BIN = 1695
+ ER_FAILED_READ_FROM_PAR_FILE = 1696
+ ER_VALUES_IS_NOT_INT_TYPE_ERROR = 1697
+ ER_ACCESS_DENIED_NO_PASSWORD_ERROR = 1698
+ ER_SET_PASSWORD_AUTH_PLUGIN = 1699
+ ER_GRANT_PLUGIN_USER_EXISTS = 1700
+ ER_TRUNCATE_ILLEGAL_FK = 1701
+ ER_PLUGIN_IS_PERMANENT = 1702
+ ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN = 1703
+ ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX = 1704
+ ER_STMT_CACHE_FULL = 1705
+ ER_MULTI_UPDATE_KEY_CONFLICT = 1706
+ ER_TABLE_NEEDS_REBUILD = 1707
+ WARN_OPTION_BELOW_LIMIT = 1708
+ ER_INDEX_COLUMN_TOO_LONG = 1709
+ ER_ERROR_IN_TRIGGER_BODY = 1710
+ ER_ERROR_IN_UNKNOWN_TRIGGER_BODY = 1711
+ ER_INDEX_CORRUPT = 1712
+ ER_UNDO_RECORD_TOO_BIG = 1713
+ ER_BINLOG_UNSAFE_INSERT_IGNORE_SELECT = 1714
+ ER_BINLOG_UNSAFE_INSERT_SELECT_UPDATE = 1715
+ ER_BINLOG_UNSAFE_REPLACE_SELECT = 1716
+ ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT = 1717
+ ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT = 1718
+ ER_BINLOG_UNSAFE_UPDATE_IGNORE = 1719
+ ER_PLUGIN_NO_UNINSTALL = 1720
+ ER_PLUGIN_NO_INSTALL = 1721
+ ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT = 1722
+ ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC = 1723
+ ER_BINLOG_UNSAFE_INSERT_TWO_KEYS = 1724
+ ER_TABLE_IN_FK_CHECK = 1725
+ ER_UNSUPPORTED_ENGINE = 1726
+ ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST = 1727
+ ER_CANNOT_LOAD_FROM_TABLE_V2 = 1728
+ ER_MASTER_DELAY_VALUE_OUT_OF_RANGE = 1729
+ ER_ONLY_FD_AND_RBR_EVENTS_ALLOWED_IN_BINLOG_STATEMENT = 1730
+ ER_PARTITION_EXCHANGE_DIFFERENT_OPTION = 1731
+ ER_PARTITION_EXCHANGE_PART_TABLE = 1732
+ ER_PARTITION_EXCHANGE_TEMP_TABLE = 1733
+ ER_PARTITION_INSTEAD_OF_SUBPARTITION = 1734
+ ER_UNKNOWN_PARTITION = 1735
+ ER_TABLES_DIFFERENT_METADATA = 1736
+ ER_ROW_DOES_NOT_MATCH_PARTITION = 1737
+ ER_BINLOG_CACHE_SIZE_GREATER_THAN_MAX = 1738
+ ER_WARN_INDEX_NOT_APPLICABLE = 1739
+ ER_PARTITION_EXCHANGE_FOREIGN_KEY = 1740
+ ER_NO_SUCH_KEY_VALUE = 1741
+ ER_RPL_INFO_DATA_TOO_LONG = 1742
+ ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE = 1743
+ ER_BINLOG_READ_EVENT_CHECKSUM_FAILURE = 1744
+ ER_BINLOG_STMT_CACHE_SIZE_GREATER_THAN_MAX = 1745
+ ER_CANT_UPDATE_TABLE_IN_CREATE_TABLE_SELECT = 1746
+ ER_PARTITION_CLAUSE_ON_NONPARTITIONED = 1747
+ ER_ROW_DOES_NOT_MATCH_GIVEN_PARTITION_SET = 1748
+ ER_NO_SUCH_PARTITION__UNUSED = 1749
+ ER_CHANGE_RPL_INFO_REPOSITORY_FAILURE = 1750
+ ER_WARNING_NOT_COMPLETE_ROLLBACK_WITH_CREATED_TEMP_TABLE = 1751
+ ER_WARNING_NOT_COMPLETE_ROLLBACK_WITH_DROPPED_TEMP_TABLE = 1752
+ ER_MTS_FEATURE_IS_NOT_SUPPORTED = 1753
+ ER_MTS_UPDATED_DBS_GREATER_MAX = 1754
+ ER_MTS_CANT_PARALLEL = 1755
+ ER_MTS_INCONSISTENT_DATA = 1756
+ ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITIONING = 1757
+ ER_DA_INVALID_CONDITION_NUMBER = 1758
+ ER_INSECURE_PLAIN_TEXT = 1759
+ ER_INSECURE_CHANGE_MASTER = 1760
+ ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO = 1761
+ ER_FOREIGN_DUPLICATE_KEY_WITHOUT_CHILD_INFO = 1762
+ ER_SQLTHREAD_WITH_SECURE_SLAVE = 1763
+ ER_TABLE_HAS_NO_FT = 1764
+ ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRIGGER = 1765
+ ER_VARIABLE_NOT_SETTABLE_IN_TRANSACTION = 1766
+ ER_GTID_NEXT_IS_NOT_IN_GTID_NEXT_LIST = 1767
+ ER_CANT_CHANGE_GTID_NEXT_IN_TRANSACTION = 1768
+ ER_SET_STATEMENT_CANNOT_INVOKE_FUNCTION = 1769
+ ER_GTID_NEXT_CANT_BE_AUTOMATIC_IF_GTID_NEXT_LIST_IS_NON_NULL = 1770
+ ER_SKIPPING_LOGGED_TRANSACTION = 1771
+ ER_MALFORMED_GTID_SET_SPECIFICATION = 1772
+ ER_MALFORMED_GTID_SET_ENCODING = 1773
+ ER_MALFORMED_GTID_SPECIFICATION = 1774
+ ER_GNO_EXHAUSTED = 1775
+ ER_BAD_SLAVE_AUTO_POSITION = 1776
+ ER_AUTO_POSITION_REQUIRES_GTID_MODE_NOT_OFF = 1777
+ ER_CANT_DO_IMPLICIT_COMMIT_IN_TRX_WHEN_GTID_NEXT_IS_SET = 1778
+ ER_GTID_MODE_ON_REQUIRES_ENFORCE_GTID_CONSISTENCY_ON = 1779
+ ER_GTID_MODE_REQUIRES_BINLOG = 1780
+ ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF = 1781
+ ER_CANT_SET_GTID_NEXT_TO_ANONYMOUS_WHEN_GTID_MODE_IS_ON = 1782
+ ER_CANT_SET_GTID_NEXT_LIST_TO_NON_NULL_WHEN_GTID_MODE_IS_OFF = 1783
+ ER_FOUND_GTID_EVENT_WHEN_GTID_MODE_IS_OFF__UNUSED = 1784
+ ER_GTID_UNSAFE_NON_TRANSACTIONAL_TABLE = 1785
+ ER_GTID_UNSAFE_CREATE_SELECT = 1786
+ ER_GTID_UNSAFE_CREATE_DROP_TEMPORARY_TABLE_IN_TRANSACTION = 1787
+ ER_GTID_MODE_CAN_ONLY_CHANGE_ONE_STEP_AT_A_TIME = 1788
+ ER_MASTER_HAS_PURGED_REQUIRED_GTIDS = 1789
+ ER_CANT_SET_GTID_NEXT_WHEN_OWNING_GTID = 1790
+ ER_UNKNOWN_EXPLAIN_FORMAT = 1791
+ ER_CANT_EXECUTE_IN_READ_ONLY_TRANSACTION = 1792
+ ER_TOO_LONG_TABLE_PARTITION_COMMENT = 1793
+ ER_SLAVE_CONFIGURATION = 1794
+ ER_INNODB_FT_LIMIT = 1795
+ ER_INNODB_NO_FT_TEMP_TABLE = 1796
+ ER_INNODB_FT_WRONG_DOCID_COLUMN = 1797
+ ER_INNODB_FT_WRONG_DOCID_INDEX = 1798
+ ER_INNODB_ONLINE_LOG_TOO_BIG = 1799
+ ER_UNKNOWN_ALTER_ALGORITHM = 1800
+ ER_UNKNOWN_ALTER_LOCK = 1801
+ ER_MTS_CHANGE_MASTER_CANT_RUN_WITH_GAPS = 1802
+ ER_MTS_RECOVERY_FAILURE = 1803
+ ER_MTS_RESET_WORKERS = 1804
+ ER_COL_COUNT_DOESNT_MATCH_CORRUPTED_V2 = 1805
+ ER_SLAVE_SILENT_RETRY_TRANSACTION = 1806
+ ER_DISCARD_FK_CHECKS_RUNNING = 1807
+ ER_TABLE_SCHEMA_MISMATCH = 1808
+ ER_TABLE_IN_SYSTEM_TABLESPACE = 1809
+ ER_IO_READ_ERROR = 1810
+ ER_IO_WRITE_ERROR = 1811
+ ER_TABLESPACE_MISSING = 1812
+ ER_TABLESPACE_EXISTS = 1813
+ ER_TABLESPACE_DISCARDED = 1814
+ ER_INTERNAL_ERROR = 1815
+ ER_INNODB_IMPORT_ERROR = 1816
+ ER_INNODB_INDEX_CORRUPT = 1817
+ ER_INVALID_YEAR_COLUMN_LENGTH = 1818
+ ER_NOT_VALID_PASSWORD = 1819
+ ER_MUST_CHANGE_PASSWORD = 1820
+ ER_FK_NO_INDEX_CHILD = 1821
+ ER_FK_NO_INDEX_PARENT = 1822
+ ER_FK_FAIL_ADD_SYSTEM = 1823
+ ER_FK_CANNOT_OPEN_PARENT = 1824
+ ER_FK_INCORRECT_OPTION = 1825
+ ER_FK_DUP_NAME = 1826
+ ER_PASSWORD_FORMAT = 1827
+ ER_FK_COLUMN_CANNOT_DROP = 1828
+ ER_FK_COLUMN_CANNOT_DROP_CHILD = 1829
+ ER_FK_COLUMN_NOT_NULL = 1830
+ ER_DUP_INDEX = 1831
+ ER_FK_COLUMN_CANNOT_CHANGE = 1832
+ ER_FK_COLUMN_CANNOT_CHANGE_CHILD = 1833
+ ER_UNUSED5 = 1834
+ ER_MALFORMED_PACKET = 1835
+ ER_READ_ONLY_MODE = 1836
+ ER_GTID_NEXT_TYPE_UNDEFINED_GROUP = 1837
+ ER_VARIABLE_NOT_SETTABLE_IN_SP = 1838
+ ER_CANT_SET_GTID_PURGED_WHEN_GTID_MODE_IS_OFF = 1839
+ ER_CANT_SET_GTID_PURGED_WHEN_GTID_EXECUTED_IS_NOT_EMPTY = 1840
+ ER_CANT_SET_GTID_PURGED_WHEN_OWNED_GTIDS_IS_NOT_EMPTY = 1841
+ ER_GTID_PURGED_WAS_CHANGED = 1842
+ ER_GTID_EXECUTED_WAS_CHANGED = 1843
+ ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES = 1844
+ ER_ALTER_OPERATION_NOT_SUPPORTED = 1845
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON = 1846
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COPY = 1847
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_PARTITION = 1848
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_RENAME = 1849
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COLUMN_TYPE = 1850
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_CHECK = 1851
+ ER_UNUSED6 = 1852
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOPK = 1853
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_AUTOINC = 1854
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_HIDDEN_FTS = 1855
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_CHANGE_FTS = 1856
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS = 1857
+ ER_SQL_SLAVE_SKIP_COUNTER_NOT_SETTABLE_IN_GTID_MODE = 1858
+ ER_DUP_UNKNOWN_IN_INDEX = 1859
+ ER_IDENT_CAUSES_TOO_LONG_PATH = 1860
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL = 1861
+ ER_MUST_CHANGE_PASSWORD_LOGIN = 1862
+ ER_ROW_IN_WRONG_PARTITION = 1863
+ ER_MTS_EVENT_BIGGER_PENDING_JOBS_SIZE_MAX = 1864
+ ER_INNODB_NO_FT_USES_PARSER = 1865
+ ER_BINLOG_LOGICAL_CORRUPTION = 1866
+ ER_WARN_PURGE_LOG_IN_USE = 1867
+ ER_WARN_PURGE_LOG_IS_ACTIVE = 1868
+ ER_AUTO_INCREMENT_CONFLICT = 1869
+ WARN_ON_BLOCKHOLE_IN_RBR = 1870
+ ER_SLAVE_MI_INIT_REPOSITORY = 1871
+ ER_SLAVE_RLI_INIT_REPOSITORY = 1872
+ ER_ACCESS_DENIED_CHANGE_USER_ERROR = 1873
+ ER_INNODB_READ_ONLY = 1874
+ ER_STOP_SLAVE_SQL_THREAD_TIMEOUT = 1875
+ ER_STOP_SLAVE_IO_THREAD_TIMEOUT = 1876
+ ER_TABLE_CORRUPT = 1877
+ ER_TEMP_FILE_WRITE_FAILURE = 1878
+ ER_INNODB_FT_AUX_NOT_HEX_ID = 1879
+ ER_OLD_TEMPORALS_UPGRADED = 1880
+ ER_INNODB_FORCED_RECOVERY = 1881
+ ER_AES_INVALID_IV = 1882
+ ER_PLUGIN_CANNOT_BE_UNINSTALLED = 1883
+ ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP = 1884
+ ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER = 1885
+ ER_FILE_CORRUPT = 3000
+ ER_ERROR_ON_MASTER = 3001
+ ER_INCONSISTENT_ERROR = 3002
+ ER_STORAGE_ENGINE_NOT_LOADED = 3003
+ ER_GET_STACKED_DA_WITHOUT_ACTIVE_HANDLER = 3004
+ ER_WARN_LEGACY_SYNTAX_CONVERTED = 3005
+ ER_BINLOG_UNSAFE_FULLTEXT_PLUGIN = 3006
+ ER_CANNOT_DISCARD_TEMPORARY_TABLE = 3007
+ ER_FK_DEPTH_EXCEEDED = 3008
+ ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE_V2 = 3009
+ ER_WARN_TRIGGER_DOESNT_HAVE_CREATED = 3010
+ ER_REFERENCED_TRG_DOES_NOT_EXIST = 3011
+ ER_EXPLAIN_NOT_SUPPORTED = 3012
+ ER_INVALID_FIELD_SIZE = 3013
+ ER_MISSING_HA_CREATE_OPTION = 3014
+ ER_ENGINE_OUT_OF_MEMORY = 3015
+ ER_PASSWORD_EXPIRE_ANONYMOUS_USER = 3016
+ ER_SLAVE_SQL_THREAD_MUST_STOP = 3017
+ ER_NO_FT_MATERIALIZED_SUBQUERY = 3018
+ ER_INNODB_UNDO_LOG_FULL = 3019
+ ER_INVALID_ARGUMENT_FOR_LOGARITHM = 3020
+ ER_SLAVE_CHANNEL_IO_THREAD_MUST_STOP = 3021
+ ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO = 3022
+ ER_WARN_ONLY_MASTER_LOG_FILE_NO_POS = 3023
+ ER_QUERY_TIMEOUT = 3024
+ ER_NON_RO_SELECT_DISABLE_TIMER = 3025
+ ER_DUP_LIST_ENTRY = 3026
+ ER_SQL_MODE_NO_EFFECT = 3027
+ ER_AGGREGATE_ORDER_FOR_UNION = 3028
+ ER_AGGREGATE_ORDER_NON_AGG_QUERY = 3029
+ ER_SLAVE_WORKER_STOPPED_PREVIOUS_THD_ERROR = 3030
+ ER_DONT_SUPPORT_SLAVE_PRESERVE_COMMIT_ORDER = 3031
+ ER_SERVER_OFFLINE_MODE = 3032
+ ER_GIS_DIFFERENT_SRIDS = 3033
+ ER_GIS_UNSUPPORTED_ARGUMENT = 3034
+ ER_GIS_UNKNOWN_ERROR = 3035
+ ER_GIS_UNKNOWN_EXCEPTION = 3036
+ ER_GIS_INVALID_DATA = 3037
+ ER_BOOST_GEOMETRY_EMPTY_INPUT_EXCEPTION = 3038
+ ER_BOOST_GEOMETRY_CENTROID_EXCEPTION = 3039
+ ER_BOOST_GEOMETRY_OVERLAY_INVALID_INPUT_EXCEPTION = 3040
+ ER_BOOST_GEOMETRY_TURN_INFO_EXCEPTION = 3041
+ ER_BOOST_GEOMETRY_SELF_INTERSECTION_POINT_EXCEPTION = 3042
+ ER_BOOST_GEOMETRY_UNKNOWN_EXCEPTION = 3043
+ ER_STD_BAD_ALLOC_ERROR = 3044
+ ER_STD_DOMAIN_ERROR = 3045
+ ER_STD_LENGTH_ERROR = 3046
+ ER_STD_INVALID_ARGUMENT = 3047
+ ER_STD_OUT_OF_RANGE_ERROR = 3048
+ ER_STD_OVERFLOW_ERROR = 3049
+ ER_STD_RANGE_ERROR = 3050
+ ER_STD_UNDERFLOW_ERROR = 3051
+ ER_STD_LOGIC_ERROR = 3052
+ ER_STD_RUNTIME_ERROR = 3053
+ ER_STD_UNKNOWN_EXCEPTION = 3054
+ ER_GIS_DATA_WRONG_ENDIANESS = 3055
+ ER_CHANGE_MASTER_PASSWORD_LENGTH = 3056
+ ER_USER_LOCK_WRONG_NAME = 3057
+ ER_USER_LOCK_DEADLOCK = 3058
+ ER_REPLACE_INACCESSIBLE_ROWS = 3059
+ ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_GIS = 3060
+ ER_ILLEGAL_USER_VAR = 3061
+ ER_GTID_MODE_OFF = 3062
+ ER_UNSUPPORTED_BY_REPLICATION_THREAD = 3063
+ ER_INCORRECT_TYPE = 3064
+ ER_FIELD_IN_ORDER_NOT_SELECT = 3065
+ ER_AGGREGATE_IN_ORDER_NOT_SELECT = 3066
+ ER_INVALID_RPL_WILD_TABLE_FILTER_PATTERN = 3067
+ ER_NET_OK_PACKET_TOO_LARGE = 3068
+ ER_INVALID_JSON_DATA = 3069
+ ER_INVALID_GEOJSON_MISSING_MEMBER = 3070
+ ER_INVALID_GEOJSON_WRONG_TYPE = 3071
+ ER_INVALID_GEOJSON_UNSPECIFIED = 3072
+ ER_DIMENSION_UNSUPPORTED = 3073
+ ER_SLAVE_CHANNEL_DOES_NOT_EXIST = 3074
+ ER_SLAVE_MULTIPLE_CHANNELS_HOST_PORT = 3075
+ ER_SLAVE_CHANNEL_NAME_INVALID_OR_TOO_LONG = 3076
+ ER_SLAVE_NEW_CHANNEL_WRONG_REPOSITORY = 3077
+ ER_SLAVE_CHANNEL_DELETE = 3078
+ ER_SLAVE_MULTIPLE_CHANNELS_CMD = 3079
+ ER_SLAVE_MAX_CHANNELS_EXCEEDED = 3080
+ ER_SLAVE_CHANNEL_MUST_STOP = 3081
+ ER_SLAVE_CHANNEL_NOT_RUNNING = 3082
+ ER_SLAVE_CHANNEL_WAS_RUNNING = 3083
+ ER_SLAVE_CHANNEL_WAS_NOT_RUNNING = 3084
+ ER_SLAVE_CHANNEL_SQL_THREAD_MUST_STOP = 3085
+ ER_SLAVE_CHANNEL_SQL_SKIP_COUNTER = 3086
+ ER_WRONG_FIELD_WITH_GROUP_V2 = 3087
+ ER_MIX_OF_GROUP_FUNC_AND_FIELDS_V2 = 3088
+ ER_WARN_DEPRECATED_SYSVAR_UPDATE = 3089
+ ER_WARN_DEPRECATED_SQLMODE = 3090
+ ER_CANNOT_LOG_PARTIAL_DROP_DATABASE_WITH_GTID = 3091
+ ER_GROUP_REPLICATION_CONFIGURATION = 3092
+ ER_GROUP_REPLICATION_RUNNING = 3093
+ ER_GROUP_REPLICATION_APPLIER_INIT_ERROR = 3094
+ ER_GROUP_REPLICATION_STOP_APPLIER_THREAD_TIMEOUT = 3095
+ ER_GROUP_REPLICATION_COMMUNICATION_LAYER_SESSION_ERROR = 3096
+ ER_GROUP_REPLICATION_COMMUNICATION_LAYER_JOIN_ERROR = 3097
+ ER_BEFORE_DML_VALIDATION_ERROR = 3098
+ ER_PREVENTS_VARIABLE_WITHOUT_RBR = 3099
+ ER_RUN_HOOK_ERROR = 3100
+ ER_TRANSACTION_ROLLBACK_DURING_COMMIT = 3101
+ ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED = 3102
+ ER_UNSUPPORTED_ALTER_INPLACE_ON_VIRTUAL_COLUMN = 3103
+ ER_WRONG_FK_OPTION_FOR_GENERATED_COLUMN = 3104
+ ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN = 3105
+ ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN = 3106
+ ER_GENERATED_COLUMN_NON_PRIOR = 3107
+ ER_DEPENDENT_BY_GENERATED_COLUMN = 3108
+ ER_GENERATED_COLUMN_REF_AUTO_INC = 3109
+ ER_FEATURE_NOT_AVAILABLE = 3110
+ ER_CANT_SET_GTID_MODE = 3111
+ ER_CANT_USE_AUTO_POSITION_WITH_GTID_MODE_OFF = 3112
+ ER_CANT_REPLICATE_ANONYMOUS_WITH_AUTO_POSITION = 3113
+ ER_CANT_REPLICATE_ANONYMOUS_WITH_GTID_MODE_ON = 3114
+ ER_CANT_REPLICATE_GTID_WITH_GTID_MODE_OFF = 3115
+ ER_CANT_SET_ENFORCE_GTID_CONSISTENCY_ON_WITH_ONGOING_GTID_VIOLATING_TRANSACTIONS = 3116
+ ER_SET_ENFORCE_GTID_CONSISTENCY_WARN_WITH_ONGOING_GTID_VIOLATING_TRANSACTIONS = 3117
+ ER_ACCOUNT_HAS_BEEN_LOCKED = 3118
+ ER_WRONG_TABLESPACE_NAME = 3119
+ ER_TABLESPACE_IS_NOT_EMPTY = 3120
+ ER_WRONG_FILE_NAME = 3121
+ ER_BOOST_GEOMETRY_INCONSISTENT_TURNS_EXCEPTION = 3122
+ ER_WARN_OPTIMIZER_HINT_SYNTAX_ERROR = 3123
+ ER_WARN_BAD_MAX_EXECUTION_TIME = 3124
+ ER_WARN_UNSUPPORTED_MAX_EXECUTION_TIME = 3125
+ ER_WARN_CONFLICTING_HINT = 3126
+ ER_WARN_UNKNOWN_QB_NAME = 3127
+ ER_UNRESOLVED_HINT_NAME = 3128
+ ER_WARN_ON_MODIFYING_GTID_EXECUTED_TABLE = 3129
+ ER_PLUGGABLE_PROTOCOL_COMMAND_NOT_SUPPORTED = 3130
+ ER_LOCKING_SERVICE_WRONG_NAME = 3131
+ ER_LOCKING_SERVICE_DEADLOCK = 3132
+ ER_LOCKING_SERVICE_TIMEOUT = 3133
+ ER_GIS_MAX_POINTS_IN_GEOMETRY_OVERFLOWED = 3134
+ ER_SQL_MODE_MERGED = 3135
+ ER_VTOKEN_PLUGIN_TOKEN_MISMATCH = 3136
+ ER_VTOKEN_PLUGIN_TOKEN_NOT_FOUND = 3137
+ ER_CANT_SET_VARIABLE_WHEN_OWNING_GTID = 3138
+ ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED = 3139
+ ER_INVALID_JSON_TEXT = 3140
+ ER_INVALID_JSON_TEXT_IN_PARAM = 3141
+ ER_INVALID_JSON_BINARY_DATA = 3142
+ ER_INVALID_JSON_PATH = 3143
+ ER_INVALID_JSON_CHARSET = 3144
+ ER_INVALID_JSON_CHARSET_IN_FUNCTION = 3145
+ ER_INVALID_TYPE_FOR_JSON = 3146
+ ER_INVALID_CAST_TO_JSON = 3147
+ ER_INVALID_JSON_PATH_CHARSET = 3148
+ ER_INVALID_JSON_PATH_WILDCARD = 3149
+ ER_JSON_VALUE_TOO_BIG = 3150
+ ER_JSON_KEY_TOO_BIG = 3151
+ ER_JSON_USED_AS_KEY = 3152
+ ER_JSON_VACUOUS_PATH = 3153
+ ER_JSON_BAD_ONE_OR_ALL_ARG = 3154
+ ER_NUMERIC_JSON_VALUE_OUT_OF_RANGE = 3155
+ ER_INVALID_JSON_VALUE_FOR_CAST = 3156
+ ER_JSON_DOCUMENT_TOO_DEEP = 3157
+ ER_JSON_DOCUMENT_NULL_KEY = 3158
+ ER_SECURE_TRANSPORT_REQUIRED = 3159
+ ER_NO_SECURE_TRANSPORTS_CONFIGURED = 3160
+ ER_DISABLED_STORAGE_ENGINE = 3161
+ ER_USER_DOES_NOT_EXIST = 3162
+ ER_USER_ALREADY_EXISTS = 3163
+ ER_AUDIT_API_ABORT = 3164
+ ER_INVALID_JSON_PATH_ARRAY_CELL = 3165
+ ER_BUFPOOL_RESIZE_INPROGRESS = 3166
+ ER_FEATURE_DISABLED_SEE_DOC = 3167
+ ER_SERVER_ISNT_AVAILABLE = 3168
+ ER_SESSION_WAS_KILLED = 3169
+ ER_CAPACITY_EXCEEDED = 3170
+ ER_CAPACITY_EXCEEDED_IN_RANGE_OPTIMIZER = 3171
+ ER_TABLE_NEEDS_UPG_PART = 3172
+ ER_CANT_WAIT_FOR_EXECUTED_GTID_SET_WHILE_OWNING_A_GTID = 3173
+ ER_CANNOT_ADD_FOREIGN_BASE_COL_VIRTUAL = 3174
+ ER_CANNOT_CREATE_VIRTUAL_INDEX_CONSTRAINT = 3175
+ ER_ERROR_ON_MODIFYING_GTID_EXECUTED_TABLE = 3176
+ ER_LOCK_REFUSED_BY_ENGINE = 3177
+ ER_UNSUPPORTED_ALTER_ONLINE_ON_VIRTUAL_COLUMN = 3178
+ ER_MASTER_KEY_ROTATION_NOT_SUPPORTED_BY_SE = 3179
+ ER_MASTER_KEY_ROTATION_ERROR_BY_SE = 3180
+ ER_MASTER_KEY_ROTATION_BINLOG_FAILED = 3181
+ ER_MASTER_KEY_ROTATION_SE_UNAVAILABLE = 3182
+ ER_TABLESPACE_CANNOT_ENCRYPT = 3183
+ ER_INVALID_ENCRYPTION_OPTION = 3184
+ ER_CANNOT_FIND_KEY_IN_KEYRING = 3185
+ ER_CAPACITY_EXCEEDED_IN_PARSER = 3186
+ ER_UNSUPPORTED_ALTER_ENCRYPTION_INPLACE = 3187
+ ER_KEYRING_UDF_KEYRING_SERVICE_ERROR = 3188
+ ER_USER_COLUMN_OLD_LENGTH = 3189
+)
| Name | ++ | + | |
|---|---|---|---|
| {invitee.email} | +{invitee.name} | ++ + + | ++ + | +
+
+ );
+ }
+}
+
+function mapStateToProps(state) {
+ return {
+ searchQuery: getUsersSearchQuery(state.users),
+ pendingInvitesCount: getInviteesCount(state.users),
+ externalUserMngLinkName: state.users.externalUserMngLinkName,
+ externalUserMngLinkUrl: state.users.externalUserMngLinkUrl,
+ canInvite: state.users.canInvite,
+ };
+}
+
+const mapDispatchToProps = {
+ setUsersSearchQuery,
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(UsersActionBar);
diff --git a/public/app/features/users/UsersListPage.test.tsx b/public/app/features/users/UsersListPage.test.tsx
new file mode 100644
index 00000000000..6f59df36b55
--- /dev/null
+++ b/public/app/features/users/UsersListPage.test.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { UsersListPage, Props } from './UsersListPage';
+import { Invitee, NavModel, OrgUser } from 'app/types';
+import { getMockUser } from './__mocks__/userMocks';
+import appEvents from '../../core/app_events';
+
+jest.mock('../../core/app_events', () => ({
+ emit: jest.fn(),
+}));
+
+const setup = (propOverrides?: object) => {
+ const props: Props = {
+ navModel: {} as NavModel,
+ users: [] as OrgUser[],
+ invitees: [] as Invitee[],
+ searchQuery: '',
+ externalUserMngInfo: '',
+ revokeInvite: jest.fn(),
+ loadInvitees: jest.fn(),
+ loadUsers: jest.fn(),
+ updateUser: jest.fn(),
+ removeUser: jest.fn(),
+ setUsersSearchQuery: jest.fn(),
+ };
+
+ Object.assign(props, propOverrides);
+
+ const wrapper = shallow(
+
+ {pendingInvitesCount > 0 && (
+
+
+
+
+
+ )}
+
+ {canInvite && (
+
+ Invite
+
+ )}
+ {externalUserMngLinkUrl && (
+
+ {externalUserMngLinkName}
+
+ )}
+
+
+ );
+ }
+}
+
+function mapStateToProps(state) {
+ return {
+ navModel: getNavModel(state.navIndex, 'users'),
+ users: getUsers(state.users),
+ searchQuery: getUsersSearchQuery(state.users),
+ invitees: getInvitees(state.users),
+ externalUserMngInfo: state.users.externalUserMngInfo,
+ };
+}
+
+const mapDispatchToProps = {
+ loadUsers,
+ loadInvitees,
+ setUsersSearchQuery,
+ updateUser,
+ removeUser,
+ revokeInvite,
+};
+
+export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(UsersListPage));
diff --git a/public/app/features/users/UsersTable.test.tsx b/public/app/features/users/UsersTable.test.tsx
new file mode 100644
index 00000000000..6e88dbf4a58
--- /dev/null
+++ b/public/app/features/users/UsersTable.test.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import UsersTable, { Props } from './UsersTable';
+import { OrgUser } from 'app/types';
+import { getMockUsers } from './__mocks__/userMocks';
+
+const setup = (propOverrides?: object) => {
+ const props: Props = {
+ users: [] as OrgUser[],
+ onRoleChange: jest.fn(),
+ onRemoveUser: jest.fn(),
+ };
+
+ Object.assign(props, propOverrides);
+
+ return shallow(
+ this.onRevokeInvite(code)} />
+ ) : (
+ this.onRoleChange(role, user)}
+ onRemoveUser={user => this.onRemoveUser(user)}
+ />
+ )}
+
+ | + | Login | +Seen | +Role | ++ | |
|---|---|---|---|---|---|
|
+ |
+ {user.login} | ++ {user.email} + | +{user.lastSeenAtAge} | +
+
+
+
+ |
+
+ onRemoveUser(user)} className="btn btn-danger btn-mini">
+
+
+ |
+
| + Email + | ++ Name + | ++ | + |
|---|
| + Email + | ++ Name + | ++ | + |
|---|---|---|---|
| + invitee-0@test.com + | ++ invitee-0 + | ++ + Â + | ++ + | +
| + invitee-1@test.com + | ++ invitee-1 + | ++ + Â + | ++ + | +
| + invitee-2@test.com + | ++ invitee-2 + | ++ + Â + | ++ + | +
| + invitee-3@test.com + | ++ invitee-3 + | ++ + Â + | ++ + | +
| + invitee-4@test.com + | ++ invitee-4 + | ++ + Â + | ++ + | +
| + invitee-5@test.com + | ++ invitee-5 + | ++ + Â + | ++ + | +
+
+`;
+
+exports[`Render should render pending invites button 1`] = `
+
+
+
+
+
+
+`;
+
+exports[`Render should show external user management button 1`] = `
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`Render should show invite button 1`] = `
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/public/app/features/users/__snapshots__/UsersListPage.test.tsx.snap b/public/app/features/users/__snapshots__/UsersListPage.test.tsx.snap
new file mode 100644
index 00000000000..b3432491ea2
--- /dev/null
+++ b/public/app/features/users/__snapshots__/UsersListPage.test.tsx.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render component 1`] = `
+
+
+
+
+
+ Invite
+
+
+
+
+
+`;
diff --git a/public/app/features/users/__snapshots__/UsersTable.test.tsx.snap b/public/app/features/users/__snapshots__/UsersTable.test.tsx.snap
new file mode 100644
index 00000000000..efbc7ae72cb
--- /dev/null
+++ b/public/app/features/users/__snapshots__/UsersTable.test.tsx.snap
@@ -0,0 +1,444 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render component 1`] = `
+
+
+| + | + Login + | ++ Email + | ++ Seen + | ++ Role + | ++ |
|---|
| + | + Login + | ++ Email + | ++ Seen + | ++ Role + | ++ |
|---|---|---|---|---|---|
|
+ |
+ + user-0 + | ++ + user-0@test.com + + | ++ |
+
+
+
+ |
+
+
+
+
+ |
+
|
+ |
+ + user-1 + | ++ + user-1@test.com + + | ++ |
+
+
+
+ |
+
+
+
+
+ |
+
|
+ |
+ + user-2 + | ++ + user-2@test.com + + | ++ |
+
+
+
+ |
+
+
+
+
+ |
+
|
+ |
+ + user-3 + | ++ + user-3@test.com + + | ++ |
+
+
+
+ |
+
+
+
+
+ |
+
|
+ |
+ + user-4 + | ++ + user-4@test.com + + | ++ |
+
+
+
+ |
+
+
+
+
+ |
+
|
+ |
+ + user-5 + | ++ + user-5@test.com + + | ++ |
+
+
+
+ |
+
+
+
+
+ |
+