Skip to content

Commit 902ea96

Browse files
ENGCOM-5936: Consistent capitalization of the word 'ID' in comments of db_schema.xml files #24638
- Merge Pull Request #24638 from psdevhh/magento2:2.3-develop - Merged commits: 1. b1a692c
2 parents d6ef3ef + b1a692c commit 902ea96

File tree

44 files changed

+541
-541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+541
-541
lines changed

app/code/Magento/AdminNotification/etc/db_schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
1111
<column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
12-
comment="Notification id"/>
12+
comment="Notification ID"/>
1313
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
1414
default="0" comment="Problem type"/>
1515
<column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
@@ -35,7 +35,7 @@
3535
</index>
3636
</table>
3737
<table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
38-
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message id"/>
38+
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
3939
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
4040
default="0" comment="Problem type"/>
4141
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"

app/code/Magento/AdvancedSearch/etc/db_schema.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="catalogsearch_recommendations" resource="default" engine="innodb"
1111
comment="Advanced Search Recommendations">
12-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
12+
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
1313
<column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
14-
default="0" comment="Query Id"/>
14+
default="0" comment="Query ID"/>
1515
<column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
16-
default="0" comment="Relation Id"/>
16+
default="0" comment="Relation ID"/>
1717
<constraint xsi:type="primary" referenceId="PRIMARY">
1818
<column name="id"/>
1919
</constraint>

app/code/Magento/Bundle/etc/db_schema.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<table name="catalog_product_bundle_option" resource="default" engine="innodb"
1111
comment="Catalog Product Bundle Option">
1212
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
13-
comment="Option Id"/>
13+
comment="Option ID"/>
1414
<column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
15-
comment="Parent Id"/>
15+
comment="Parent ID"/>
1616
<column xsi:type="smallint" name="required" padding="5" unsigned="true" nullable="false" identity="false"
1717
default="0" comment="Required"/>
1818
<column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
@@ -31,14 +31,14 @@
3131
<table name="catalog_product_bundle_option_value" resource="default" engine="innodb"
3232
comment="Catalog Product Bundle Option Value">
3333
<column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
34-
comment="Value Id"/>
34+
comment="Value ID"/>
3535
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
36-
comment="Option Id"/>
36+
comment="Option ID"/>
3737
<column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
38-
comment="Store Id"/>
38+
comment="Store ID"/>
3939
<column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
4040
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
41-
comment="Parent Product Id"/>
41+
comment="Parent Product ID"/>
4242
<constraint xsi:type="primary" referenceId="PRIMARY">
4343
<column name="value_id"/>
4444
</constraint>
@@ -54,13 +54,13 @@
5454
<table name="catalog_product_bundle_selection" resource="default" engine="innodb"
5555
comment="Catalog Product Bundle Selection">
5656
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="true"
57-
comment="Selection Id"/>
57+
comment="Selection ID"/>
5858
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
59-
comment="Option Id"/>
59+
comment="Option ID"/>
6060
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
61-
comment="Parent Product Id"/>
61+
comment="Parent Product ID"/>
6262
<column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
63-
comment="Product Id"/>
63+
comment="Product ID"/>
6464
<column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
6565
default="0" comment="Position"/>
6666
<column xsi:type="smallint" name="is_default" padding="5" unsigned="true" nullable="false" identity="false"
@@ -92,15 +92,15 @@
9292
<table name="catalog_product_bundle_selection_price" resource="default" engine="innodb"
9393
comment="Catalog Product Bundle Selection Price">
9494
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
95-
comment="Selection Id"/>
95+
comment="Selection ID"/>
9696
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
97-
comment="Website Id"/>
97+
comment="Website ID"/>
9898
<column xsi:type="smallint" name="selection_price_type" padding="5" unsigned="true" nullable="false"
9999
identity="false" default="0" comment="Selection Price Type"/>
100100
<column xsi:type="decimal" name="selection_price_value" scale="6" precision="20" unsigned="false"
101101
nullable="false" default="0" comment="Selection Price Value"/>
102102
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
103-
comment="Parent Product Id"/>
103+
comment="Parent Product ID"/>
104104
<constraint xsi:type="primary" referenceId="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
105105
<column name="selection_id"/>
106106
<column name="parent_product_id"/>
@@ -122,7 +122,7 @@
122122
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
123123
comment="Entity ID"/>
124124
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
125-
comment="Website Id"/>
125+
comment="Website ID"/>
126126
<column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
127127
comment="Customer Group ID"/>
128128
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="false"
@@ -159,7 +159,7 @@
159159
<column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
160160
comment="Stock ID"/>
161161
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
162-
default="0" comment="Option Id"/>
162+
default="0" comment="Option ID"/>
163163
<column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
164164
default="0" comment="Stock Status"/>
165165
<constraint xsi:type="primary" referenceId="PRIMARY">
@@ -246,9 +246,9 @@
246246
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
247247
comment="Website ID"/>
248248
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
249-
default="0" comment="Option Id"/>
249+
default="0" comment="Option ID"/>
250250
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
251-
default="0" comment="Selection Id"/>
251+
default="0" comment="Selection ID"/>
252252
<column xsi:type="smallint" name="group_type" padding="5" unsigned="true" nullable="true" identity="false"
253253
default="0" comment="Group Type"/>
254254
<column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
@@ -274,9 +274,9 @@
274274
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
275275
comment="Website ID"/>
276276
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
277-
default="0" comment="Option Id"/>
277+
default="0" comment="Option ID"/>
278278
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
279-
default="0" comment="Selection Id"/>
279+
default="0" comment="Selection ID"/>
280280
<column xsi:type="smallint" name="group_type" padding="5" unsigned="true" nullable="true" identity="false"
281281
default="0" comment="Group Type"/>
282282
<column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
@@ -302,7 +302,7 @@
302302
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
303303
comment="Website ID"/>
304304
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
305-
default="0" comment="Option Id"/>
305+
default="0" comment="Option ID"/>
306306
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
307307
comment="Min Price"/>
308308
<column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"
@@ -329,7 +329,7 @@
329329
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
330330
comment="Website ID"/>
331331
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
332-
default="0" comment="Option Id"/>
332+
default="0" comment="Option ID"/>
333333
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
334334
comment="Min Price"/>
335335
<column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"

app/code/Magento/Catalog/etc/db_schema.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@
812812
<column xsi:type="smallint" name="disabled" padding="5" unsigned="true" nullable="false" identity="false"
813813
default="0" comment="Is Disabled"/>
814814
<column xsi:type="int" name="record_id" padding="10" unsigned="true" nullable="false" identity="true"
815-
comment="Record Id"/>
815+
comment="Record ID"/>
816816
<constraint xsi:type="primary" referenceId="PRIMARY">
817817
<column name="record_id"/>
818818
</constraint>
@@ -1085,7 +1085,7 @@
10851085
<column xsi:type="int" name="value" padding="10" unsigned="true" nullable="false" identity="false"
10861086
comment="Value"/>
10871087
<column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
1088-
default="0" comment="Original entity Id for attribute value"/>
1088+
default="0" comment="Original entity ID for attribute value"/>
10891089
<constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
10901090
<column name="entity_id"/>
10911091
<column name="attribute_id"/>
@@ -1114,7 +1114,7 @@
11141114
<column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false"
11151115
comment="Value"/>
11161116
<column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
1117-
default="0" comment="Original entity Id for attribute value"/>
1117+
default="0" comment="Original entity ID for attribute value"/>
11181118
<constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
11191119
<column name="entity_id"/>
11201120
<column name="attribute_id"/>
@@ -1205,7 +1205,7 @@
12051205
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
12061206
comment="Website ID"/>
12071207
<column xsi:type="smallint" name="default_store_id" padding="5" unsigned="true" nullable="false" identity="false"
1208-
comment="Default store id for website"/>
1208+
comment="Default store ID for website"/>
12091209
<column xsi:type="date" name="website_date" comment="Website Date"/>
12101210
<column xsi:type="float" name="rate" unsigned="false" nullable="true" default="1" comment="Rate"/>
12111211
<constraint xsi:type="primary" referenceId="PRIMARY">
@@ -1452,7 +1452,7 @@
14521452
<column xsi:type="int" name="value" padding="10" unsigned="true" nullable="false" identity="false"
14531453
comment="Value"/>
14541454
<column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
1455-
default="0" comment="Original entity Id for attribute value"/>
1455+
default="0" comment="Original entity ID for attribute value"/>
14561456
<constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
14571457
<column name="entity_id"/>
14581458
<column name="attribute_id"/>
@@ -1481,7 +1481,7 @@
14811481
<column xsi:type="int" name="value" padding="10" unsigned="true" nullable="false" identity="false"
14821482
comment="Value"/>
14831483
<column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
1484-
default="0" comment="Original entity Id for attribute value"/>
1484+
default="0" comment="Original entity ID for attribute value"/>
14851485
<constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
14861486
<column name="entity_id"/>
14871487
<column name="attribute_id"/>
@@ -1510,7 +1510,7 @@
15101510
<column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false"
15111511
comment="Value"/>
15121512
<column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
1513-
default="0" comment="Original entity Id for attribute value"/>
1513+
default="0" comment="Original entity ID for attribute value"/>
15141514
<constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_IDX_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
15151515
<column name="entity_id"/>
15161516
<column name="attribute_id"/>
@@ -1539,7 +1539,7 @@
15391539
<column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false"
15401540
comment="Value"/>
15411541
<column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
1542-
default="0" comment="Original entity Id for attribute value"/>
1542+
default="0" comment="Original entity ID for attribute value"/>
15431543
<constraint xsi:type="primary" referenceId="CAT_PRD_IDX_EAV_DEC_TMP_ENTT_ID_ATTR_ID_STORE_ID_VAL_SOURCE_ID">
15441544
<column name="entity_id"/>
15451545
<column name="attribute_id"/>
@@ -1681,7 +1681,7 @@
16811681
<column xsi:type="int" name="value" padding="10" unsigned="true" nullable="false" identity="false"
16821682
comment="Value"/>
16831683
<column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
1684-
default="0" comment="Original entity Id for attribute value"/>
1684+
default="0" comment="Original entity ID for attribute value"/>
16851685
<constraint xsi:type="primary" referenceId="PRIMARY">
16861686
<column name="entity_id"/>
16871687
<column name="attribute_id"/>
@@ -1710,7 +1710,7 @@
17101710
<column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false"
17111711
comment="Value"/>
17121712
<column xsi:type="int" name="source_id" padding="10" unsigned="true" nullable="false" identity="false"
1713-
default="0" comment="Original entity Id for attribute value"/>
1713+
default="0" comment="Original entity ID for attribute value"/>
17141714
<constraint xsi:type="primary" referenceId="PRIMARY">
17151715
<column name="entity_id"/>
17161716
<column name="attribute_id"/>
@@ -1801,14 +1801,14 @@
18011801
<table name="catalog_product_frontend_action" resource="default" engine="innodb"
18021802
comment="Catalog Product Frontend Action Table">
18031803
<column xsi:type="bigint" name="action_id" padding="20" unsigned="true" nullable="false" identity="true"
1804-
comment="Product Action Id"/>
1804+
comment="Product Action ID"/>
18051805
<column xsi:type="varchar" name="type_id" nullable="false" length="64" comment="Type of product action"/>
18061806
<column xsi:type="int" name="visitor_id" padding="10" unsigned="true" nullable="true" identity="false"
1807-
comment="Visitor Id"/>
1807+
comment="Visitor ID"/>
18081808
<column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
1809-
comment="Customer Id"/>
1809+
comment="Customer ID"/>
18101810
<column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
1811-
comment="Product Id"/>
1811+
comment="Product ID"/>
18121812
<column xsi:type="bigint" name="added_at" padding="20" unsigned="false" nullable="false" identity="false"
18131813
comment="Added At"/>
18141814
<constraint xsi:type="primary" referenceId="PRIMARY">

0 commit comments

Comments
 (0)