Merge branch 'main' into priyanshi/upgrade-17

yugabyte · Dec 27, 2024 · d0c640d · d0c640d
2 parents d0fc2b1 + 0351d82
commit d0c640d
Show file tree

Hide file tree

Showing 18 changed files with 676 additions and 32 deletions.
diff --git a/migtests/tests/analyze-schema/dummy-export-dir/schema/tables/table.sql b/migtests/tests/analyze-schema/dummy-export-dir/schema/tables/table.sql
@@ -384,4 +384,38 @@ CREATE TABLE public.locations (
     created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP
 );
 
-CREATE TABLE image (title text, raster lo);
+CREATE TABLE image (title text, raster lo);
+
+-- create table with multirange data types
+
+-- Create tables with primary keys directly
+CREATE TABLE bigint_multirange_table (
+    id integer PRIMARY KEY,
+    value_ranges int8multirange
+);
+
+CREATE TABLE date_multirange_table (
+    id integer PRIMARY KEY,
+    project_dates datemultirange
+);
+
+CREATE TABLE int_multirange_table (
+    id integer PRIMARY KEY,
+    value_ranges int4multirange
+);
+
+CREATE TABLE numeric_multirange_table (
+    id integer PRIMARY KEY,
+    price_ranges nummultirange
+);
+
+CREATE TABLE timestamp_multirange_table (
+    id integer PRIMARY KEY,
+    event_times tsmultirange
+);
+
+CREATE TABLE timestamptz_multirange_table (
+    id integer PRIMARY KEY,
+    global_event_times tstzmultirange
+);
+
diff --git a/migtests/tests/analyze-schema/expected_issues.json b/migtests/tests/analyze-schema/expected_issues.json
@@ -1930,5 +1930,65 @@
             "Suggestion": "Large objects are not yet supported in YugabyteDB, no workaround available currently",
             "GH": "https://github.com/yugabyte/yugabyte-db/issues/25318",
             "MinimumVersionsFixedIn": null
+        },
+        {
+            "IssueType": "unsupported_datatypes",
+            "ObjectType": "TABLE",
+            "ObjectName": "bigint_multirange_table",
+            "Reason": "Unsupported datatype - int8multirange on column - value_ranges",
+            "SqlStatement": "CREATE TABLE bigint_multirange_table (\n    id integer PRIMARY KEY,\n    value_ranges int8multirange\n);",
+            "Suggestion": "Multirange data type is not yet supported in YugabyteDB, no workaround available currently",
+            "GH": "",
+            "MinimumVersionsFixedIn": null
+        },
+        {
+            "IssueType": "unsupported_datatypes",
+            "ObjectType": "TABLE",
+            "ObjectName": "date_multirange_table",
+            "Reason": "Unsupported datatype - datemultirange on column - project_dates",
+            "SqlStatement": "CREATE TABLE date_multirange_table (\n    id integer PRIMARY KEY,\n    project_dates datemultirange\n);",
+            "Suggestion": "Multirange data type is not yet supported in YugabyteDB, no workaround available currently",
+            "GH": "",
+            "MinimumVersionsFixedIn": null
+        },
+        {
+            "IssueType": "unsupported_datatypes",
+            "ObjectType": "TABLE",
+            "ObjectName": "int_multirange_table",
+            "Reason": "Unsupported datatype - int4multirange on column - value_ranges",
+            "SqlStatement": "CREATE TABLE int_multirange_table (\n    id integer PRIMARY KEY,\n    value_ranges int4multirange\n);",
+            "Suggestion": "Multirange data type is not yet supported in YugabyteDB, no workaround available currently",
+            "GH": "",
+            "MinimumVersionsFixedIn": null
+        },
+        {
+            "IssueType": "unsupported_datatypes",
+            "ObjectType": "TABLE",
+            "ObjectName": "numeric_multirange_table",
+            "Reason": "Unsupported datatype - nummultirange on column - price_ranges",
+            "SqlStatement": "CREATE TABLE numeric_multirange_table (\n    id integer PRIMARY KEY,\n    price_ranges nummultirange\n);",
+            "Suggestion": "Multirange data type is not yet supported in YugabyteDB, no workaround available currently",
+            "GH": "",
+            "MinimumVersionsFixedIn": null
+        },
+        {
+            "IssueType": "unsupported_datatypes",
+            "ObjectType": "TABLE",
+            "ObjectName": "timestamp_multirange_table",
+            "Reason": "Unsupported datatype - tsmultirange on column - event_times",
+            "SqlStatement": "CREATE TABLE timestamp_multirange_table (\n    id integer PRIMARY KEY,\n    event_times tsmultirange\n);",
+            "Suggestion": "Multirange data type is not yet supported in YugabyteDB, no workaround available currently",
+            "GH": "",
+            "MinimumVersionsFixedIn": null
+        },
+        {
+            "IssueType": "unsupported_datatypes",
+            "ObjectType": "TABLE",
+            "ObjectName": "timestamptz_multirange_table",
+            "Reason": "Unsupported datatype - tstzmultirange on column - global_event_times",
+            "SqlStatement": "CREATE TABLE timestamptz_multirange_table (\n    id integer PRIMARY KEY,\n    global_event_times tstzmultirange\n);",
+            "Suggestion": "Multirange data type is not yet supported in YugabyteDB, no workaround available currently",
+            "GH": "",
+            "MinimumVersionsFixedIn": null
         }
 ]
diff --git a/migtests/tests/analyze-schema/summary.json b/migtests/tests/analyze-schema/summary.json
@@ -26,9 +26,9 @@
             },
             {
                 "ObjectType": "TABLE",
-                "TotalCount": 51,
-                "InvalidCount": 43,
-                "ObjectNames": "image, public.xml_data_example, combined_tbl1, test_arr_enum, public.locations, test_udt, combined_tbl, public.ts_query_table, public.documents, public.citext_type, public.inet_type, public.test_jsonb, test_xml_type, test_xid_type, public.range_columns_partition_test_copy, anydata_test, uritype_test, public.foreign_def_test, test_4, enum_example.bugs, table_abc, anydataset_test, unique_def_test1, test_2, table_1, public.range_columns_partition_test, table_xyz, public.users, test_3, test_5, test_7, foreign_def_test2, unique_def_test, sales_data, table_test, test_interval, test_non_pk_multi_column_list, test_9, test_8, order_details, public.employees4, anytype_test, public.meeting, test_table_in_type_file, sales, test_1, \"Test\", foreign_def_test1, salaries2, test_6, public.pr"            },
+                "TotalCount": 57,
+                "InvalidCount": 49,
+                "ObjectNames": "image, public.xml_data_example, combined_tbl1, test_arr_enum, public.locations, test_udt, combined_tbl, public.ts_query_table, public.documents, public.citext_type, public.inet_type, public.test_jsonb, test_xml_type, test_xid_type, public.range_columns_partition_test_copy, anydata_test, uritype_test, public.foreign_def_test, test_4, enum_example.bugs, table_abc, anydataset_test, unique_def_test1, test_2, table_1, public.range_columns_partition_test, table_xyz, public.users, test_3, test_5, test_7, foreign_def_test2, unique_def_test, sales_data, table_test, test_interval, test_non_pk_multi_column_list, test_9, test_8, order_details, public.employees4, anytype_test, public.meeting, test_table_in_type_file, sales, test_1, \"Test\", foreign_def_test1, salaries2, test_6, public.pr, bigint_multirange_table, date_multirange_table, int_multirange_table, numeric_multirange_table, timestamp_multirange_table, timestamptz_multirange_table"            },
             {
                 "ObjectType": "INDEX",
                 "TotalCount": 43,
@@ -91,4 +91,4 @@
                 "ObjectNames": "\u003c%"
             }
         ]
-}
+}