@@ -77,21 +77,21 @@ def _run_geodiff(cmd):
7777
7878def _geodiff_create_changeset (driver , conn_info , base , modified , changeset , ignored_tables ):
7979 if ignored_tables :
80- _run_geodiff ([config .geodiff_exe , "diff" , "--driver" , driver , conn_info , "--skip-tables" , _tables_to_string (ignored_tables ), base , modified , changeset ])
80+ _run_geodiff ([config .geodiff_exe , "diff" , "--driver" , driver , conn_info , "--skip-tables" , _tables_list_to_string (ignored_tables ), base , modified , changeset ])
8181 else :
8282 _run_geodiff ([config .geodiff_exe , "diff" , "--driver" , driver , conn_info , base , modified , changeset ])
8383
8484
8585def _geodiff_apply_changeset (driver , conn_info , base , changeset , ignored_tables ):
8686 if ignored_tables :
87- _run_geodiff ([config .geodiff_exe , "apply" , "--driver" , driver , conn_info , "--skip-tables" , _tables_to_string (ignored_tables ), base , changeset ])
87+ _run_geodiff ([config .geodiff_exe , "apply" , "--driver" , driver , conn_info , "--skip-tables" , _tables_list_to_string (ignored_tables ), base , changeset ])
8888 else :
8989 _run_geodiff ([config .geodiff_exe , "apply" , "--driver" , driver , conn_info , base , changeset ])
9090
9191
9292def _geodiff_rebase (driver , conn_info , base , our , base2their , conflicts , ignored_tables ):
9393 if ignored_tables :
94- _run_geodiff ([config .geodiff_exe , "rebase-db" , "--driver" , driver , conn_info , "--skip-tables" , _tables_to_string (ignored_tables ), base , our , base2their , conflicts ])
94+ _run_geodiff ([config .geodiff_exe , "rebase-db" , "--driver" , driver , conn_info , "--skip-tables" , _tables_list_to_string (ignored_tables ), base , our , base2their , conflicts ])
9595 else :
9696 _run_geodiff ([config .geodiff_exe , "rebase-db" , "--driver" , driver , conn_info , base , our , base2their , conflicts ])
9797
@@ -128,14 +128,14 @@ def _geodiff_list_changes_summary(changeset):
128128
129129def _geodiff_make_copy (src_driver , src_conn_info , src , dst_driver , dst_conn_info , dst , ignored_tables ):
130130 if ignored_tables :
131- _run_geodiff ([config .geodiff_exe , "copy" , "--driver-1" , src_driver , src_conn_info , "--driver-2" , dst_driver , dst_conn_info , "--skip-tables" , _tables_to_string (ignored_tables ), src , dst ])
131+ _run_geodiff ([config .geodiff_exe , "copy" , "--driver-1" , src_driver , src_conn_info , "--driver-2" , dst_driver , dst_conn_info , "--skip-tables" , _tables_list_to_string (ignored_tables ), src , dst ])
132132 else :
133133 _run_geodiff ([config .geodiff_exe , "copy" , "--driver-1" , src_driver , src_conn_info , "--driver-2" , dst_driver , dst_conn_info , src , dst ])
134134
135135
136136def _geodiff_create_changeset_dr (src_driver , src_conn_info , src , dst_driver , dst_conn_info , dst , changeset , ignored_tables ):
137137 if ignored_tables :
138- _run_geodiff ([config .geodiff_exe , "diff" , "--driver-1" , src_driver , src_conn_info , "--driver-2" , dst_driver , dst_conn_info , "--skip-tables" , _tables_to_string (ignored_tables ), src , dst , changeset ])
138+ _run_geodiff ([config .geodiff_exe , "diff" , "--driver-1" , src_driver , src_conn_info , "--driver-2" , dst_driver , dst_conn_info , "--skip-tables" , _tables_list_to_string (ignored_tables ), src , dst , changeset ])
139139 else :
140140 _run_geodiff ([config .geodiff_exe , "diff" , "--driver-1" , src_driver , src_conn_info , "--driver-2" , dst_driver , dst_conn_info , src , dst , changeset ])
141141
0 commit comments