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

fix modify column bug in presence of column comment (closes #2164) #2187

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 1 commit into from
May 15, 2019
Merged

fix modify column bug in presence of column comment (closes #2164) #2187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion console/src/components/Services/Data/TableModify/ColumnEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ const ColumnEditor = ({
const styles = require('./ModifyTable.scss');

useEffect(() => {
dispatch(editColumn(colName, 'comment', columnComment));
if (columnComment) {
dispatch(editColumn(colName, 'comment', columnComment[0] || ''));
}
}, [columnComment]);

// filter the datatypes where hasuraDatatype === null
Expand Down
38 changes: 19 additions & 19 deletions console/src/components/Services/Data/TableModify/ModifyActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ const savePrimaryKeys = (tableName, schemaName, constraintName) => {
sql: `
alter table "${schemaName}"."${tableName}"
add constraint "${tableName}_pkey" primary key ( ${selectedPkColumns.join(
', '
)} );
', '
)} );
`,
},
});
Expand All @@ -183,8 +183,8 @@ const savePrimaryKeys = (tableName, schemaName, constraintName) => {
sql: `
alter table "${schemaName}"."${tableName}"
add constraint "${constraintName}" primary key ( ${tableSchema.primary_key.columns.join(
', '
)} );
', '
)} );
`,
});
}
Expand Down Expand Up @@ -1056,9 +1056,9 @@ const saveColumnChangesSql = (colName, column, allowRename) => {
const newName = allowRename ? columnEdit.name : null;
const currentSchema = columnEdit.schemaName;
// ALTER TABLE <table> ALTER COLUMN <column> TYPE <column_type>;
let defWithQuotes = "''";
if (colType === 'text' && def !== '') {
defWithQuotes = "'" + def + "'";
let defWithQuotes;
if (colType === 'text') {
defWithQuotes = `'${def}'`;
} else {
defWithQuotes = def;
}
Expand Down Expand Up @@ -1110,24 +1110,24 @@ const saveColumnChangesSql = (colName, column, allowRename) => {
const schemaChangesUp =
originalColType !== colType
? [
{
type: 'run_sql',
args: {
sql: columnChangesUpQuery,
{
type: 'run_sql',
args: {
sql: columnChangesUpQuery,
},
},
},
]
]
: [];
const schemaChangesDown =
originalColType !== colType
? [
{
type: 'run_sql',
args: {
sql: columnChangesDownQuery,
{
type: 'run_sql',
args: {
sql: columnChangesDownQuery,
},
},
},
]
]
: [];

/* column default up/down migration */
Expand Down