Skip to content

Provide declarative schema features to entity manager #459

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 5 commits into from
Jan 22, 2021
Merged

Provide declarative schema features to entity manager #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48789b9
Merge branch '309-add-db-schema-whitelist-generation' of github.com:s…
bohdan-harniuk Jan 21, 2021
70f703c
Added posibility to generate db_schema.xml and db_schema_whitelist.js…
bohdan-harniuk Jan 21, 2021
6483a70
Code refactoring after ColumnAttributes enum type was added
bohdan-harniuk Jan 21, 2021
a906b32
Added tests for db_schema.xml and db_schema_whitelist.json generation…
bohdan-harniuk Jan 22, 2021
e94b888
Merge branch 'mainline-entity-manager' of github.com:magento/magento2…
bohdan-harniuk Jan 22, 2021
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
2 changes: 1 addition & 1 deletion src/com/magento/idea/magento2plugin/actions/generation/data/DbSchemaXmlData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void setColumns(final List<Map<String, String>> columns) {
* @return Map
*/
public Map<String, String> getTableAttributesMap() {
final Map<String, String> tableAttributesData = new LinkedHashMap<>();//NOPMD
final Map<String, String> tableAttributesData = new LinkedHashMap<>();
tableAttributesData.put(ModuleDbSchemaXml.XML_ATTR_TABLE_NAME, getTableName());
tableAttributesData.put(ModuleDbSchemaXml.XML_ATTR_TABLE_RESOURCE, getTableResource());
tableAttributesData.put(ModuleDbSchemaXml.XML_ATTR_TABLE_ENGINE, getTableEngine());
Expand Down
Empty file removed ...m/magento/idea/magento2plugin/actions/generation/data/util/DbSchemaXmlSourceDataUtil.java
View file
Open in desktop
Empty file.
40 changes: 20 additions & 20 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.TableNameLength;
import com.magento.idea.magento2plugin.actions.generation.generator.DbSchemaWhitelistJsonGenerator;
import com.magento.idea.magento2plugin.actions.generation.generator.DbSchemaXmlGenerator;
import com.magento.idea.magento2plugin.magento.files.ModuleDbSchemaXml;
import com.magento.idea.magento2plugin.magento.packages.database.ColumnAttributes;
import com.magento.idea.magento2plugin.magento.packages.database.TableColumnTypes;
import com.magento.idea.magento2plugin.magento.packages.database.TableEngines;
import com.magento.idea.magento2plugin.magento.packages.database.TableResources;
Expand Down Expand Up @@ -192,36 +192,36 @@ private void generateWhitelistJsonFile(final @NotNull DbSchemaXmlData dbSchemaXm
*/
private void initializeColumnsUiComponentGroup() {
final List<String> columns = new LinkedList<>(Arrays.asList(
ModuleDbSchemaXml.XML_ATTR_COLUMN_TYPE,
ModuleDbSchemaXml.XML_ATTR_COLUMN_NAME,
ModuleDbSchemaXml.XML_ATTR_COLUMN_PADDING,
ModuleDbSchemaXml.XML_ATTR_COLUMN_UNSIGNED,
ModuleDbSchemaXml.XML_ATTR_COLUMN_NULLABLE,
ModuleDbSchemaXml.XML_ATTR_COLUMN_IDENTITY,
ModuleDbSchemaXml.XML_ATTR_COLUMN_LENGTH,
ModuleDbSchemaXml.XML_ATTR_COLUMN_PRECISION,
ModuleDbSchemaXml.XML_ATTR_COLUMN_SCALE,
ModuleDbSchemaXml.XML_ATTR_COLUMN_ON_UPDATE,
ModuleDbSchemaXml.XML_ATTR_COLUMN_DEFAULT,
ModuleDbSchemaXml.XML_ATTR_COLUMN_COMMENT
ColumnAttributes.TYPE.getName(),
ColumnAttributes.NAME.getName(),
ColumnAttributes.PADDING.getName(),
ColumnAttributes.UNSIGNED.getName(),
ColumnAttributes.NULLABLE.getName(),
ColumnAttributes.IDENTITY.getName(),
ColumnAttributes.LENGTH.getName(),
ColumnAttributes.PRECISION.getName(),
ColumnAttributes.SCALE.getName(),
ColumnAttributes.ON_UPDATE.getName(),
ColumnAttributes.DEFAULT.getName(),
ColumnAttributes.COMMENT.getName()
));
// Set default values for columns
final Map<String, String> defaultValues = new HashMap<>();
defaultValues.put(ModuleDbSchemaXml.XML_ATTR_COLUMN_NULLABLE, "false");
defaultValues.put(ModuleDbSchemaXml.XML_ATTR_COLUMN_IDENTITY, "false");
defaultValues.put(ColumnAttributes.NULLABLE.getName(), "false");
defaultValues.put(ColumnAttributes.IDENTITY.getName(), "false");
// Set sources for columns
final Map<String, List<String>> sources = new HashMap<>();
final List<String> booleanSource = Arrays.asList("true", "false");
final List<String> columnTypes = TableColumnTypes.getTableColumnTypesList();
columnTypes.add(0, "");
sources.put(
ModuleDbSchemaXml.XML_ATTR_COLUMN_TYPE,
ColumnAttributes.TYPE.getName(),
columnTypes
);
sources.put(ModuleDbSchemaXml.XML_ATTR_COLUMN_UNSIGNED, booleanSource);
sources.put(ModuleDbSchemaXml.XML_ATTR_COLUMN_NULLABLE, booleanSource);
sources.put(ModuleDbSchemaXml.XML_ATTR_COLUMN_IDENTITY, booleanSource);
sources.put(ModuleDbSchemaXml.XML_ATTR_COLUMN_ON_UPDATE, booleanSource);
sources.put(ColumnAttributes.UNSIGNED.getName(), booleanSource);
sources.put(ColumnAttributes.NULLABLE.getName(), booleanSource);
sources.put(ColumnAttributes.IDENTITY.getName(), booleanSource);
sources.put(ColumnAttributes.ON_UPDATE.getName(), booleanSource);
// Initialize new Table Group
columnsTableGroupWrapper = new TableGroupWrapper(
columnsTable,
Expand Down
Loading