mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2026-11-03 04:40:18 -06:00
Ensure consistent orderings for ACLS when comparing schemas in the schema diff. #5101
This commit is contained in:
danielkempenich authored and 
GitHub committed
1 parent
e3e0e3db19
commit
545c76a411
15 files changed
+26
-11
No files matched your search
+2
-1
@@ -32,4 +32,5 @@ FROM
|
|||||||
) d
|
) d
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+2
-1
@@ -32,4 +32,5 @@ FROM
|
|||||||
) d
|
) d
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+2
-1
@@ -32,4 +32,5 @@ FROM
|
|||||||
) d
|
) d
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+2
-1
@@ -32,4 +32,5 @@ FROM
|
|||||||
) d
|
) d
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+1
@@ -44,3 +44,4 @@ FROM
|
|||||||
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee
|
||||||
+2
-1
@@ -20,4 +20,5 @@ FROM
|
|||||||
) b
|
) b
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+2
-1
@@ -20,4 +20,5 @@ FROM
|
|||||||
) b
|
) b
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+2
-1
@@ -20,4 +20,5 @@ FROM
|
|||||||
) b
|
) b
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+2
-1
@@ -20,4 +20,5 @@ FROM
|
|||||||
) b
|
) b
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+2
-1
@@ -20,4 +20,5 @@ FROM
|
|||||||
) b
|
) b
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+2
-1
@@ -20,4 +20,5 @@ FROM
|
|||||||
) b
|
) b
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+1
@@ -38,4 +38,5 @@ LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
|||||||
GROUP BY
|
GROUP BY
|
||||||
g.rolname,
|
g.rolname,
|
||||||
gt.rolname
|
gt.rolname
|
||||||
|
ORDER BY grantee
|
||||||
{% endif %}
|
{% endif %}
|
||||||
+1
@@ -36,4 +36,5 @@ LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
|||||||
GROUP BY
|
GROUP BY
|
||||||
g.rolname,
|
g.rolname,
|
||||||
gt.rolname
|
gt.rolname
|
||||||
|
ORDER BY grantee
|
||||||
{% endif %}
|
{% endif %}
|
||||||
+2
-1
@@ -32,4 +32,5 @@ FROM
|
|||||||
) d
|
) d
|
||||||
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname;
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee;
|
||||||
+1
@@ -26,3 +26,4 @@ FROM
|
|||||||
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
|
||||||
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
|
||||||
GROUP BY g.rolname, gt.rolname
|
GROUP BY g.rolname, gt.rolname
|
||||||
|
ORDER BY grantee
|
||||||
Reference in new issue
Block a user