Fix #2978, update db_schema.xml

Smile-SA · Jul 4, 2023 · bc2de9b · bc2de9b
1 parent 39607f9
commit bc2de9b
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 8 deletions.
diff --git a/src/module-elasticsuite-catalog/etc/db_schema.xml b/src/module-elasticsuite-catalog/etc/db_schema.xml
@@ -42,9 +42,16 @@
                 default="10"
                 comment="Facet max size"/>
         <column name="facet_sort_order"
-                xsi:type="text"
+                xsi:type="varchar"
+                length="30"
+                default="_count"
                 nullable="false"
                 comment="The sort order for facet values"/>
+        <column name="facet_boolean_logic"
+                xsi:type="boolean"
+                default="0"
+                nullable="false"
+                comment="Boolean logic to use when combining multiple selected values inside the filter"/>
         <column name="display_pattern"
                 xsi:type="text"
                 nullable="true"
@@ -55,18 +62,23 @@
                 default="0"
                 comment="Attribute decimal precision for display"/>
         <column name="sort_order_asc_missing"
-                xsi:type="text"
+                xsi:type="varchar"
+                length="30"
+                default="_last"
                 nullable="false"
                 comment="Sort products without value when sorting ASC"/>
         <column name="sort_order_desc_missing"
-                xsi:type="text"
+                xsi:type="varchar"
+                length="30"
+                default="_first"
                 nullable="false"
                 comment="Sort products without value when sorting DESC"/>
-        <column name="is_display_rel_no_follow"
+        <column name="is_display_rel_nofollow"
                 xsi:type="boolean"
                 nullable="false"
                 default="0"
-                comment="Boolean logic to use for displaying rel=nofollow attribute for all filter links of current attribute"/>
+                comment="Boolean logic to use for displaying rel=nofollow attribute for all filter links of current attribute"
+                onCreate="migrateDataFrom(is_display_rel_no_follow)"/>
         <column name="include_zero_false_values"
                 xsi:type="boolean"
                 nullable="false"
@@ -89,6 +101,7 @@
                 default="standard"
                 comment="Default analyzer for this field"/>
         <column name="is_used_in_autocomplete" disabled="true"/>
+        <column name="is_display_rel_no_follow" disabled="true"/>
     </table>
 
     <!-- add column to search_query table -->
@@ -132,8 +145,10 @@
                 unsigned="true"
                 comment="Facet max size"/>
         <column name="facet_sort_order"
-                xsi:type="text"
-                nullable="true"
+                xsi:type="varchar"
+                length="30"
+                default="_count"
+                nullable="false"
                 comment="The pattern to display facet values"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
@@ -180,7 +195,7 @@
                 comment="If the product is blacklisted"/>
         <column name="facet_boolean_logic"
                 xsi:type="boolean"
-                default="false"
+                default="0"
                 nullable="false"
                 comment="Boolean logic to use when combining multiple selected values inside the filter"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">

diff --git a/src/module-elasticsuite-catalog/etc/db_schema_whitelist.json b/src/module-elasticsuite-catalog/etc/db_schema_whitelist.json
@@ -0,0 +1,61 @@
+{
+    "catalog_eav_attribute": {
+        "column": {
+            "is_displayed_in_autocomplete": true,
+            "is_used_in_spellcheck": true,
+            "facet_min_coverage_rate": true,
+            "facet_max_size": true,
+            "facet_sort_order": true,
+            "facet_boolean_logic": true,
+            "display_pattern": true,
+            "display_precision": true,
+            "sort_order_asc_missing": true,
+            "sort_order_desc_missing": true,
+            "is_display_rel_nofollow": true,
+            "include_zero_false_values": true,
+            "is_spannable": true,
+            "norms_disabled": true,
+            "default_analyzer": true,
+            "is_used_in_autocomplete": true,
+            "is_display_rel_no_follow": true
+        }
+    },
+    "search_query": {
+        "column": {
+            "is_spellchecked": true
+        }
+    },
+    "smile_elasticsuitecatalog_category_filterable_attribute": {
+        "column": {
+            "entity_id": true,
+            "attribute_id": true,
+            "position": true,
+            "facet_display_mode": true,
+            "facet_min_coverage_rate": true,
+            "facet_max_size": true,
+            "facet_sort_order": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_8B0BDE1CA9474CFD234FCD0FEBDC0225": true,
+            "FK_691E21396002A6A370AE01801420A14A": true
+        }
+    },
+    "smile_elasticsuitecatalog_search_query_product_position": {
+        "column": {
+            "query_id": true,
+            "product_id": true,
+            "position": true,
+            "is_blacklisted": true,
+            "facet_boolean_logic": true
+        },
+        "index": {
+            "SMILE_ELASTICSUITECAT_SRCH_QR_PRD_POSITION_PRD_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "SMILE_ELASTICSUITECAT_SRCH_QR_PRD_POSITION_QR_ID_SRCH_QR_QR_ID": true,
+            "FK_E51230BD209344C6172518E1E4908CDA": true
+        }
+    }
+}