Modified schema diff tool to compare two databases instead of two schemas. Fixes #5126

docs/en_US/release_notes_4_25.rst

@@ -10,6 +10,7 @@ New features
 ************
 
 | `Issue #3904 <https://redmine.postgresql.org/issues/3904>`_ -  Replace charting library Flotr2 with ChartJS using React.
+| `Issue #5126 <https://redmine.postgresql.org/issues/5126>`_ -  Modified schema diff tool to compare two databases instead of two schemas.
 | `Issue #5610 <https://redmine.postgresql.org/issues/5610>`_ -  Add a --yes command line option to setup-web.sh to allow non-interactive use.
 
 Housekeeping

docs/en_US/schema_diff.rst

@@ -4,29 +4,29 @@
 `Schema Diff`:index:
 ********************
 
-**Schema Diff** is a feature that allows you to compare schema objects between
-two database schemas. Use the *Tools* menu to access Schema Diff.
+**Schema Diff** is a feature that allows you to compare objects between
+two databases. Use the *Tools* menu to access Schema Diff.
 
 The Schema Diff feature allows you to:
 
- * Compare and synchronize the database schemas (from source to target).
+ * Compare and synchronize the database objects (from source to target).
 
- * Visualize the differences between database schemas.
+ * Visualize the differences between database objects.
 
- * List the differences in SQL statement for target schema objects.
+ * List the differences in SQL statement for target database objects.
 
  * Generate synchronization scripts.
 
 
-**Note** - The source and target databases must be of the same major
+**Note** - The source and target database servers must be of the same major
 version.
 
 Click on *Schema Diff* under the *Tools* menu to open a selection panel. Choose
-the source and target servers, databases, and schemas that will be
+the source and target servers, and databases that will be
 compared. After selecting the objects, click on the *Compare* button.
 
 You can open multiple copies of *Schema Diff* in individual tabs
-simultaneously. To close a copy of Schema Diff, click the *X* in the
+simultaneously. To close a copy of Schema Diff, click the *X* in the
 upper-right hand corner of the tab bar.
 
 .. image:: images/schema_diff_dialog.png
@@ -44,7 +44,7 @@ The Schema Diff Object Comparison Panel
 ========================================
 
 In the object comparison panel, you can select the source and target servers
-of the same major version, databases, and schemas to be compared. You can
+of the same major version, and databases to be compared. You can
 select any server listed under the browser tree whether it is connected or
 disconnected. If you select a server that is not connected then it will
 prompt you for the password before using the server.
@@ -52,40 +52,36 @@ prompt you for the password before using the server.
 Next, select the databases that will be compared. The databases can be the
 same or different (and within the same server or from different servers).
 
-Lastly, select the source and target schemas which will be compared.
-
 .. image:: images/schema_diff_compare_button.png
     :alt: Schema diff compare button
     :align: center
 
-After you select servers, databases, and schemas, click on the
+After you select servers, and databases, click on the
 *Compare* button to obtain the *Comparison Result*.
 
 .. image:: images/schema_diff_comparison_results.png
     :alt: Schema diff comparison results
     :align: center
 
-Use the drop-down lists of Functions, Materialized Views, Tables,
-Trigger Functions, Procedures, and Views to view the DDL statements of
-all the schema objects.
+Use the drop-down lists of Database Objects to view the DDL statements.
 
 In the upper-right hand corner of the object comparison panel is a *Filter*
-option that you can use to filter the schema objects based on the
+option that you can use to filter the database objects based on the
 following comparison criteria:
 
- * Identical – If the object is found in both schemas with the same SQL statement, then the comparison result is identical.
+ * Identical – If the object is found in both databases with the same SQL statement, then the comparison result is identical.
 
- * Different – If the object is found in both schemas but have different SQL statements, then the comparison result is different.
+ * Different – If the object is found in both databases but have different SQL statements, then the comparison result is different.
 
- * Source Only – If the object is found in source schema only and not in target schema, then the comparison result is source only.
+ * Source Only – If the object is found in source database only and not in target database, then the comparison result is source only.
 
- * Target Only – If the object is found in target schema only and not in source schema, then the comparison result is target only.
+ * Target Only – If the object is found in target database only and not in source database, then the comparison result is target only.
 
 .. image:: images/schema_diff_filter_option.png
     :alt: Schema diff filter option
     :align: center
 
-Click on any of the schema objects in the object comparison panel to
+Click on any of the database objects in the object comparison panel to
 display the DDL Statements of that object in the DDL Comparison panel.
 
 
@@ -94,36 +90,32 @@ Schema Diff DDL Comparison Panel
 
 The *DDL Comparison* panel displays three columns:
 
-* The first column displays the DDL statement of the object from the source schema.
+* The first column displays the DDL statement of the object from the source database.
 
-* The second column displays the DDL statement of the object from the target schema.
+* The second column displays the DDL statement of the object from the target database.
 
-* The third column displays the difference in the SQL statement of the target schema object.
+* The third column displays the difference in the SQL statement of the target database object.
 
 .. image:: images/schema_diff_DDL_comparison.png
     :alt: Schema diff DDL comparison
     :align: center
 
-You can review the DDL statements of all the schema objects to
+You can review the DDL statements of all the database objects to
 check for the differences in the SQL statements.
 
 Also, you can generate the SQL script of the differences found in the
-target schema object based on the SQL statement of the source schema
-object. To generate the script, select the checkboxes of the schema
+target database object based on the SQL statement of the source database
+object. To generate the script, select the checkboxes of the database
 objects in the object comparison panel and then click on the *Generate Script*
 button in the upper-right hand corner of the object comparison panel.
 
-.. image:: images/schema_diff_generate_script.png
-    :alt: Schema diff generate script
-    :align: center
-
-Select the schema objects and click on the *Generate Script*
+Select the database objects and click on the *Generate Script*
 button to open the *Query Tool* in a new tab, with the difference
 in the SQL statement displayed in the *Query Editor*.
 
-If you have clicked on the schema object to check the difference
+If you have clicked on the database object to check the difference
 generated in the *DDL Comparison* Panel, and you have not selected the
-checkbox of the schema object, PEM will open the *Query Tool* in a new
+checkbox of the database object, pgAdmin will open the *Query Tool* in a new
 tab, with the differences in the SQL statements displayed in the *Query Editor*.
 
 You can also use the *Copy* button to copy the difference generated in
@@ -133,4 +125,4 @@ the *DDL Comparison* panel.
     :alt: Schema diff generate script query editor
     :align: center
 
-Apply the SQL Statement in the target schema to synchronize the schemas.
+Apply the SQL Statement in the target database to synchronize the databases.