From 9185bb8a76d05c93ccd909fad0f13c0fffd271e3 Mon Sep 17 00:00:00 2001
From: Jay <me@bsavage.xyz>
Date: Mon, 5 Dec 2022 22:45:45 +0530
Subject: [PATCH] added order by table_name clause to mysql and postgres query
 sets

---
 generator/mysql/query_set.go     | 6 ++++--
 generator/postgres/query_set.go  | 4 +++-
 tests/postgres/generator_test.go | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/generator/mysql/query_set.go b/generator/mysql/query_set.go
index 5847be4..8da3f9c 100644
--- a/generator/mysql/query_set.go
+++ b/generator/mysql/query_set.go
@@ -3,10 +3,11 @@ package mysql
 import (
 	"context"
 	"database/sql"
+	"strings"
+
 	"github.com/go-jet/jet/v2/generator/metadata"
 	"github.com/go-jet/jet/v2/internal/utils/throw"
 	"github.com/go-jet/jet/v2/qrm"
-	"strings"
 )
 
 // mySqlQuerySet is dialect query set for MySQL
@@ -16,7 +17,8 @@ func (m mySqlQuerySet) GetTablesMetaData(db *sql.DB, schemaName string, tableTyp
 	query := `
 SELECT table_name as "table.name"
 FROM INFORMATION_SCHEMA.tables
-WHERE table_schema = ? and table_type = ?;
+WHERE table_schema = ? and table_type = ?
+ORDER BY table_name;
 `
 	var tables []metadata.Table
 
diff --git a/generator/postgres/query_set.go b/generator/postgres/query_set.go
index da48505..0785ac4 100644
--- a/generator/postgres/query_set.go
+++ b/generator/postgres/query_set.go
@@ -3,6 +3,7 @@ package postgres
 import (
 	"context"
 	"database/sql"
+
 	"github.com/go-jet/jet/v2/generator/metadata"
 	"github.com/go-jet/jet/v2/internal/utils/throw"
 	"github.com/go-jet/jet/v2/qrm"
@@ -15,7 +16,8 @@ func (p postgresQuerySet) GetTablesMetaData(db *sql.DB, schemaName string, table
 	query := `
 SELECT table_name as "table.name" 
 FROM information_schema.tables
-WHERE table_schema = $1 and table_type = $2;
+WHERE table_schema = $1 and table_type = $2
+ORDER BY table_name;
 `
 	var tables []metadata.Table
 
diff --git a/tests/postgres/generator_test.go b/tests/postgres/generator_test.go
index 2139c82..fb757ae 100644
--- a/tests/postgres/generator_test.go
+++ b/tests/postgres/generator_test.go
@@ -404,20 +404,20 @@ package table
 // returned by calling FromSchema on them. Passing an empty string to this function
 // will cause queries to be generated without any table/view alias.
 func UseSchema(schema string) {
-	Film = Film.FromSchema(schema)
-	Address = Address.FromSchema(schema)
 	Actor = Actor.FromSchema(schema)
+	Address = Address.FromSchema(schema)
 	Category = Category.FromSchema(schema)
 	City = City.FromSchema(schema)
 	Country = Country.FromSchema(schema)
 	Customer = Customer.FromSchema(schema)
+	Film = Film.FromSchema(schema)
 	FilmActor = FilmActor.FromSchema(schema)
 	FilmCategory = FilmCategory.FromSchema(schema)
 	Inventory = Inventory.FromSchema(schema)
 	Language = Language.FromSchema(schema)
+	Payment = Payment.FromSchema(schema)
 	Rental = Rental.FromSchema(schema)
 	Staff = Staff.FromSchema(schema)
-	Payment = Payment.FromSchema(schema)
 	Store = Store.FromSchema(schema)
 }
 `