Skip to content

feat: add DB config dateFormat to provide default date/time formats#8525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 2 commits into from
Feb 12, 2024
Merged

feat: add DB config dateFormat to provide default date/time formats #8525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a738313
feat: add DB config `dateFormat` to provide default date/time formats
kenjis Feb 6, 2024
2a7591c
docs: add missing `'`
kenjis Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/Config/Database.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ class Database extends Config
'failover' => [],
'port' => 3306,
'numberNative' => false,
'dateFormat' => [
'date' => 'Y-m-d',
'datetime' => 'Y-m-d H:i:s',
'time' => 'H:i:s',
],
];

/**
Expand All@@ -69,6 +74,11 @@ class Database extends Config
'port' => 3306,
'foreignKeys' => true,
'busyTimeout' => 1000,
'dateFormat' => [
'date' => 'Y-m-d',
'datetime' => 'Y-m-d H:i:s',
'time' => 'H:i:s',
],
];

public function __construct()
Expand Down
18 changes: 18 additions & 0 deletions system/Database/BaseConnection.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
* @property-read float $connectDuration
* @property-read float $connectTime
* @property-read string $database
* @property-read array $dateFormat
* @property-read string $DBCollat
* @property-read bool $DBDebug
* @property-read string $DBDriver
Expand DownExpand Up@@ -347,6 +348,19 @@ abstract class BaseConnection implements ConnectionInterface
*/
protected $queryClass = Query::class;

/**
* Default Date/Time formats
*
* @var array<string, string>
*/
protected array $dateFormat = [
'date' => 'Y-m-d',
'datetime' => 'Y-m-d H:i:s',
'datetime-ms' => 'Y-m-d H:i:s.v',
'datetime-us' => 'Y-m-d H:i:s.u',
'time' => 'H:i:s',
];

/**
* Saves our connection settings.
*/
Expand All@@ -358,6 +372,10 @@ public function __construct(array $params)
}
}

if (isset($params['dateFormat'])) {
$this->dateFormat = array_merge($this->dateFormat, $params['dateFormat']);
}

$queryClass = str_replace('Connection', 'Query', static::class);

if (class_exists($queryClass)) {
Expand Down
7 changes: 7 additions & 0 deletions tests/system/Database/BaseConnectionTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,13 @@ public function testSavesConfigOptions(): void
$this->assertFalse($db->compress);
$this->assertTrue($db->strictOn);
$this->assertSame([], $db->failover);
$this->assertSame([
'date' => 'Y-m-d',
'datetime' => 'Y-m-d H:i:s',
'datetime-ms' => 'Y-m-d H:i:s.v',
'datetime-us' => 'Y-m-d H:i:s.u',
'time' => 'H:i:s',
], $db->dateFormat);
}

public function testConnectionThrowExceptionWhenCannotConnect(): void
Expand Down
10 changes: 10 additions & 0 deletions user_guide_src/source/database/configuration.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,18 @@ Explanation of Values:
To enforce Foreign Key constraint, set this config item to true.
**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only).
**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only).
**dateFormat** The default date/time formats as PHP's `DateTime format`_.
* ``date`` - date format
* ``datetime`` - date and time format
* ``datetime-ms`` - date and time with millisecond format
* ``datetime-us`` - date and time with microsecond format
* ``time`` - time format
This can be used since v4.5.0, and you can get the value, e.g., ``$db->dateFormat['datetime']``.
Currently, the database drivers do not use these values directly, but just provide the values.
================ ===========================================================================================================

.. _DateTime format: https://www.php.net/manual/en/datetime.format.php

.. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``,
etc.) not all values will be needed. For example, when using ``SQLite3`` you
will not need to supply a username or password, and the database name
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: add DB config `dateFormat` to provide default date/time formats by kenjis · Pull Request #8525 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
feat: add DB config dateFormat to provide default date/time formats#8525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 2 commits into

from

Feb 12, 2024
 Merged


feat: add DB config dateFormat to provide default date/time formats
#8525
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a738313

feat: add DB config `dateFormat` to provide default date/time formats


kenjis Feb 6, 2024
2a7591c

docs: add missing `'`


kenjis Feb 9, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
app/Config/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ class Database extends Config
 'failover' => [],
 'port' => 3306,
 'numberNative' => false,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 /**
Expand All@@ -69,6 +74,11 @@ class Database extends Config
 'port' => 3306,
 'foreignKeys' => true,
 'busyTimeout' => 1000,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 public function __construct()
Expand Down

18 changes: 18 additions & 0 deletions
system/Database/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
 * @property-read float $connectDuration
 * @property-read float $connectTime
 * @property-read string $database
 * @property-read array $dateFormat
 * @property-read string $DBCollat
 * @property-read bool $DBDebug
 * @property-read string $DBDriver
Expand DownExpand Up@@ -347,6 +348,19 @@ abstract class BaseConnection implements ConnectionInterface
 */
 protected $queryClass = Query::class;

 /**
 * Default Date/Time formats
 *
 * @var array<string, string>
 */
 protected array $dateFormat = [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ];

 /**
 * Saves our connection settings.
 */
Expand All@@ -358,6 +372,10 @@ public function __construct(array $params)
 }
 }

 if (isset($params['dateFormat'])) {
 $this->dateFormat = array_merge($this->dateFormat, $params['dateFormat']);
 }

 $queryClass = str_replace('Connection', 'Query', static::class);

 if (class_exists($queryClass)) {
Expand Down

7 changes: 7 additions & 0 deletions
tests/system/Database/BaseConnectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,13 @@ public function testSavesConfigOptions(): void
 $this->assertFalse($db->compress);
 $this->assertTrue($db->strictOn);
 $this->assertSame([], $db->failover);
 $this->assertSame([
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ], $db->dateFormat);
 }

 public function testConnectionThrowExceptionWhenCannotConnect(): void
Expand Down

10 changes: 10 additions & 0 deletions
user_guide_src/source/database/configuration.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,18 @@ Explanation of Values:
 To enforce Foreign Key constraint, set this config item to true.
**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only).
**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only).
**dateFormat** The default date/time formats as PHP's `DateTime format`_.
 * ``date`` - date format
 * ``datetime`` - date and time format
 * ``datetime-ms`` - date and time with millisecond format
 * ``datetime-us`` - date and time with microsecond format
 * ``time`` - time format
 This can be used since v4.5.0, and you can get the value, e.g., ``$db->dateFormat['datetime']``.
 Currently, the database drivers do not use these values directly, but just provide the values.
================ ===========================================================================================================

.. _DateTime format: https://www.php.net/manual/en/datetime.format.php

.. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``,
 etc.) not all values will be needed. For example, when using ``SQLite3`` you
 will not need to supply a username or password, and the database name
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add DB config `dateFormat` to provide default date/time formats by kenjis · Pull Request #8525 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
feat: add DB config dateFormat to provide default date/time formats#8525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 2 commits into

from

Feb 12, 2024
 Merged


feat: add DB config dateFormat to provide default date/time formats
#8525
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a738313

feat: add DB config `dateFormat` to provide default date/time formats


kenjis Feb 6, 2024
2a7591c

docs: add missing `'`


kenjis Feb 9, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
app/Config/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ class Database extends Config
 'failover' => [],
 'port' => 3306,
 'numberNative' => false,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 /**
Expand All@@ -69,6 +74,11 @@ class Database extends Config
 'port' => 3306,
 'foreignKeys' => true,
 'busyTimeout' => 1000,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 public function __construct()
Expand Down

18 changes: 18 additions & 0 deletions
system/Database/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
 * @property-read float $connectDuration
 * @property-read float $connectTime
 * @property-read string $database
 * @property-read array $dateFormat
 * @property-read string $DBCollat
 * @property-read bool $DBDebug
 * @property-read string $DBDriver
Expand DownExpand Up@@ -347,6 +348,19 @@ abstract class BaseConnection implements ConnectionInterface
 */
 protected $queryClass = Query::class;

 /**
 * Default Date/Time formats
 *
 * @var array<string, string>
 */
 protected array $dateFormat = [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ];

 /**
 * Saves our connection settings.
 */
Expand All@@ -358,6 +372,10 @@ public function __construct(array $params)
 }
 }

 if (isset($params['dateFormat'])) {
 $this->dateFormat = array_merge($this->dateFormat, $params['dateFormat']);
 }

 $queryClass = str_replace('Connection', 'Query', static::class);

 if (class_exists($queryClass)) {
Expand Down

7 changes: 7 additions & 0 deletions
tests/system/Database/BaseConnectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,13 @@ public function testSavesConfigOptions(): void
 $this->assertFalse($db->compress);
 $this->assertTrue($db->strictOn);
 $this->assertSame([], $db->failover);
 $this->assertSame([
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ], $db->dateFormat);
 }

 public function testConnectionThrowExceptionWhenCannotConnect(): void
Expand Down

10 changes: 10 additions & 0 deletions
user_guide_src/source/database/configuration.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,18 @@ Explanation of Values:
 To enforce Foreign Key constraint, set this config item to true.
**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only).
**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only).
**dateFormat** The default date/time formats as PHP's `DateTime format`_.
 * ``date`` - date format
 * ``datetime`` - date and time format
 * ``datetime-ms`` - date and time with millisecond format
 * ``datetime-us`` - date and time with microsecond format
 * ``time`` - time format
 This can be used since v4.5.0, and you can get the value, e.g., ``$db->dateFormat['datetime']``.
 Currently, the database drivers do not use these values directly, but just provide the values.
================ ===========================================================================================================

.. _DateTime format: https://www.php.net/manual/en/datetime.format.php

.. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``,
 etc.) not all values will be needed. For example, when using ``SQLite3`` you
 will not need to supply a username or password, and the database name
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 2 commits into

from

Feb 12, 2024
 Merged


feat: add DB config dateFormat to provide default date/time formats
#8525
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a738313

feat: add DB config `dateFormat` to provide default date/time formats


kenjis Feb 6, 2024
2a7591c

docs: add missing `'`


kenjis Feb 9, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
app/Config/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ class Database extends Config
 'failover' => [],
 'port' => 3306,
 'numberNative' => false,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 /**
Expand All@@ -69,6 +74,11 @@ class Database extends Config
 'port' => 3306,
 'foreignKeys' => true,
 'busyTimeout' => 1000,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 public function __construct()
Expand Down

18 changes: 18 additions & 0 deletions
system/Database/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
 * @property-read float $connectDuration
 * @property-read float $connectTime
 * @property-read string $database
 * @property-read array $dateFormat
 * @property-read string $DBCollat
 * @property-read bool $DBDebug
 * @property-read string $DBDriver
Expand DownExpand Up@@ -347,6 +348,19 @@ abstract class BaseConnection implements ConnectionInterface
 */
 protected $queryClass = Query::class;

 /**
 * Default Date/Time formats
 *
 * @var array<string, string>
 */
 protected array $dateFormat = [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ];

 /**
 * Saves our connection settings.
 */
Expand All@@ -358,6 +372,10 @@ public function __construct(array $params)
 }
 }

 if (isset($params['dateFormat'])) {
 $this->dateFormat = array_merge($this->dateFormat, $params['dateFormat']);
 }

 $queryClass = str_replace('Connection', 'Query', static::class);

 if (class_exists($queryClass)) {
Expand Down

7 changes: 7 additions & 0 deletions
tests/system/Database/BaseConnectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,13 @@ public function testSavesConfigOptions(): void
 $this->assertFalse($db->compress);
 $this->assertTrue($db->strictOn);
 $this->assertSame([], $db->failover);
 $this->assertSame([
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ], $db->dateFormat);
 }

 public function testConnectionThrowExceptionWhenCannotConnect(): void
Expand Down

10 changes: 10 additions & 0 deletions
user_guide_src/source/database/configuration.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,18 @@ Explanation of Values:
 To enforce Foreign Key constraint, set this config item to true.
**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only).
**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only).
**dateFormat** The default date/time formats as PHP's `DateTime format`_.
 * ``date`` - date format
 * ``datetime`` - date and time format
 * ``datetime-ms`` - date and time with millisecond format
 * ``datetime-us`` - date and time with microsecond format
 * ``time`` - time format
 This can be used since v4.5.0, and you can get the value, e.g., ``$db->dateFormat['datetime']``.
 Currently, the database drivers do not use these values directly, but just provide the values.
================ ===========================================================================================================

.. _DateTime format: https://www.php.net/manual/en/datetime.format.php

.. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``,
 etc.) not all values will be needed. For example, when using ``SQLite3`` you
 will not need to supply a username or password, and the database name
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 2 commits into

from

Feb 12, 2024
 Merged


feat: add DB config dateFormat to provide default date/time formats
#8525
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a738313

feat: add DB config `dateFormat` to provide default date/time formats


kenjis Feb 6, 2024
2a7591c

docs: add missing `'`


kenjis Feb 9, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
app/Config/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ class Database extends Config
 'failover' => [],
 'port' => 3306,
 'numberNative' => false,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 /**
Expand All@@ -69,6 +74,11 @@ class Database extends Config
 'port' => 3306,
 'foreignKeys' => true,
 'busyTimeout' => 1000,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 public function __construct()
Expand Down

18 changes: 18 additions & 0 deletions
system/Database/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
 * @property-read float $connectDuration
 * @property-read float $connectTime
 * @property-read string $database
 * @property-read array $dateFormat
 * @property-read string $DBCollat
 * @property-read bool $DBDebug
 * @property-read string $DBDriver
Expand DownExpand Up@@ -347,6 +348,19 @@ abstract class BaseConnection implements ConnectionInterface
 */
 protected $queryClass = Query::class;

 /**
 * Default Date/Time formats
 *
 * @var array<string, string>
 */
 protected array $dateFormat = [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ];

 /**
 * Saves our connection settings.
 */
Expand All@@ -358,6 +372,10 @@ public function __construct(array $params)
 }
 }

 if (isset($params['dateFormat'])) {
 $this->dateFormat = array_merge($this->dateFormat, $params['dateFormat']);
 }

 $queryClass = str_replace('Connection', 'Query', static::class);

 if (class_exists($queryClass)) {
Expand Down

7 changes: 7 additions & 0 deletions
tests/system/Database/BaseConnectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,13 @@ public function testSavesConfigOptions(): void
 $this->assertFalse($db->compress);
 $this->assertTrue($db->strictOn);
 $this->assertSame([], $db->failover);
 $this->assertSame([
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ], $db->dateFormat);
 }

 public function testConnectionThrowExceptionWhenCannotConnect(): void
Expand Down

10 changes: 10 additions & 0 deletions
user_guide_src/source/database/configuration.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,18 @@ Explanation of Values:
 To enforce Foreign Key constraint, set this config item to true.
**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only).
**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only).
**dateFormat** The default date/time formats as PHP's `DateTime format`_.
 * ``date`` - date format
 * ``datetime`` - date and time format
 * ``datetime-ms`` - date and time with millisecond format
 * ``datetime-us`` - date and time with microsecond format
 * ``time`` - time format
 This can be used since v4.5.0, and you can get the value, e.g., ``$db->dateFormat['datetime']``.
 Currently, the database drivers do not use these values directly, but just provide the values.
================ ===========================================================================================================

.. _DateTime format: https://www.php.net/manual/en/datetime.format.php

.. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``,
 etc.) not all values will be needed. For example, when using ``SQLite3`` you
 will not need to supply a username or password, and the database name
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add DB config `dateFormat` to provide default date/time formats by kenjis · Pull Request #8525 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
feat: add DB config dateFormat to provide default date/time formats#8525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 2 commits into

from

Feb 12, 2024
 Merged


feat: add DB config dateFormat to provide default date/time formats
#8525
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a738313

feat: add DB config `dateFormat` to provide default date/time formats


kenjis Feb 6, 2024
2a7591c

docs: add missing `'`


kenjis Feb 9, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
app/Config/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ class Database extends Config
 'failover' => [],
 'port' => 3306,
 'numberNative' => false,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 /**
Expand All@@ -69,6 +74,11 @@ class Database extends Config
 'port' => 3306,
 'foreignKeys' => true,
 'busyTimeout' => 1000,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 public function __construct()
Expand Down

18 changes: 18 additions & 0 deletions
system/Database/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
 * @property-read float $connectDuration
 * @property-read float $connectTime
 * @property-read string $database
 * @property-read array $dateFormat
 * @property-read string $DBCollat
 * @property-read bool $DBDebug
 * @property-read string $DBDriver
Expand DownExpand Up@@ -347,6 +348,19 @@ abstract class BaseConnection implements ConnectionInterface
 */
 protected $queryClass = Query::class;

 /**
 * Default Date/Time formats
 *
 * @var array<string, string>
 */
 protected array $dateFormat = [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ];

 /**
 * Saves our connection settings.
 */
Expand All@@ -358,6 +372,10 @@ public function __construct(array $params)
 }
 }

 if (isset($params['dateFormat'])) {
 $this->dateFormat = array_merge($this->dateFormat, $params['dateFormat']);
 }

 $queryClass = str_replace('Connection', 'Query', static::class);

 if (class_exists($queryClass)) {
Expand Down

7 changes: 7 additions & 0 deletions
tests/system/Database/BaseConnectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,13 @@ public function testSavesConfigOptions(): void
 $this->assertFalse($db->compress);
 $this->assertTrue($db->strictOn);
 $this->assertSame([], $db->failover);
 $this->assertSame([
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ], $db->dateFormat);
 }

 public function testConnectionThrowExceptionWhenCannotConnect(): void
Expand Down

10 changes: 10 additions & 0 deletions
user_guide_src/source/database/configuration.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,18 @@ Explanation of Values:
 To enforce Foreign Key constraint, set this config item to true.
**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only).
**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only).
**dateFormat** The default date/time formats as PHP's `DateTime format`_.
 * ``date`` - date format
 * ``datetime`` - date and time format
 * ``datetime-ms`` - date and time with millisecond format
 * ``datetime-us`` - date and time with microsecond format
 * ``time`` - time format
 This can be used since v4.5.0, and you can get the value, e.g., ``$db->dateFormat['datetime']``.
 Currently, the database drivers do not use these values directly, but just provide the values.
================ ===========================================================================================================

.. _DateTime format: https://www.php.net/manual/en/datetime.format.php

.. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``,
 etc.) not all values will be needed. For example, when using ``SQLite3`` you
 will not need to supply a username or password, and the database name
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add DB config `dateFormat` to provide default date/time formats by kenjis · Pull Request #8525 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
feat: add DB config dateFormat to provide default date/time formats#8525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 2 commits into

from

Feb 12, 2024
 Merged


feat: add DB config dateFormat to provide default date/time formats
#8525
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a738313

feat: add DB config `dateFormat` to provide default date/time formats


kenjis Feb 6, 2024
2a7591c

docs: add missing `'`


kenjis Feb 9, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
app/Config/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ class Database extends Config
 'failover' => [],
 'port' => 3306,
 'numberNative' => false,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 /**
Expand All@@ -69,6 +74,11 @@ class Database extends Config
 'port' => 3306,
 'foreignKeys' => true,
 'busyTimeout' => 1000,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 public function __construct()
Expand Down

18 changes: 18 additions & 0 deletions
system/Database/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
 * @property-read float $connectDuration
 * @property-read float $connectTime
 * @property-read string $database
 * @property-read array $dateFormat
 * @property-read string $DBCollat
 * @property-read bool $DBDebug
 * @property-read string $DBDriver
Expand DownExpand Up@@ -347,6 +348,19 @@ abstract class BaseConnection implements ConnectionInterface
 */
 protected $queryClass = Query::class;

 /**
 * Default Date/Time formats
 *
 * @var array<string, string>
 */
 protected array $dateFormat = [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ];

 /**
 * Saves our connection settings.
 */
Expand All@@ -358,6 +372,10 @@ public function __construct(array $params)
 }
 }

 if (isset($params['dateFormat'])) {
 $this->dateFormat = array_merge($this->dateFormat, $params['dateFormat']);
 }

 $queryClass = str_replace('Connection', 'Query', static::class);

 if (class_exists($queryClass)) {
Expand Down

7 changes: 7 additions & 0 deletions
tests/system/Database/BaseConnectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,13 @@ public function testSavesConfigOptions(): void
 $this->assertFalse($db->compress);
 $this->assertTrue($db->strictOn);
 $this->assertSame([], $db->failover);
 $this->assertSame([
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ], $db->dateFormat);
 }

 public function testConnectionThrowExceptionWhenCannotConnect(): void
Expand Down

10 changes: 10 additions & 0 deletions
user_guide_src/source/database/configuration.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,18 @@ Explanation of Values:
 To enforce Foreign Key constraint, set this config item to true.
**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only).
**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only).
**dateFormat** The default date/time formats as PHP's `DateTime format`_.
 * ``date`` - date format
 * ``datetime`` - date and time format
 * ``datetime-ms`` - date and time with millisecond format
 * ``datetime-us`` - date and time with microsecond format
 * ``time`` - time format
 This can be used since v4.5.0, and you can get the value, e.g., ``$db->dateFormat['datetime']``.
 Currently, the database drivers do not use these values directly, but just provide the values.
================ ===========================================================================================================

.. _DateTime format: https://www.php.net/manual/en/datetime.format.php

.. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``,
 etc.) not all values will be needed. For example, when using ``SQLite3`` you
 will not need to supply a username or password, and the database name
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 2 commits into

from

Feb 12, 2024
 Merged


feat: add DB config dateFormat to provide default date/time formats
#8525
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a738313

feat: add DB config `dateFormat` to provide default date/time formats


kenjis Feb 6, 2024
2a7591c

docs: add missing `'`


kenjis Feb 9, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
app/Config/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,11 @@ class Database extends Config
 'failover' => [],
 'port' => 3306,
 'numberNative' => false,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 /**
Expand All@@ -69,6 +74,11 @@ class Database extends Config
 'port' => 3306,
 'foreignKeys' => true,
 'busyTimeout' => 1000,
 'dateFormat' => [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'time' => 'H:i:s',
 ],
 ];

 public function __construct()
Expand Down

18 changes: 18 additions & 0 deletions
system/Database/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
 * @property-read float $connectDuration
 * @property-read float $connectTime
 * @property-read string $database
 * @property-read array $dateFormat
 * @property-read string $DBCollat
 * @property-read bool $DBDebug
 * @property-read string $DBDriver
Expand DownExpand Up@@ -347,6 +348,19 @@ abstract class BaseConnection implements ConnectionInterface
 */
 protected $queryClass = Query::class;

 /**
 * Default Date/Time formats
 *
 * @var array<string, string>
 */
 protected array $dateFormat = [
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ];

 /**
 * Saves our connection settings.
 */
Expand All@@ -358,6 +372,10 @@ public function __construct(array $params)
 }
 }

 if (isset($params['dateFormat'])) {
 $this->dateFormat = array_merge($this->dateFormat, $params['dateFormat']);
 }

 $queryClass = str_replace('Connection', 'Query', static::class);

 if (class_exists($queryClass)) {
Expand Down

7 changes: 7 additions & 0 deletions
tests/system/Database/BaseConnectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,13 @@ public function testSavesConfigOptions(): void
 $this->assertFalse($db->compress);
 $this->assertTrue($db->strictOn);
 $this->assertSame([], $db->failover);
 $this->assertSame([
 'date' => 'Y-m-d',
 'datetime' => 'Y-m-d H:i:s',
 'datetime-ms' => 'Y-m-d H:i:s.v',
 'datetime-us' => 'Y-m-d H:i:s.u',
 'time' => 'H:i:s',
 ], $db->dateFormat);
 }

 public function testConnectionThrowExceptionWhenCannotConnect(): void
Expand Down

10 changes: 10 additions & 0 deletions
user_guide_src/source/database/configuration.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,18 @@ Explanation of Values:
 To enforce Foreign Key constraint, set this config item to true.
**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only).
**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only).
**dateFormat** The default date/time formats as PHP's `DateTime format`_.
 * ``date`` - date format
 * ``datetime`` - date and time format
 * ``datetime-ms`` - date and time with millisecond format
 * ``datetime-us`` - date and time with microsecond format
 * ``time`` - time format
 This can be used since v4.5.0, and you can get the value, e.g., ``$db->dateFormat['datetime']``.
 Currently, the database drivers do not use these values directly, but just provide the values.
================ ===========================================================================================================

.. _DateTime format: https://www.php.net/manual/en/datetime.format.php

.. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``,
 etc.) not all values will be needed. For example, when using ``SQLite3`` you
 will not need to supply a username or password, and the database name
Expand Down