fix: PostgreSQL getVersion() logic - #7488

Merged
kenjis merged 1 commit into
codeigniter4:developfrom
marekmosna:7484-postgresql-server-version
May 21, 2023
Merged

fix: PostgreSQL getVersion() logic#7488
kenjis merged 1 commit into
codeigniter4:developfrom
marekmosna:7484-postgresql-server-version

Conversation

@marekmosna

@marekmosnamarekmosna commented May 9, 2023•
edited by kenjis
Loading

Copy link
Copy Markdown
Contributor

Description
Fixes#7484

Fixies logic of PostgreSQL getVersion() method.

ddevsr
ddevsr suggested changes May 10, 2023
View reviewed changes

@ddevsrddevsr left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove below code in phpstan-baseline.neon.dist

-
message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
count: 1
path: system/Database/Postgre/Connection.php

@ddevsr

ddevsr commented May 10, 2023

Copy link
Copy Markdown
Collaborator

By the way,

Following step how to create PR in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style

Dont forget signing your commit
https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits

@ddevsrddevsr added the bug Verified issues on the current code behavior or pull requests that will fix them label May 10, 2023
@marekmosna
marekmosnaforce-pushed the 7484-postgresql-server-version branch 2 times, most recently from 7ee8775 to 8064aabCompareMay 11, 2023 16:44
@michalsn

michalsn commented May 11, 2023

Copy link
Copy Markdown
Member

@marekmosna Almost there! Could you follow the suggestion from #7488 (review) to fix the PHPStan error?

@kenjiskenjis added the database Issues or pull requests that affect the database layer label May 12, 2023
@kenjiskenjis changed the title Fixes 7484: PostgreSQL getVersion() logicfix: PostgreSQL getVersion() logicMay 12, 2023
kenjis
kenjis reviewed May 12, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php Outdated

$pgVersion = pg_version($this->connID);

return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;

@kenjiskenjisMay 12, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface is public function getVersion(): string;. So false should not be returned.

@marekmosna
marekmosnaforce-pushed the 7484-postgresql-server-version branch from 98362e6 to efbf68cCompareMay 12, 2023 18:06
@kenjiskenjis added the tests needed Pull requests that need tests label May 12, 2023
@marekmosna
marekmosnaforce-pushed the 7484-postgresql-server-version branch from efbf68c to 3292e43CompareMay 13, 2023 11:05
kenjis
kenjis reviewed May 17, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php Outdated

return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
$pgVersion = pg_version($this->connID);
$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';

@kenjiskenjisMay 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()

Is it impossible to get the version number 7.4 or lower?

@kenjiskenjisMay 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg_version() returns an array with the client, protocol and server version. Protocol and server versions are only available if PHP was compiled with PostgreSQL 7.4 or later.
https://www.php.net/manual/en/function.pg-version.php#refsect1-function.pg-version-description

There is no version requirement in the docs:
https://codeigniter4.github.io/CodeIgniter4/intro/requirements.html#supported-databases

But PostgreSQL 11 will stop receiving fixes on November 9, 2023.
https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/

@codeigniter4/core-team @codeigniter4/database-team
Do we need to support versions prior to 7.4?
Why don't we add (version 7.4 and above only) in the docs?

@samsonasiksamsonasikMay 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostgreSQL 7.4 seems too old, it seems it need to be documented in docs

@marekmosnamarekmosnaMay 17, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()

that was the question in the related issue #7488

@michalsnmichalsnMay 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no $pgVersion['server'], we should return an empty string.

Adding a note (version 7.4 and above only) is a good idea.

@kenjiskenjisMay 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR: #7507

@kenjiskenjis mentioned this pull request May 17, 2023
Merged
2 tasks
kenjis
kenjis reviewed May 18, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php Outdated

return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
$pgVersion = pg_version($this->connID);
$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';

@kenjiskenjisMay 18, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
$this->dataCache['version'] = $pgVersion['server'] ?? '';

@kenjis

kenjis commented May 18, 2023

Copy link
Copy Markdown
Member

@marekmosna It seems there is no test code for getVersion().
If you can write test code, add test code.
We would appreciate it.

@marekmosna
marekmosnaforce-pushed the 7484-postgresql-server-version branch from 3292e43 to 4c6e4ecCompareMay 20, 2023 07:13
@marekmosna

marekmosna commented May 20, 2023

Copy link
Copy Markdown
ContributorAuthor

@marekmosna It seems there is no test code for getVersion(). If you can write test code, add test code. We would appreciate it.

I'm sorry @kenjis but I'm not a php developer so I can't

@kenjis

kenjis commented May 20, 2023

Copy link
Copy Markdown
Member

@marekmosna Okay, I got it.

michalsn
michalsn approved these changes May 20, 2023
View reviewed changes

@michalsnmichalsn left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

kenjis
kenjis approved these changes May 21, 2023
View reviewed changes

@kenjiskenjis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@kenjis
kenjis merged commit d334a2a into codeigniter4:developMay 21, 2023
@kenjiskenjis mentioned this pull request May 21, 2023
Merged
4 tasks
@kenjis

kenjis commented May 21, 2023

Copy link
Copy Markdown
Member

@codeigniter4/database-team
It seems PostgreSQL may return the version like '15.3 (Debian 15.3-1.pgdg110+1)'.
https://github.com/codeigniter4/CodeIgniter4/actions/runs/5035338925/jobs/9030854318

Is this okay?

@michalsn

michalsn commented May 21, 2023

Copy link
Copy Markdown
Member

Good point. I think we should filter out the version.

michalsn
michalsn reviewed May 21, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php

return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
$pgVersion = pg_version($this->connID);
$this->dataCache['version'] = $pgVersion['server'] ?? '';

@michalsnmichalsnMay 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$this->dataCache['version'] = $pgVersion['server'] ?? '';
$this->dataCache['version'] = isset($pgVersion['server']) ?
preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '' :
'';

This should work if we deal with something like 15.3 (Debian 15.3-1.pgdg110+1) - as Kenjis pointed out earlier.

@kenjiskenjisMay 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will take care of it in #7509

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kenjiskenjiskenjis approved these changes
@michalsnmichalsnmichalsn approved these changes
@samsonasiksamsonasiksamsonasik left review comments
+1 more reviewer
@ddevsrddevsrddevsr requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

bugVerified issues on the current code behavior or pull requests that will fix themdatabaseIssues or pull requests that affect the database layertests neededPull requests that need tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Bug: PosgreSQL server version

5 participants

@marekmosna@ddevsr@michalsn@kenjis@samsonasik
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: PostgreSQL getVersion() logic - #7488
Merged
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
May 21, 2023
Merged
fix: PostgreSQL getVersion() logic#7488
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
Conversation
@marekmosna
@marekmosnamarekmosna
commented
May 9, 2023•

edited by kenjis

Loading

Copy link


Copy Markdown

Contributor
Description
Fixes#7484
Fixies logic of PostgreSQL getVersion() method.
ddevsr
ddevsr
suggested changes
May 10, 2023
View reviewed changes
@ddevsrddevsr
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove below code in phpstan-baseline.neon.dist
-
message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
count: 1
path: system/Database/Postgre/Connection.php

@ddevsr
ddevsr
commented
May 10, 2023

Copy link


Copy Markdown

Collaborator
By the way,
Following step how to create PR in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style
Dont forget signing your commit
https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
@ddevsrddevsr
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
May 10, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
2 times, most recently
from
7ee8775 to
8064aabCompareMay 11, 2023 16:44
@michalsn
michalsn
commented
May 11, 2023

Copy link


Copy Markdown

Member
@marekmosna Almost there! Could you follow the suggestion from #7488 (review) to fix the PHPStan error?
@kenjiskenjis
added
the 
database
Issues or pull requests that affect the database layer
label
May 12, 2023
@kenjiskenjis
changed the title
Fixes 7484: PostgreSQL getVersion() logicfix: PostgreSQL getVersion() logicMay 12, 2023
kenjis
kenjis
reviewed
May 12, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 $pgVersion = pg_version($this->connID);

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
@kenjiskenjisMay 12, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface is public function getVersion(): string;. So false should not be returned.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
98362e6 to
efbf68cCompareMay 12, 2023 18:06
@kenjiskenjis
added
the 
tests needed
Pull requests that need tests
label
May 12, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
efbf68c to
3292e43CompareMay 13, 2023 11:05
kenjis
kenjis
reviewed
May 17, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
Is it impossible to get the version number 7.4 or lower?
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg_version() returns an array with the client, protocol and server version. Protocol and server versions are only available if PHP was compiled with PostgreSQL 7.4 or later.
https://www.php.net/manual/en/function.pg-version.php#refsect1-function.pg-version-description
There is no version requirement in the docs:
https://codeigniter4.github.io/CodeIgniter4/intro/requirements.html#supported-databases
But PostgreSQL 11 will stop receiving fixes on November 9, 2023.
https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/
@codeigniter4/core-team @codeigniter4/database-team

Do we need to support versions prior to 7.4?

Why don't we add (version 7.4 and above only) in the docs?
@samsonasiksamsonasikMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostgreSQL 7.4 seems too old, it seems it need to be documented in docs
@marekmosnamarekmosnaMay 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
that was the question in the related issue #7488
@michalsnmichalsnMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no $pgVersion['server'], we should return an empty string.
Adding a note (version 7.4 and above only) is a good idea.
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR: #7507
@kenjiskenjis
mentioned this pull request
May 17, 2023
 Merged

2 tasks
kenjis
kenjis
reviewed
May 18, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 18, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
$this->dataCache['version'] = $pgVersion['server'] ?? '';
@kenjis
kenjis
commented
May 18, 2023

Copy link


Copy Markdown

Member
@marekmosna It seems there is no test code for getVersion().

If you can write test code, add test code.

We would appreciate it.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
3292e43 to
4c6e4ecCompareMay 20, 2023 07:13
@marekmosna
marekmosna
commented
May 20, 2023

Copy link


Copy Markdown

ContributorAuthor
@marekmosna It seems there is no test code for getVersion(). If you can write test code, add test code. We would appreciate it.
I'm sorry @kenjis but I'm not a php developer so I can't
@kenjis
kenjis
commented
May 20, 2023

Copy link


Copy Markdown

Member
@marekmosna Okay, I got it.
michalsn
michalsn
approved these changes
May 20, 2023
View reviewed changes
@michalsnmichalsn
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
kenjis
kenjis
approved these changes
May 21, 2023
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
@kenjis
kenjis
merged commit d334a2a
into
codeigniter4:developMay 21, 2023
@kenjiskenjis
mentioned this pull request
May 21, 2023
 Merged

4 tasks
@kenjis
kenjis
commented
May 21, 2023

Copy link


Copy Markdown

Member
@codeigniter4/database-team

It seems PostgreSQL may return the version like '15.3 (Debian 15.3-1.pgdg110+1)'.
https://github.com/codeigniter4/CodeIgniter4/actions/runs/5035338925/jobs/9030854318
Is this okay?
@michalsn
michalsn
commented
May 21, 2023

Copy link


Copy Markdown

Member
Good point. I think we should filter out the version.
michalsn
michalsn
reviewed
May 21, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? '';
@michalsnmichalsnMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? '';
$this->dataCache['version'] = isset($pgVersion['server']) ? 
preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '' :
'';
This should work if we deal with something like 15.3 (Debian 15.3-1.pgdg110+1) - as Kenjis pointed out earlier.
@kenjiskenjisMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will take care of it in #7509
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis approved these changes
@michalsnmichalsnmichalsn approved these changes
@samsonasiksamsonasiksamsonasik left review comments

+1 more reviewer

@ddevsrddevsrddevsr requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix themdatabaseIssues or pull requests that affect the database layertests neededPull requests that need tests

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: PosgreSQL server version


5 participants

@marekmosna@ddevsr@michalsn@kenjis@samsonasik

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: PostgreSQL getVersion() logic - #7488
Merged
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
May 21, 2023
Merged
fix: PostgreSQL getVersion() logic#7488
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
Conversation
@marekmosna
@marekmosnamarekmosna
commented
May 9, 2023•

edited by kenjis

Loading

Copy link


Copy Markdown

Contributor
Description
Fixes#7484
Fixies logic of PostgreSQL getVersion() method.
ddevsr
ddevsr
suggested changes
May 10, 2023
View reviewed changes
@ddevsrddevsr
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove below code in phpstan-baseline.neon.dist
-
message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
count: 1
path: system/Database/Postgre/Connection.php

@ddevsr
ddevsr
commented
May 10, 2023

Copy link


Copy Markdown

Collaborator
By the way,
Following step how to create PR in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style
Dont forget signing your commit
https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
@ddevsrddevsr
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
May 10, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
2 times, most recently
from
7ee8775 to
8064aabCompareMay 11, 2023 16:44
@michalsn
michalsn
commented
May 11, 2023

Copy link


Copy Markdown

Member
@marekmosna Almost there! Could you follow the suggestion from #7488 (review) to fix the PHPStan error?
@kenjiskenjis
added
the 
database
Issues or pull requests that affect the database layer
label
May 12, 2023
@kenjiskenjis
changed the title
Fixes 7484: PostgreSQL getVersion() logicfix: PostgreSQL getVersion() logicMay 12, 2023
kenjis
kenjis
reviewed
May 12, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 $pgVersion = pg_version($this->connID);

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
@kenjiskenjisMay 12, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface is public function getVersion(): string;. So false should not be returned.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
98362e6 to
efbf68cCompareMay 12, 2023 18:06
@kenjiskenjis
added
the 
tests needed
Pull requests that need tests
label
May 12, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
efbf68c to
3292e43CompareMay 13, 2023 11:05
kenjis
kenjis
reviewed
May 17, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
Is it impossible to get the version number 7.4 or lower?
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg_version() returns an array with the client, protocol and server version. Protocol and server versions are only available if PHP was compiled with PostgreSQL 7.4 or later.
https://www.php.net/manual/en/function.pg-version.php#refsect1-function.pg-version-description
There is no version requirement in the docs:
https://codeigniter4.github.io/CodeIgniter4/intro/requirements.html#supported-databases
But PostgreSQL 11 will stop receiving fixes on November 9, 2023.
https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/
@codeigniter4/core-team @codeigniter4/database-team

Do we need to support versions prior to 7.4?

Why don't we add (version 7.4 and above only) in the docs?
@samsonasiksamsonasikMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostgreSQL 7.4 seems too old, it seems it need to be documented in docs
@marekmosnamarekmosnaMay 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
that was the question in the related issue #7488
@michalsnmichalsnMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no $pgVersion['server'], we should return an empty string.
Adding a note (version 7.4 and above only) is a good idea.
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR: #7507
@kenjiskenjis
mentioned this pull request
May 17, 2023
 Merged

2 tasks
kenjis
kenjis
reviewed
May 18, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 18, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
$this->dataCache['version'] = $pgVersion['server'] ?? '';
@kenjis
kenjis
commented
May 18, 2023

Copy link


Copy Markdown

Member
@marekmosna It seems there is no test code for getVersion().

If you can write test code, add test code.

We would appreciate it.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
3292e43 to
4c6e4ecCompareMay 20, 2023 07:13
@marekmosna
marekmosna
commented
May 20, 2023

Copy link


Copy Markdown

ContributorAuthor
@marekmosna It seems there is no test code for getVersion(). If you can write test code, add test code. We would appreciate it.
I'm sorry @kenjis but I'm not a php developer so I can't
@kenjis
kenjis
commented
May 20, 2023

Copy link


Copy Markdown

Member
@marekmosna Okay, I got it.
michalsn
michalsn
approved these changes
May 20, 2023
View reviewed changes
@michalsnmichalsn
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
kenjis
kenjis
approved these changes
May 21, 2023
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
@kenjis
kenjis
merged commit d334a2a
into
codeigniter4:developMay 21, 2023
@kenjiskenjis
mentioned this pull request
May 21, 2023
 Merged

4 tasks
@kenjis
kenjis
commented
May 21, 2023

Copy link


Copy Markdown

Member
@codeigniter4/database-team

It seems PostgreSQL may return the version like '15.3 (Debian 15.3-1.pgdg110+1)'.
https://github.com/codeigniter4/CodeIgniter4/actions/runs/5035338925/jobs/9030854318
Is this okay?
@michalsn
michalsn
commented
May 21, 2023

Copy link


Copy Markdown

Member
Good point. I think we should filter out the version.
michalsn
michalsn
reviewed
May 21, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? '';
@michalsnmichalsnMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? '';
$this->dataCache['version'] = isset($pgVersion['server']) ? 
preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '' :
'';
This should work if we deal with something like 15.3 (Debian 15.3-1.pgdg110+1) - as Kenjis pointed out earlier.
@kenjiskenjisMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will take care of it in #7509
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis approved these changes
@michalsnmichalsnmichalsn approved these changes
@samsonasiksamsonasiksamsonasik left review comments

+1 more reviewer

@ddevsrddevsrddevsr requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix themdatabaseIssues or pull requests that affect the database layertests neededPull requests that need tests

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: PosgreSQL server version


5 participants

@marekmosna@ddevsr@michalsn@kenjis@samsonasik

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: PostgreSQL getVersion() logic - #7488
Merged
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
May 21, 2023
Merged
fix: PostgreSQL getVersion() logic#7488
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
Conversation
@marekmosna
@marekmosnamarekmosna
commented
May 9, 2023•

edited by kenjis

Loading

Copy link


Copy Markdown

Contributor
Description
Fixes#7484
Fixies logic of PostgreSQL getVersion() method.
ddevsr
ddevsr
suggested changes
May 10, 2023
View reviewed changes
@ddevsrddevsr
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove below code in phpstan-baseline.neon.dist
-
message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
count: 1
path: system/Database/Postgre/Connection.php

@ddevsr
ddevsr
commented
May 10, 2023

Copy link


Copy Markdown

Collaborator
By the way,
Following step how to create PR in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style
Dont forget signing your commit
https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
@ddevsrddevsr
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
May 10, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
2 times, most recently
from
7ee8775 to
8064aabCompareMay 11, 2023 16:44
@michalsn
michalsn
commented
May 11, 2023

Copy link


Copy Markdown

Member
@marekmosna Almost there! Could you follow the suggestion from #7488 (review) to fix the PHPStan error?
@kenjiskenjis
added
the 
database
Issues or pull requests that affect the database layer
label
May 12, 2023
@kenjiskenjis
changed the title
Fixes 7484: PostgreSQL getVersion() logicfix: PostgreSQL getVersion() logicMay 12, 2023
kenjis
kenjis
reviewed
May 12, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 $pgVersion = pg_version($this->connID);

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
@kenjiskenjisMay 12, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface is public function getVersion(): string;. So false should not be returned.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
98362e6 to
efbf68cCompareMay 12, 2023 18:06
@kenjiskenjis
added
the 
tests needed
Pull requests that need tests
label
May 12, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
efbf68c to
3292e43CompareMay 13, 2023 11:05
kenjis
kenjis
reviewed
May 17, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
Is it impossible to get the version number 7.4 or lower?
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg_version() returns an array with the client, protocol and server version. Protocol and server versions are only available if PHP was compiled with PostgreSQL 7.4 or later.
https://www.php.net/manual/en/function.pg-version.php#refsect1-function.pg-version-description
There is no version requirement in the docs:
https://codeigniter4.github.io/CodeIgniter4/intro/requirements.html#supported-databases
But PostgreSQL 11 will stop receiving fixes on November 9, 2023.
https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/
@codeigniter4/core-team @codeigniter4/database-team

Do we need to support versions prior to 7.4?

Why don't we add (version 7.4 and above only) in the docs?
@samsonasiksamsonasikMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostgreSQL 7.4 seems too old, it seems it need to be documented in docs
@marekmosnamarekmosnaMay 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
that was the question in the related issue #7488
@michalsnmichalsnMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no $pgVersion['server'], we should return an empty string.
Adding a note (version 7.4 and above only) is a good idea.
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR: #7507
@kenjiskenjis
mentioned this pull request
May 17, 2023
 Merged

2 tasks
kenjis
kenjis
reviewed
May 18, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 18, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
$this->dataCache['version'] = $pgVersion['server'] ?? '';
@kenjis
kenjis
commented
May 18, 2023

Copy link


Copy Markdown

Member
@marekmosna It seems there is no test code for getVersion().

If you can write test code, add test code.

We would appreciate it.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
3292e43 to
4c6e4ecCompareMay 20, 2023 07:13
@marekmosna
marekmosna
commented
May 20, 2023

Copy link


Copy Markdown

ContributorAuthor
@marekmosna It seems there is no test code for getVersion(). If you can write test code, add test code. We would appreciate it.
I'm sorry @kenjis but I'm not a php developer so I can't
@kenjis
kenjis
commented
May 20, 2023

Copy link


Copy Markdown

Member
@marekmosna Okay, I got it.
michalsn
michalsn
approved these changes
May 20, 2023
View reviewed changes
@michalsnmichalsn
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
kenjis
kenjis
approved these changes
May 21, 2023
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
@kenjis
kenjis
merged commit d334a2a
into
codeigniter4:developMay 21, 2023
@kenjiskenjis
mentioned this pull request
May 21, 2023
 Merged

4 tasks
@kenjis
kenjis
commented
May 21, 2023

Copy link


Copy Markdown

Member
@codeigniter4/database-team

It seems PostgreSQL may return the version like '15.3 (Debian 15.3-1.pgdg110+1)'.
https://github.com/codeigniter4/CodeIgniter4/actions/runs/5035338925/jobs/9030854318
Is this okay?
@michalsn
michalsn
commented
May 21, 2023

Copy link


Copy Markdown

Member
Good point. I think we should filter out the version.
michalsn
michalsn
reviewed
May 21, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? '';
@michalsnmichalsnMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? '';
$this->dataCache['version'] = isset($pgVersion['server']) ? 
preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '' :
'';
This should work if we deal with something like 15.3 (Debian 15.3-1.pgdg110+1) - as Kenjis pointed out earlier.
@kenjiskenjisMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will take care of it in #7509
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis approved these changes
@michalsnmichalsnmichalsn approved these changes
@samsonasiksamsonasiksamsonasik left review comments

+1 more reviewer

@ddevsrddevsrddevsr requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix themdatabaseIssues or pull requests that affect the database layertests neededPull requests that need tests

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: PosgreSQL server version


5 participants

@marekmosna@ddevsr@michalsn@kenjis@samsonasik

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: PostgreSQL getVersion() logic - #7488
Merged
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
May 21, 2023
Merged
fix: PostgreSQL getVersion() logic#7488
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
Conversation
@marekmosna
@marekmosnamarekmosna
commented
May 9, 2023•

edited by kenjis

Loading

Copy link


Copy Markdown

Contributor
Description
Fixes#7484
Fixies logic of PostgreSQL getVersion() method.
ddevsr
ddevsr
suggested changes
May 10, 2023
View reviewed changes
@ddevsrddevsr
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove below code in phpstan-baseline.neon.dist
-
message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
count: 1
path: system/Database/Postgre/Connection.php

@ddevsr
ddevsr
commented
May 10, 2023

Copy link


Copy Markdown

Collaborator
By the way,
Following step how to create PR in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style
Dont forget signing your commit
https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
@ddevsrddevsr
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
May 10, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
2 times, most recently
from
7ee8775 to
8064aabCompareMay 11, 2023 16:44
@michalsn
michalsn
commented
May 11, 2023

Copy link


Copy Markdown

Member
@marekmosna Almost there! Could you follow the suggestion from #7488 (review) to fix the PHPStan error?
@kenjiskenjis
added
the 
database
Issues or pull requests that affect the database layer
label
May 12, 2023
@kenjiskenjis
changed the title
Fixes 7484: PostgreSQL getVersion() logicfix: PostgreSQL getVersion() logicMay 12, 2023
kenjis
kenjis
reviewed
May 12, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 $pgVersion = pg_version($this->connID);

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
@kenjiskenjisMay 12, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface is public function getVersion(): string;. So false should not be returned.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
98362e6 to
efbf68cCompareMay 12, 2023 18:06
@kenjiskenjis
added
the 
tests needed
Pull requests that need tests
label
May 12, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
efbf68c to
3292e43CompareMay 13, 2023 11:05
kenjis
kenjis
reviewed
May 17, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
Is it impossible to get the version number 7.4 or lower?
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg_version() returns an array with the client, protocol and server version. Protocol and server versions are only available if PHP was compiled with PostgreSQL 7.4 or later.
https://www.php.net/manual/en/function.pg-version.php#refsect1-function.pg-version-description
There is no version requirement in the docs:
https://codeigniter4.github.io/CodeIgniter4/intro/requirements.html#supported-databases
But PostgreSQL 11 will stop receiving fixes on November 9, 2023.
https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/
@codeigniter4/core-team @codeigniter4/database-team

Do we need to support versions prior to 7.4?

Why don't we add (version 7.4 and above only) in the docs?
@samsonasiksamsonasikMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostgreSQL 7.4 seems too old, it seems it need to be documented in docs
@marekmosnamarekmosnaMay 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
that was the question in the related issue #7488
@michalsnmichalsnMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no $pgVersion['server'], we should return an empty string.
Adding a note (version 7.4 and above only) is a good idea.
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR: #7507
@kenjiskenjis
mentioned this pull request
May 17, 2023
 Merged

2 tasks
kenjis
kenjis
reviewed
May 18, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 18, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
$this->dataCache['version'] = $pgVersion['server'] ?? '';
@kenjis
kenjis
commented
May 18, 2023

Copy link


Copy Markdown

Member
@marekmosna It seems there is no test code for getVersion().

If you can write test code, add test code.

We would appreciate it.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
3292e43 to
4c6e4ecCompareMay 20, 2023 07:13
@marekmosna
marekmosna
commented
May 20, 2023

Copy link


Copy Markdown

ContributorAuthor
@marekmosna It seems there is no test code for getVersion(). If you can write test code, add test code. We would appreciate it.
I'm sorry @kenjis but I'm not a php developer so I can't
@kenjis
kenjis
commented
May 20, 2023

Copy link


Copy Markdown

Member
@marekmosna Okay, I got it.
michalsn
michalsn
approved these changes
May 20, 2023
View reviewed changes
@michalsnmichalsn
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
kenjis
kenjis
approved these changes
May 21, 2023
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
@kenjis
kenjis
merged commit d334a2a
into
codeigniter4:developMay 21, 2023
@kenjiskenjis
mentioned this pull request
May 21, 2023
 Merged

4 tasks
@kenjis
kenjis
commented
May 21, 2023

Copy link


Copy Markdown

Member
@codeigniter4/database-team

It seems PostgreSQL may return the version like '15.3 (Debian 15.3-1.pgdg110+1)'.
https://github.com/codeigniter4/CodeIgniter4/actions/runs/5035338925/jobs/9030854318
Is this okay?
@michalsn
michalsn
commented
May 21, 2023

Copy link


Copy Markdown

Member
Good point. I think we should filter out the version.
michalsn
michalsn
reviewed
May 21, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? '';
@michalsnmichalsnMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? '';
$this->dataCache['version'] = isset($pgVersion['server']) ? 
preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '' :
'';
This should work if we deal with something like 15.3 (Debian 15.3-1.pgdg110+1) - as Kenjis pointed out earlier.
@kenjiskenjisMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will take care of it in #7509
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis approved these changes
@michalsnmichalsnmichalsn approved these changes
@samsonasiksamsonasiksamsonasik left review comments

+1 more reviewer

@ddevsrddevsrddevsr requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix themdatabaseIssues or pull requests that affect the database layertests neededPull requests that need tests

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: PosgreSQL server version


5 participants

@marekmosna@ddevsr@michalsn@kenjis@samsonasik

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: PostgreSQL getVersion() logic - #7488
Merged
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
May 21, 2023
Merged
fix: PostgreSQL getVersion() logic#7488
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
Conversation
@marekmosna
@marekmosnamarekmosna
commented
May 9, 2023•

edited by kenjis

Loading

Copy link


Copy Markdown

Contributor
Description
Fixes#7484
Fixies logic of PostgreSQL getVersion() method.
ddevsr
ddevsr
suggested changes
May 10, 2023
View reviewed changes
@ddevsrddevsr
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove below code in phpstan-baseline.neon.dist
-
message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
count: 1
path: system/Database/Postgre/Connection.php

@ddevsr
ddevsr
commented
May 10, 2023

Copy link


Copy Markdown

Collaborator
By the way,
Following step how to create PR in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style
Dont forget signing your commit
https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
@ddevsrddevsr
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
May 10, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
2 times, most recently
from
7ee8775 to
8064aabCompareMay 11, 2023 16:44
@michalsn
michalsn
commented
May 11, 2023

Copy link


Copy Markdown

Member
@marekmosna Almost there! Could you follow the suggestion from #7488 (review) to fix the PHPStan error?
@kenjiskenjis
added
the 
database
Issues or pull requests that affect the database layer
label
May 12, 2023
@kenjiskenjis
changed the title
Fixes 7484: PostgreSQL getVersion() logicfix: PostgreSQL getVersion() logicMay 12, 2023
kenjis
kenjis
reviewed
May 12, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 $pgVersion = pg_version($this->connID);

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
@kenjiskenjisMay 12, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface is public function getVersion(): string;. So false should not be returned.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
98362e6 to
efbf68cCompareMay 12, 2023 18:06
@kenjiskenjis
added
the 
tests needed
Pull requests that need tests
label
May 12, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
efbf68c to
3292e43CompareMay 13, 2023 11:05
kenjis
kenjis
reviewed
May 17, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
Is it impossible to get the version number 7.4 or lower?
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg_version() returns an array with the client, protocol and server version. Protocol and server versions are only available if PHP was compiled with PostgreSQL 7.4 or later.
https://www.php.net/manual/en/function.pg-version.php#refsect1-function.pg-version-description
There is no version requirement in the docs:
https://codeigniter4.github.io/CodeIgniter4/intro/requirements.html#supported-databases
But PostgreSQL 11 will stop receiving fixes on November 9, 2023.
https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/
@codeigniter4/core-team @codeigniter4/database-team

Do we need to support versions prior to 7.4?

Why don't we add (version 7.4 and above only) in the docs?
@samsonasiksamsonasikMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostgreSQL 7.4 seems too old, it seems it need to be documented in docs
@marekmosnamarekmosnaMay 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
that was the question in the related issue #7488
@michalsnmichalsnMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no $pgVersion['server'], we should return an empty string.
Adding a note (version 7.4 and above only) is a good idea.
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR: #7507
@kenjiskenjis
mentioned this pull request
May 17, 2023
 Merged

2 tasks
kenjis
kenjis
reviewed
May 18, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 18, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
$this->dataCache['version'] = $pgVersion['server'] ?? '';
@kenjis
kenjis
commented
May 18, 2023

Copy link


Copy Markdown

Member
@marekmosna It seems there is no test code for getVersion().

If you can write test code, add test code.

We would appreciate it.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
3292e43 to
4c6e4ecCompareMay 20, 2023 07:13
@marekmosna
marekmosna
commented
May 20, 2023

Copy link


Copy Markdown

ContributorAuthor
@marekmosna It seems there is no test code for getVersion(). If you can write test code, add test code. We would appreciate it.
I'm sorry @kenjis but I'm not a php developer so I can't
@kenjis
kenjis
commented
May 20, 2023

Copy link


Copy Markdown

Member
@marekmosna Okay, I got it.
michalsn
michalsn
approved these changes
May 20, 2023
View reviewed changes
@michalsnmichalsn
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
kenjis
kenjis
approved these changes
May 21, 2023
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
@kenjis
kenjis
merged commit d334a2a
into
codeigniter4:developMay 21, 2023
@kenjiskenjis
mentioned this pull request
May 21, 2023
 Merged

4 tasks
@kenjis
kenjis
commented
May 21, 2023

Copy link


Copy Markdown

Member
@codeigniter4/database-team

It seems PostgreSQL may return the version like '15.3 (Debian 15.3-1.pgdg110+1)'.
https://github.com/codeigniter4/CodeIgniter4/actions/runs/5035338925/jobs/9030854318
Is this okay?
@michalsn
michalsn
commented
May 21, 2023

Copy link


Copy Markdown

Member
Good point. I think we should filter out the version.
michalsn
michalsn
reviewed
May 21, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? '';
@michalsnmichalsnMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? '';
$this->dataCache['version'] = isset($pgVersion['server']) ? 
preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '' :
'';
This should work if we deal with something like 15.3 (Debian 15.3-1.pgdg110+1) - as Kenjis pointed out earlier.
@kenjiskenjisMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will take care of it in #7509
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis approved these changes
@michalsnmichalsnmichalsn approved these changes
@samsonasiksamsonasiksamsonasik left review comments

+1 more reviewer

@ddevsrddevsrddevsr requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix themdatabaseIssues or pull requests that affect the database layertests neededPull requests that need tests

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: PosgreSQL server version


5 participants

@marekmosna@ddevsr@michalsn@kenjis@samsonasik

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: PostgreSQL getVersion() logic - #7488
Merged
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
May 21, 2023
Merged
fix: PostgreSQL getVersion() logic#7488
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
Conversation
@marekmosna
@marekmosnamarekmosna
commented
May 9, 2023•

edited by kenjis

Loading

Copy link


Copy Markdown

Contributor
Description
Fixes#7484
Fixies logic of PostgreSQL getVersion() method.
ddevsr
ddevsr
suggested changes
May 10, 2023
View reviewed changes
@ddevsrddevsr
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove below code in phpstan-baseline.neon.dist
-
message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
count: 1
path: system/Database/Postgre/Connection.php

@ddevsr
ddevsr
commented
May 10, 2023

Copy link


Copy Markdown

Collaborator
By the way,
Following step how to create PR in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style
Dont forget signing your commit
https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
@ddevsrddevsr
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
May 10, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
2 times, most recently
from
7ee8775 to
8064aabCompareMay 11, 2023 16:44
@michalsn
michalsn
commented
May 11, 2023

Copy link


Copy Markdown

Member
@marekmosna Almost there! Could you follow the suggestion from #7488 (review) to fix the PHPStan error?
@kenjiskenjis
added
the 
database
Issues or pull requests that affect the database layer
label
May 12, 2023
@kenjiskenjis
changed the title
Fixes 7484: PostgreSQL getVersion() logicfix: PostgreSQL getVersion() logicMay 12, 2023
kenjis
kenjis
reviewed
May 12, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 $pgVersion = pg_version($this->connID);

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
@kenjiskenjisMay 12, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface is public function getVersion(): string;. So false should not be returned.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
98362e6 to
efbf68cCompareMay 12, 2023 18:06
@kenjiskenjis
added
the 
tests needed
Pull requests that need tests
label
May 12, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
efbf68c to
3292e43CompareMay 13, 2023 11:05
kenjis
kenjis
reviewed
May 17, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
Is it impossible to get the version number 7.4 or lower?
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg_version() returns an array with the client, protocol and server version. Protocol and server versions are only available if PHP was compiled with PostgreSQL 7.4 or later.
https://www.php.net/manual/en/function.pg-version.php#refsect1-function.pg-version-description
There is no version requirement in the docs:
https://codeigniter4.github.io/CodeIgniter4/intro/requirements.html#supported-databases
But PostgreSQL 11 will stop receiving fixes on November 9, 2023.
https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/
@codeigniter4/core-team @codeigniter4/database-team

Do we need to support versions prior to 7.4?

Why don't we add (version 7.4 and above only) in the docs?
@samsonasiksamsonasikMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostgreSQL 7.4 seems too old, it seems it need to be documented in docs
@marekmosnamarekmosnaMay 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
that was the question in the related issue #7488
@michalsnmichalsnMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no $pgVersion['server'], we should return an empty string.
Adding a note (version 7.4 and above only) is a good idea.
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR: #7507
@kenjiskenjis
mentioned this pull request
May 17, 2023
 Merged

2 tasks
kenjis
kenjis
reviewed
May 18, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 18, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
$this->dataCache['version'] = $pgVersion['server'] ?? '';
@kenjis
kenjis
commented
May 18, 2023

Copy link


Copy Markdown

Member
@marekmosna It seems there is no test code for getVersion().

If you can write test code, add test code.

We would appreciate it.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
3292e43 to
4c6e4ecCompareMay 20, 2023 07:13
@marekmosna
marekmosna
commented
May 20, 2023

Copy link


Copy Markdown

ContributorAuthor
@marekmosna It seems there is no test code for getVersion(). If you can write test code, add test code. We would appreciate it.
I'm sorry @kenjis but I'm not a php developer so I can't
@kenjis
kenjis
commented
May 20, 2023

Copy link


Copy Markdown

Member
@marekmosna Okay, I got it.
michalsn
michalsn
approved these changes
May 20, 2023
View reviewed changes
@michalsnmichalsn
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
kenjis
kenjis
approved these changes
May 21, 2023
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
@kenjis
kenjis
merged commit d334a2a
into
codeigniter4:developMay 21, 2023
@kenjiskenjis
mentioned this pull request
May 21, 2023
 Merged

4 tasks
@kenjis
kenjis
commented
May 21, 2023

Copy link


Copy Markdown

Member
@codeigniter4/database-team

It seems PostgreSQL may return the version like '15.3 (Debian 15.3-1.pgdg110+1)'.
https://github.com/codeigniter4/CodeIgniter4/actions/runs/5035338925/jobs/9030854318
Is this okay?
@michalsn
michalsn
commented
May 21, 2023

Copy link


Copy Markdown

Member
Good point. I think we should filter out the version.
michalsn
michalsn
reviewed
May 21, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? '';
@michalsnmichalsnMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? '';
$this->dataCache['version'] = isset($pgVersion['server']) ? 
preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '' :
'';
This should work if we deal with something like 15.3 (Debian 15.3-1.pgdg110+1) - as Kenjis pointed out earlier.
@kenjiskenjisMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will take care of it in #7509
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis approved these changes
@michalsnmichalsnmichalsn approved these changes
@samsonasiksamsonasiksamsonasik left review comments

+1 more reviewer

@ddevsrddevsrddevsr requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix themdatabaseIssues or pull requests that affect the database layertests neededPull requests that need tests

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: PosgreSQL server version


5 participants

@marekmosna@ddevsr@michalsn@kenjis@samsonasik

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: PostgreSQL getVersion() logic - #7488
Merged
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
May 21, 2023
Merged
fix: PostgreSQL getVersion() logic#7488
kenjis merged 1 commit into
codeigniter4:developfrom 
marekmosna:7484-postgresql-server-version
Conversation
@marekmosna
@marekmosnamarekmosna
commented
May 9, 2023•

edited by kenjis

Loading

Copy link


Copy Markdown

Contributor
Description
Fixes#7484
Fixies logic of PostgreSQL getVersion() method.
ddevsr
ddevsr
suggested changes
May 10, 2023
View reviewed changes
@ddevsrddevsr
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove below code in phpstan-baseline.neon.dist
-
message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
count: 1
path: system/Database/Postgre/Connection.php

@ddevsr
ddevsr
commented
May 10, 2023

Copy link


Copy Markdown

Collaborator
By the way,
Following step how to create PR in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/pull_request.md#php-style
Dont forget signing your commit
https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#gpg-signing-old-commits
@ddevsrddevsr
added
the 
bug
Verified issues on the current code behavior or pull requests that will fix them
label
May 10, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
2 times, most recently
from
7ee8775 to
8064aabCompareMay 11, 2023 16:44
@michalsn
michalsn
commented
May 11, 2023

Copy link


Copy Markdown

Member
@marekmosna Almost there! Could you follow the suggestion from #7488 (review) to fix the PHPStan error?
@kenjiskenjis
added
the 
database
Issues or pull requests that affect the database layer
label
May 12, 2023
@kenjiskenjis
changed the title
Fixes 7484: PostgreSQL getVersion() logicfix: PostgreSQL getVersion() logicMay 12, 2023
kenjis
kenjis
reviewed
May 12, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 $pgVersion = pg_version($this->connID);

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
@kenjiskenjisMay 12, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface is public function getVersion(): string;. So false should not be returned.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
98362e6 to
efbf68cCompareMay 12, 2023 18:06
@kenjiskenjis
added
the 
tests needed
Pull requests that need tests
label
May 12, 2023
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
efbf68c to
3292e43CompareMay 13, 2023 11:05
kenjis
kenjis
reviewed
May 17, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
Is it impossible to get the version number 7.4 or lower?
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pg_version() returns an array with the client, protocol and server version. Protocol and server versions are only available if PHP was compiled with PostgreSQL 7.4 or later.
https://www.php.net/manual/en/function.pg-version.php#refsect1-function.pg-version-description
There is no version requirement in the docs:
https://codeigniter4.github.io/CodeIgniter4/intro/requirements.html#supported-databases
But PostgreSQL 11 will stop receiving fixes on November 9, 2023.
https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/
@codeigniter4/core-team @codeigniter4/database-team

Do we need to support versions prior to 7.4?

Why don't we add (version 7.4 and above only) in the docs?
@samsonasiksamsonasikMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostgreSQL 7.4 seems too old, it seems it need to be documented in docs
@marekmosnamarekmosnaMay 17, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getVersion() returns the version number like '12.1', and the number should be used with version_compare()
that was the question in the related issue #7488
@michalsnmichalsnMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no $pgVersion['server'], we should return an empty string.
Adding a note (version 7.4 and above only) is a good idea.
@kenjiskenjisMay 17, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a PR: #7507
@kenjiskenjis
mentioned this pull request
May 17, 2023
 Merged

2 tasks
kenjis
kenjis
reviewed
May 18, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php
Outdated


 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
@kenjiskenjisMay 18, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? 'PostgreSQL 7.4 or lower';
$this->dataCache['version'] = $pgVersion['server'] ?? '';
@kenjis
kenjis
commented
May 18, 2023

Copy link


Copy Markdown

Member
@marekmosna It seems there is no test code for getVersion().

If you can write test code, add test code.

We would appreciate it.
@marekmosna
marekmosnaforce-pushed
the
7484-postgresql-server-version
branch
from
3292e43 to
4c6e4ecCompareMay 20, 2023 07:13
@marekmosna
marekmosna
commented
May 20, 2023

Copy link


Copy Markdown

ContributorAuthor
@marekmosna It seems there is no test code for getVersion(). If you can write test code, add test code. We would appreciate it.
I'm sorry @kenjis but I'm not a php developer so I can't
@kenjis
kenjis
commented
May 20, 2023

Copy link


Copy Markdown

Member
@marekmosna Okay, I got it.
michalsn
michalsn
approved these changes
May 20, 2023
View reviewed changes
@michalsnmichalsn
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
kenjis
kenjis
approved these changes
May 21, 2023
View reviewed changes
@kenjiskenjis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
@kenjis
kenjis
merged commit d334a2a
into
codeigniter4:developMay 21, 2023
@kenjiskenjis
mentioned this pull request
May 21, 2023
 Merged

4 tasks
@kenjis
kenjis
commented
May 21, 2023

Copy link


Copy Markdown

Member
@codeigniter4/database-team

It seems PostgreSQL may return the version like '15.3 (Debian 15.3-1.pgdg110+1)'.
https://github.com/codeigniter4/CodeIgniter4/actions/runs/5035338925/jobs/9030854318
Is this okay?
@michalsn
michalsn
commented
May 21, 2023

Copy link


Copy Markdown

Member
Good point. I think we should filter out the version.
michalsn
michalsn
reviewed
May 21, 2023
View reviewed changes
Comment threadsystem/Database/Postgre/Connection.php

 return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
 $pgVersion = pg_version($this->connID);
 $this->dataCache['version'] = $pgVersion['server'] ?? '';
@michalsnmichalsnMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

$this->dataCache['version'] = $pgVersion['server'] ?? '';
$this->dataCache['version'] = isset($pgVersion['server']) ? 
preg_match('/^(\d+\.\d+)/', $pgVersion['server'], $matches) ? $matches[1] : '' :
'';
This should work if we deal with something like 15.3 (Debian 15.3-1.pgdg110+1) - as Kenjis pointed out earlier.
@kenjiskenjisMay 21, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I will take care of it in #7509
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@kenjiskenjiskenjis approved these changes
@michalsnmichalsnmichalsn approved these changes
@samsonasiksamsonasiksamsonasik left review comments

+1 more reviewer

@ddevsrddevsrddevsr requested changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

bugVerified issues on the current code behavior or pull requests that will fix themdatabaseIssues or pull requests that affect the database layertests neededPull requests that need tests

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: PosgreSQL server version


5 participants

@marekmosna@ddevsr@michalsn@kenjis@samsonasik