From c09f7d10cfc8567aa1a5a3b2f481bcfe6f5fd4e9 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Mon, 11 Mar 2019 19:41:58 +1000
Subject: [PATCH] Issue #3038892 by alexpott, quietone:
 Drupal\Tests\migrate_drupal\Kernel\d6\FieldDiscoveryTest randomly fails on
 PostgreSQL

(cherry picked from commit 6896b4eb0adf51ed54cd258a14d458b348a8ad17)
---
 .../field/src/Plugin/migrate/source/d6/FieldInstance.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
index 1c16c7b4a6d8..e594f827ddc7 100644
--- a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
@@ -25,6 +25,8 @@ public function query() {
     }
     $query->join('content_node_field', 'cnf', 'cnf.field_name = cnfi.field_name');
     $query->fields('cnf');
+    $query->orderBy('cnfi.field_name');
+    $query->orderBy('cnfi.type_name');
 
     return $query;
   }
-- 
GitLab