Made changes to fix merge conflicts

yugabyte · Jan 6, 2025 · 19c7fbd · 19c7fbd
1 parent 71ad160
commit 19c7fbd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/migtests/scripts/postgresql/env.sh b/migtests/scripts/postgresql/env.sh
@@ -1,6 +1,6 @@
 export SOURCE_DB_HOST=${SOURCE_DB_HOST:-"127.0.0.1"}
 export SOURCE_DB_PORT=${SOURCE_DB_PORT:-5432}
-export SOURCE_DB_USER=${SOURCE_DB_USER:-"ybvoyager"}
-export SOURCE_DB_PASSWORD=${SOURCE_DB_PASSWORD:-'Test@123#$%^&*()!'}
+export SOURCE_DB_USER=${SOURCE_DB_USER:-"postgres"}
+export SOURCE_DB_PASSWORD=${SOURCE_DB_PASSWORD:-'postgres'}
 export SOURCE_DB_ADMIN_USER=${SOURCE_DB_ADMIN_USER:-"postgres"}
 export SOURCE_DB_ADMIN_PASSWORD=${SOURCE_DB_ADMIN_PASSWORD:-"postgres"}
diff --git a/migtests/tests/analyze-schema/summary.json b/migtests/tests/analyze-schema/summary.json
@@ -26,9 +26,9 @@
             },
             {
                 "ObjectType": "TABLE",
-                "TotalCount": 62,
-                "InvalidCount": 52,
-                "ObjectNames": "test_table_in_type_file, sales_data, salaries2, sales, test_1, test_2, test_non_pk_multi_column_list, test_3, test_4, test_5, test_6, test_7, test_8, test_9, order_details, public.employees4, enum_example.bugs, table_xyz, table_abc, table_1, table_test, test_interval, public.range_columns_partition_test, public.range_columns_partition_test_copy, anydata_test, anydataset_test, anytype_test, uritype_test, \"Test\", public.meeting, public.pr, public.foreign_def_test, public.users, foreign_def_test1, foreign_def_test2, unique_def_test, unique_def_test1, test_xml_type, test_xid_type, public.test_jsonb, public.inet_type, public.citext_type, public.documents, public.ts_query_table, combined_tbl, combined_tbl1, test_udt, test_arr_enum, public.locations, public.xml_data_example, image, employees, bigint_multirange_table, date_multirange_table, int_multirange_table, numeric_multirange_table, timestamp_multirange_table, timestamptz_multirange_table, users_unique_nulls_distinct, users_unique_nulls_not_distinct, sales_unique_nulls_not_distinct, sales_unique_nulls_not_distinct_alter"            },
+                "TotalCount": 63,
+                "InvalidCount": 53,
+                "ObjectNames": "test_table_in_type_file, sales_data, salaries2, sales, test_1, test_2, test_non_pk_multi_column_list, test_3, test_4, test_5, test_6, test_7, test_8, test_9, order_details, public.employees4, enum_example.bugs, table_xyz, table_abc, table_1, table_test, test_interval, public.range_columns_partition_test, public.range_columns_partition_test_copy, anydata_test, anydataset_test, anytype_test, uritype_test, \"Test\", public.meeting, public.pr, public.foreign_def_test, public.users, foreign_def_test1, foreign_def_test2, unique_def_test, unique_def_test1, test_xml_type, test_xid_type, public.test_jsonb, public.inet_type, public.citext_type, public.documents, public.ts_query_table, combined_tbl, combined_tbl1, test_udt, test_arr_enum, public.locations, public.xml_data_example, image, public.json_data, employees, bigint_multirange_table, date_multirange_table, int_multirange_table, numeric_multirange_table, timestamp_multirange_table, timestamptz_multirange_table, users_unique_nulls_distinct, users_unique_nulls_not_distinct, sales_unique_nulls_not_distinct, sales_unique_nulls_not_distinct_alter"            },
             {
                 "ObjectType": "INDEX",
                 "TotalCount": 43,

diff --git a/yb-voyager/src/query/queryissue/parser_issue_detector_test.go b/yb-voyager/src/query/queryissue/parser_issue_detector_test.go
@@ -590,7 +590,7 @@ JSON_TABLE(data, '$.skills[*]'
     )
 ) AS jt;`,
 		`SELECT JSON_ARRAY($1, 12, TRUE, $2) AS json_array;`,
-`CREATE TABLE sales.json_data (
+		`CREATE TABLE sales.json_data (
     id int PRIMARY KEY,
     array_column TEXT CHECK (array_column IS JSON ARRAY),
     unique_keys_column TEXT CHECK (unique_keys_column IS JSON WITH UNIQUE KEYS)