这是indexloc提供的服务，不要输入任何密码
Skip to content

fix track_table pattern, error handling in run_sql (close #392) #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 14, 2018
Merged

fix track_table pattern, error handling in run_sql (close #392) #448

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
397f4a2
console: fix track_table pattern, error handling in run_sql
praveenweb Sep 14, 2018
89776d0
Merge branch 'master' into console-error-handling
praveenweb Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 3 additions & 24 deletions console/src/components/Services/Data/RawSQL/Actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import defaultState from './State';
import Endpoints, { globalCookiePolicy } from '../../../../Endpoints';
import { loadSchema } from '../DataActions';
import { loadSchema, handleMigrationErrors } from '../DataActions';
import {
showErrorNotification,
showSuccessNotification,
Expand Down Expand Up @@ -52,6 +52,7 @@ const executeSQL = isMigration => (dispatch, getState) => {
if (trackViewName.indexOf('.') !== -1) {
trackViewName = matches[2].split('.')[1];
}
trackViewName = trackViewName.replace(/['"]+/g, ''); // replace quotes
const trackQuery = {
type: 'add_existing_table_or_view',
args: {
Expand Down Expand Up @@ -122,29 +123,7 @@ const executeSQL = isMigration => (dispatch, getState) => {
errorMsg => {
dispatch({ type: UPDATE_MIGRATION_STATUS_ERROR, data: errorMsg });
dispatch({ type: REQUEST_ERROR, data: errorMsg });
const parsedErrorMsg = errorMsg;
if (typeof parsedErrorMsg !== 'object') {
parsedErrorMsg.message = JSON.parse(errorMsg).message;
}
if (parsedErrorMsg.code === 'data_api_error') {
parsedErrorMsg.message = JSON.parse(errorMsg.message);
} else if (parsedErrorMsg.code === 'postgres-error') {
if (parsedErrorMsg.internal) {
parsedErrorMsg.message = parsedErrorMsg.internal;
} else {
parsedErrorMsg.message = { error: parsedErrorMsg.error };
}
} else if (parsedErrorMsg.code === 'dependency-error') {
parsedErrorMsg.message = errorMsg.error;
}
dispatch(
showErrorNotification(
'SQL execution failed!',
parsedErrorMsg.message.error,
requestBody,
parsedErrorMsg
)
);
dispatch(handleMigrationErrors('SQL Execution Failed', errorMsg));
},
() => {
dispatch(
Expand Down