From 382c2099f7da2c5a81b349fbfceb355fffa396f3 Mon Sep 17 00:00:00 2001
From: Kylesoda <249518290+kylesoda@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:13:14 -0500
Subject: [PATCH] feat: add ORDER BY clause to SQL extract queries for
 consistent result ordering

---
 cmd/go_migrate/build-extract-query.go |  4 ++--
 cmd/go_migrate/main.go                | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmd/go_migrate/build-extract-query.go b/cmd/go_migrate/build-extract-query.go
index 3a00640..df29617 100644
--- a/cmd/go_migrate/build-extract-query.go
+++ b/cmd/go_migrate/build-extract-query.go
@@ -28,7 +28,7 @@ func buildExtractQueryMssql(job MigrationJob, columns []ColumnType) string {
 		}
 	}
 
-	return fmt.Sprintf(`SELECT %s FROM [%s].[%s] WITH (NOLOCK)`, sbColumns.String(), job.Schema, job.Table)
+	return fmt.Sprintf(`SELECT %s FROM [%s].[%s] ORDER BY [%s] ASC`, sbColumns.String(), job.Schema, job.Table, job.PrimaryKey)
 }
 
 func buildExtractQueryPostgres(job MigrationJob, columns []ColumnType) string {
@@ -56,5 +56,5 @@ func buildExtractQueryPostgres(job MigrationJob, columns []ColumnType) string {
 		}
 	}
 
-	return fmt.Sprintf(`SELECT %s FROM "%s"."%s"`, sbColumns.String(), job.Schema, job.Table)
+	return fmt.Sprintf(`SELECT %s FROM "%s"."%s"  ORDER BY "%s" ASC`, sbColumns.String(), job.Schema, job.Table, job.PrimaryKey)
 }
diff --git a/cmd/go_migrate/main.go b/cmd/go_migrate/main.go
index 0901bca..a655b8a 100644
--- a/cmd/go_migrate/main.go
+++ b/cmd/go_migrate/main.go
@@ -5,14 +5,16 @@ import (
 )
 
 type MigrationJob struct {
-	Schema string
-	Table  string
+	Schema     string
+	Table      string
+	PrimaryKey string
 }
 
 var migrationJobs []MigrationJob = []MigrationJob{
 	{
-		Schema: "Cartografia",
-		Table:  "MANZANA",
+		Schema:     "Cartografia",
+		Table:      "MANZANA",
+		PrimaryKey: "GDB_ARCHIVE_OID",
 	},
 }