fix: version detection for Postgres derived variants

alumni · alumni · commit 48ad83bf2964 · 2025-03-31T20:56:52.000+02:00
diff --git a/src/driver/postgres/PostgresQueryRunner.ts b/src/driver/postgres/PostgresQueryRunner.ts
@@ -4160,7 +4160,11 @@ export class PostgresQueryRunner
         const result: [{ version: string }] = await this.query(
             `SELECT version()`,
         )
-        return result[0].version.replace(/^PostgreSQL ([\d.]+) .*$/, "$1")
+
+        // Examples:
+        // Postgres: "PostgreSQL 14.10 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-20), 64-bit"
+        // Yugabyte: "PostgreSQL 11.2-YB-2.18.1.0-b0 on x86_64-pc-linux-gnu, compiled by clang version 15.0.3 (https://github.com/yugabyte/llvm-project.git 0b8d1183745fd3998d8beffeec8cbe99c1b20529), 64-bit"
+        return result[0].version.replace(/^PostgreSQL ([\d.]+).*$/, "$1")
     }
 
     /**
diff --git a/test/functional/cube/postgres/cube-postgres.ts b/test/functional/cube/postgres/cube-postgres.ts
@@ -1,6 +1,8 @@
-import "reflect-metadata"
 import { expect } from "chai"
+import "reflect-metadata"
+
 import { DataSource } from "../../../../src/data-source/DataSource"
+import { DriverUtils } from "../../../../src/driver/DriverUtils"
 import {
     closeTestingConnections,
     createTestingConnections,
@@ -109,12 +111,12 @@ describe("cube-postgres", () => {
                 // Get Postgres version because zero-length cubes are not legal
                 // on all Postgres versions. Zero-length cubes are only tested
                 // to be working on Postgres version >=10.6.
-                const [{ version }] = await connection.query("SELECT version()")
-                const semverArray = version
-                    .replace(/^PostgreSQL ([\d.]+) .*$/, "$1")
-                    .split(".")
-                    .map(Number)
-                if (!(semverArray[0] >= 10 && semverArray[1] >= 6)) {
+                if (
+                    !DriverUtils.isReleaseVersionOrGreater(
+                        connection.driver,
+                        "10.6",
+                    )
+                ) {
                     return
                 }
 
diff --git a/test/github-issues/9318/issue-9318.ts b/test/github-issues/9318/issue-9318.ts
@@ -1,14 +1,14 @@
+import { expect } from "chai"
 import "reflect-metadata"
+
+import { DataSource } from "../../../src"
+import { PostgresDriver } from "../../../src/driver/postgres/PostgresDriver"
 import {
-    createTestingConnections,
     closeTestingConnections,
+    createTestingConnections,
     reloadTestingDatabases,
 } from "../../utils/test-utils"
-import { DataSource } from "../../../src"
-
-import { expect } from "chai"
-import { PostgresDriver } from "../../../src/driver/postgres/PostgresDriver"
-import { VersionUtils } from "../../../src/util/VersionUtils"
+import { DriverUtils } from "../../../src/driver/DriverUtils"
 
 describe("github issues > #9318 Change version query from SHOW server_version to SELECT version", () => {
     let connections: DataSource[]
@@ -29,15 +29,11 @@ describe("github issues > #9318 Change version query from SHOW server_version to
             connections.map(async (connection) => {
                 const { isGeneratedColumnsSupported } =
                     connection.driver as PostgresDriver
-                const result = await connection.query("SELECT VERSION()")
-                const dbVersion = result[0]["version"].replace(
-                    /^PostgreSQL ([\d.]+) .*$/,
-                    "$1",
-                )
-                const versionGreaterOfEqualTo12 = VersionUtils.isGreaterOrEqual(
-                    dbVersion,
-                    "12.0",
-                )
+                const versionGreaterOfEqualTo12 =
+                    DriverUtils.isReleaseVersionOrGreater(
+                        connection.driver,
+                        "12.0",
+                    )
 
                 expect(isGeneratedColumnsSupported).to.eq(
                     versionGreaterOfEqualTo12,

Original file line number	Diff line number	Diff line change
`@@ -4160,7 +4160,11 @@ export class PostgresQueryRunner`
`4160`	`4160`	`const result: [{ version: string }] = await this.query(`
`4161`	`4161`	`SELECT version()`,
`4162`	`4162`	`)`
`4163`		`- return result[0].version.replace(/^PostgreSQL ([\d.]+) .*$/, "$1")`
	`4163`	`+`
	`4164`	`+ // Examples:`
	`4165`	`+ // Postgres: "PostgreSQL 14.10 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-20), 64-bit"`
	`4166`	`+ // Yugabyte: "PostgreSQL 11.2-YB-2.18.1.0-b0 on x86_64-pc-linux-gnu, compiled by clang version 15.0.3 (https://github.com/yugabyte/llvm-project.git 0b8d1183745fd3998d8beffeec8cbe99c1b20529), 64-bit"`
	`4167`	`+ return result[0].version.replace(/^PostgreSQL ([\d.]+).*$/, "$1")`
`4164`	`4168`	`}`
`4165`	`4169`
`4166`	`4170`	`/**`