Merge pull request #1171 from estuary/mysql-batch-query-template

Modified default query template to find non null cursor
estuary · Jan 12, 2024 · b9a13a7 · b9a13a7
2 parents 0f4bad1 + 0cd5cdf
commit b9a13a7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/source-mysql-batch/.snapshots/TestQueryTemplate-FirstOneCursor b/source-mysql-batch/.snapshots/TestQueryTemplate-FirstOneCursor
@@ -1 +1 @@
-SELECT * FROM `test`.`foobar`;
+SELECT * FROM `test`.`foobar` ORDER BY `ka`;
diff --git a/source-mysql-batch/.snapshots/TestQueryTemplate-FirstThreeCursor b/source-mysql-batch/.snapshots/TestQueryTemplate-FirstThreeCursor
@@ -1 +1 @@
-SELECT * FROM `test`.`foobar`;
+SELECT * FROM `test`.`foobar` ORDER BY `ka`, `kb`, `kc`;
diff --git a/source-mysql-batch/.snapshots/TestQueryTemplate-FirstTwoCursor b/source-mysql-batch/.snapshots/TestQueryTemplate-FirstTwoCursor
@@ -1 +1 @@
-SELECT * FROM `test`.`foobar`;
+SELECT * FROM `test`.`foobar` ORDER BY `ka`, `kb`;
diff --git a/source-mysql-batch/main.go b/source-mysql-batch/main.go
@@ -124,7 +124,7 @@ const tableQueryTemplateTemplate = `{{/*****************************************
    ***********************************************************/ -}}
 {{if .CursorFields -}}
   {{- if .IsFirstQuery -}}
-    SELECT * FROM %[1]s;
+    SELECT * FROM %[1]s
   {{- else -}}
     SELECT * FROM %[1]s
 	{{- range $i, $k := $.CursorFields -}}
@@ -135,9 +135,8 @@ const tableQueryTemplateTemplate = `{{/*****************************************
 	  {{- end -}}
 	  {{$k}} > @flow_cursor_value[{{$i}}]
 	{{- end -}}
-	) ORDER BY {{range $i, $k := $.CursorFields}}{{if gt $i 0}}, {{end}}{{$k}}{{end -}}
-	;
-  {{- end -}}
+	) 
+  {{- end}} ORDER BY {{range $i, $k := $.CursorFields}}{{if gt $i 0}}, {{end}}{{$k}}{{end -}};
 {{- else -}}
   SELECT * FROM %[1]s;
 {{- end}}`
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SELECT * FROM `test`.`foobar`;
		SELECT * FROM `test`.`foobar` ORDER BY `ka`;