Skip to content
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

console: don't generate unnecessary migrations (close #4215) #4393

Merged
merged 11 commits into from
Apr 27, 2020
Merged

console: don't generate unnecessary migrations (close #4215) #4393

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
272cb2a
don't generate unnecessary migrations
Apr 13, 2020
a6e97ff
Update CHANGELOG.md
Apr 13, 2020
edc824e
Merge branch 'master' into issue-4125
Apr 13, 2020
867e9a7
Merge branch 'master' into issue-4125
rikinsk Apr 21, 2020
82f384d
Merge branch 'master' into issue-4125
Apr 23, 2020
3f7f9f4
Merge branch 'master' into issue-4125
rikinsk Apr 24, 2020
0904e93
proposed solution
Apr 24, 2020
c77b329
remove unnecessary field in col properties
Apr 24, 2020
a256a6c
Merge pull request #6 from wawhal/uk-pk-mix-and-match
Apr 24, 2020
caf870e
Merge branch 'master' into issue-4125
Apr 24, 2020
f141c28
Merge branch 'master' into issue-4125
rikinsk Apr 27, 2020
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
Prev Previous commit
Next Next commit
proposed solution
  • Loading branch information
Rishichandra Wawhal committed Apr 24, 2020
commit 0904e93d9da2c98c996c99044c9c4ba3f200c10c
7 changes: 6 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 @@ -166,7 +166,12 @@ const ColumnEditor = ({
<div className="col-xs-6">
<select
className="input-sm form-control"
value={selectedProperties[colName].isUnique}
value={
!!(
selectedProperties[colName].isUnique ||
columnProperties.isOnlyPrimaryKey
)
}
onChange={toggleColumnUnique}
disabled={columnProperties.pkConstraint}
data-test="edit-col-unique"
Expand Down
11 changes: 5 additions & 6 deletions console/src/components/Services/Data/TableModify/ColumnEditorList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
setColumnEdit,
resetColumnEdit,
editColumn,
isColumnUnique,
} from '../TableModify/ModifyActions';
import { ordinalColSort } from '../utils';
import { defaultDataTypeToCast } from '../constants';
Expand Down Expand Up @@ -69,15 +70,13 @@ const ColumnEditorList = ({
isNullable: col.is_nullable === 'YES',
isIdentity: col.is_identity === 'YES',
pkConstraint: columnPKConstraints[colName],
isUnique:
(columnPKConstraints[colName] && pkLength === 1) ||
columnUniqueConstraints[colName]
? true
: false,
pkLength,
isUnique: isColumnUnique(tableSchema, colName),
// uniqueConstraint: columnUniqueConstraints[colName],
default: col.column_default || '',
comment: col.comment || '',
customFieldName: customColumnNames[colName] || '',
isOnlyPrimaryKey: columnPKConstraints[colName] && pkLength === 1,
};

const onSubmit = toggleEditor => {
Expand Down Expand Up @@ -116,7 +115,7 @@ const ColumnEditorList = ({
propertiesList.push('primary key');
}

if (columnProperties.isUnique) {
if (columnProperties.isUnique || columnProperties.isOnlyPrimaryKey) {
propertiesList.push('unique');
}

Expand Down
14 changes: 4 additions & 10 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 @@ -1438,18 +1438,12 @@ const saveTableCommentSql = isTable => {
};

const isColumnUnique = (tableSchema, colName) => {
beerose marked this conversation as resolved.
Show resolved Hide resolved
const { primary_key, unique_constraints } = tableSchema;

const columnPkConstraint =
primary_key.columns.includes(colName) && primary_key.columns.length === 1;

const columnUniqueConstraint =
unique_constraints.filter(
return (
tableSchema.unique_constraints.filter(
constraint =>
constraint.columns.includes(colName) && constraint.columns.length === 1
).length > 0;

return columnPkConstraint || columnUniqueConstraint;
).length > 0
);
};

const saveColumnChangesSql = (colName, column, onSuccess) => {
Expand Down