refactor pgDumpVersion to accept other tools

orgrim · orgrim · commit fa67fe96e905 · 2021-11-02T12:12:06.000+01:00
Rename it to pgToolVersion so that is can get the version of pg_dumpall
as well.  Fix the parsing so that the revision is not used as the min
number with version greater that 10. Use the --version long option that
is available at least from 9.0.
diff --git a/main.go b/main.go
@@ -450,7 +450,7 @@ func (d *dump) dump() error {
 	// It is recommended to use --create with the plain format
 	// from PostgreSQL 11 to get the ACL and configuration of the
 	// database
-	if pgDumpVersion() >= 110000 && fileEnd == "sql" {
+	if pgToolVersion("pg_dump") >= 110000 && fileEnd == "sql" {
 		args = append(args, "--create")
 	}
 
@@ -576,17 +576,33 @@ func formatDumpPath(dir string, timeFormat string, suffix string, dbname string,
 	return filepath.Join(d, f)
 }
 
-func pgDumpVersion() int {
-	vs, err := exec.Command(filepath.Join(binDir, "pg_dump"), "-V").Output()
+func pgToolVersion(tool string) int {
+	vs, err := exec.Command(filepath.Join(binDir, tool), "--version").Output()
 	if err != nil {
-		l.Warnln("failed to retrieve version of pg_dump:", err)
+		l.Warnf("failed to retrieve version of %s: %s", tool, err)
 		return 0
 	}
 
-	var maj, min, rev int
-	fmt.Sscanf(string(vs), "pg_dump (PostgreSQL) %d.%d.%d", &maj, &min, &rev)
+	var maj, min, rev, numver int
+	n, _ := fmt.Sscanf(string(vs), tool+" (PostgreSQL) %d.%d.%d", &maj, &min, &rev)
 
-	return (maj*100+min)*100 + rev
+	if n == 3 {
+		// Before PostgreSQL 10, the format si MAJ.MIN.REV
+		numver = (maj*100+min)*100 + rev
+	} else if n == 2 {
+		// From PostgreSQL 10, the format si MAJ.REV, so the rev ends
+		// up in min with the scan
+		numver = maj*10000 + min
+	} else {
+		// We have the special case of the development version, where the
+		// format is MAJdevel
+		fmt.Sscanf(string(vs), tool+" (PostgreSQL) %ddevel", &maj)
+		numver = maj * 10000
+	}
+
+	l.Verboseln(tool, "version is:", numver)
+
+	return numver
 }
 
 func dumpGlobals(dir string, timeFormat string, conninfo *ConnInfo, fc chan<- string) error {
diff --git a/sql.go b/sql.go
@@ -223,7 +223,7 @@ func dumpCreateDBAndACL(db *pg, dbname string) (string, error) {
 	// this is no longer necessary after 11. Dumping ACL is the
 	// job of pg_dump so we have to check its version, not the
 	// server
-	if pgDumpVersion() >= 110000 {
+	if pgToolVersion("pg_dump") >= 110000 {
 		l.Verboseln("no need to dump create database query and database ACL with pg_dump from >=11")
 		return "", nil
 	}
@@ -400,7 +400,7 @@ func dumpDBConfig(db *pg, dbname string) (string, error) {
 	// this is no longer necessary after 11. Dumping ACL is the
 	// job of pg_dump so we have to check its version, not the
 	// server
-	if pgDumpVersion() >= 110000 {
+	if pgToolVersion("pg_dump") >= 110000 {
 		l.Verboseln("no need to dump database configuration with pg_dump from >=11")
 		return "", nil
 	}
diff --git a/sql_test.go b/sql_test.go
@@ -57,7 +57,7 @@ func needPgConn(t *testing.T) {
 }
 
 func needPgDump(t *testing.T) {
-	if pgDumpVersion() >= 110000 {
+	if pgToolVersion("pg_dump") >= 110000 {
 		t.Skip("testing with a pg_dump version > 11")
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func needPgConn(t *testing.T) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func needPgDump(t *testing.T) {`
`60`		`- if pgDumpVersion() >= 110000 {`
	`60`	`+ if pgToolVersion("pg_dump") >= 110000 {`
`61`	`61`	`t.Skip("testing with a pg_dump version > 11")`
`62`	`62`	`}`
`63`	`63`	`}`