fix: migrations not using custom DB connection of migration runner - #8221

Merged
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner
Dec 13, 2023
Merged

fix: migrations not using custom DB connection of migration runner#8221
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner

Conversation

@paulbalandan

@paulbalandanpaulbalandan commented Nov 15, 2023

Copy link
Copy Markdown
Member

Description
Closes#8060

When using custom array connection for migration runner, the migrations ran do not use the custom connection of the runner but instead uses the default shared connection.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@paulbalandanpaulbalandan added the bug Verified issues on the current code behavior or pull requests that will fix them label Nov 15, 2023
@paulbalandanpaulbalandan changed the title fix: migrations not using custom DB connections of migration runnerfix: migrations not using custom DB connection of migration runnerNov 15, 2023
@paulbalandan

Copy link
Copy Markdown
MemberAuthor

I found this bug while working on phpstan-codeigniter in trying to add an extension for properly identifying the property types of Entities.

@kenjis

Copy link
Copy Markdown
Member

@paulbalandan The code is indeed something wrong, but I don't understand the significance of passing DB connection to MigrationRunner.

@paulbalandan

Copy link
Copy Markdown
MemberAuthor

The use case is this: In order to infer the property types of Entities, I thought of using the database tables and the fields. So, I must run migrations in order to get the tables. However, I don't want to mess with the migrations of the end users so I thought of running the migrations in a separate connection. So, regardless of the default connection of the user, I run my own migrations using SQLite3 with a database file. I don't use command('migrate') because it will use the default group. I don't want either to alter the shared Config\Database. So, here comes the array connection. All went smoothly until I am listing all the tables using $db->listTables() to find out that the db file only contains the migrations table. Upon checking, migration files were found but were ran using the shared connection.

Comment threadsystem/Database/MigrationRunner.php Outdated
@kenjis

kenjis commented Nov 15, 2023

Copy link
Copy Markdown
Member

Okay, so you want to change the DB connection for testing.
After all, the parameter is for testing.

I sent PR #8222 to make it clear.

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 3 times, most recently from a7a6777 to fbdcf93CompareNovember 16, 2023 03:58
@kenjis

Copy link
Copy Markdown
Member

What should be the group for the added test?

sqlite> select * from migrations;
1|2018-01-24-102301|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1
2|2018-01-24-102302|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1

@kenjis

Copy link
Copy Markdown
Member

Comment threadsystem/Database/MigrationRunner.php
@kenjis

Copy link
Copy Markdown
Member

Frankly, Migration is complex and difficult to maintain consistency.

When temporarily changing a DB connection for testing purposes, it seems better to regard that the DB connection as the default group because it is easier to manipulate.

However, it seems a bit odd that the DB group name in the migration history is changed to the default group even if you specify the name of the DB group, e.g., db1.

Maybe the following patch is needed.

--- a/system/Database/MigrationRunner.php+++ b/system/Database/MigrationRunner.php@@ -141,10 +141,17 @@ class MigrationRunner
// Default name space is the app namespace
$this->namespace = APP_NAMESPACE;
- // get default database group- $config = config(Database::class);- $this->group = $config->defaultGroup;- unset($config);+ if (is_string($db)) {+ $this->group = $db;+ } else {+ // We use `defaultGroup` even if $db is ConnectionInterface or config+ // array. Because this is for testing purposes, and it is easier to+ // understand and operate as if the migrations were run on the+ // default group.+ $config = config(Database::class);+ $this->group = $config->defaultGroup;+ unset($config);+ }
// If no db connection passed in, use
// default database group.
@@ -841,7 +848,7 @@ class MigrationRunner
/** @var Migration $instance */
$instance = new $class(Database::forge($this->db));
- $group = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;+ $group = $instance->getDBGroup() ?? $this->group;
if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
// @codeCoverageIgnoreStart
@@ -857,8 +864,6 @@ class MigrationRunner
return true;
}
- $this->setGroup($group);-
if (! is_callable([$instance, $direction])) {
$message = sprintf(lang('Migrations.missingMethod'), $direction);

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 2 times, most recently from c581a48 to 6a078a4CompareNovember 19, 2023 13:04
@MGatner

Copy link
Copy Markdown
Member

This is complicated. I'm tracking but let me know if you need me more. Thanks for handling.

Comment threadsystem/Database/MigrationRunner.php

@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!

@lonnieezell
lonnieezell merged commit 2420424 into codeigniter4:developDec 13, 2023
@paulbalandan
paulbalandan deleted the migration-runner branch December 13, 2023 05:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Migration runner allows a $db but its never passed to the Migration files

4 participants

@paulbalandan@kenjis@MGatner@lonnieezell
, '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: migrations not using custom DB connection of migration runner - #8221

Merged
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner
Dec 13, 2023
Merged

fix: migrations not using custom DB connection of migration runner#8221
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner

Conversation

@paulbalandan

@paulbalandanpaulbalandan commented Nov 15, 2023

Copy link
Copy Markdown
Member

Description
Closes#8060

When using custom array connection for migration runner, the migrations ran do not use the custom connection of the runner but instead uses the default shared connection.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@paulbalandanpaulbalandan added the bug Verified issues on the current code behavior or pull requests that will fix them label Nov 15, 2023
@paulbalandanpaulbalandan changed the title fix: migrations not using custom DB connections of migration runnerfix: migrations not using custom DB connection of migration runnerNov 15, 2023
@paulbalandan

Copy link
Copy Markdown
MemberAuthor

I found this bug while working on phpstan-codeigniter in trying to add an extension for properly identifying the property types of Entities.

@kenjis

Copy link
Copy Markdown
Member

@paulbalandan The code is indeed something wrong, but I don't understand the significance of passing DB connection to MigrationRunner.

@paulbalandan

Copy link
Copy Markdown
MemberAuthor

The use case is this: In order to infer the property types of Entities, I thought of using the database tables and the fields. So, I must run migrations in order to get the tables. However, I don't want to mess with the migrations of the end users so I thought of running the migrations in a separate connection. So, regardless of the default connection of the user, I run my own migrations using SQLite3 with a database file. I don't use command('migrate') because it will use the default group. I don't want either to alter the shared Config\Database. So, here comes the array connection. All went smoothly until I am listing all the tables using $db->listTables() to find out that the db file only contains the migrations table. Upon checking, migration files were found but were ran using the shared connection.

Comment threadsystem/Database/MigrationRunner.php Outdated
@kenjis

kenjis commented Nov 15, 2023

Copy link
Copy Markdown
Member

Okay, so you want to change the DB connection for testing.
After all, the parameter is for testing.

I sent PR #8222 to make it clear.

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 3 times, most recently from a7a6777 to fbdcf93CompareNovember 16, 2023 03:58
@kenjis

Copy link
Copy Markdown
Member

What should be the group for the added test?

sqlite> select * from migrations;
1|2018-01-24-102301|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1
2|2018-01-24-102302|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1

@kenjis

Copy link
Copy Markdown
Member

Comment threadsystem/Database/MigrationRunner.php
@kenjis

Copy link
Copy Markdown
Member

Frankly, Migration is complex and difficult to maintain consistency.

When temporarily changing a DB connection for testing purposes, it seems better to regard that the DB connection as the default group because it is easier to manipulate.

However, it seems a bit odd that the DB group name in the migration history is changed to the default group even if you specify the name of the DB group, e.g., db1.

Maybe the following patch is needed.

--- a/system/Database/MigrationRunner.php+++ b/system/Database/MigrationRunner.php@@ -141,10 +141,17 @@ class MigrationRunner
// Default name space is the app namespace
$this->namespace = APP_NAMESPACE;
- // get default database group- $config = config(Database::class);- $this->group = $config->defaultGroup;- unset($config);+ if (is_string($db)) {+ $this->group = $db;+ } else {+ // We use `defaultGroup` even if $db is ConnectionInterface or config+ // array. Because this is for testing purposes, and it is easier to+ // understand and operate as if the migrations were run on the+ // default group.+ $config = config(Database::class);+ $this->group = $config->defaultGroup;+ unset($config);+ }
// If no db connection passed in, use
// default database group.
@@ -841,7 +848,7 @@ class MigrationRunner
/** @var Migration $instance */
$instance = new $class(Database::forge($this->db));
- $group = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;+ $group = $instance->getDBGroup() ?? $this->group;
if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
// @codeCoverageIgnoreStart
@@ -857,8 +864,6 @@ class MigrationRunner
return true;
}
- $this->setGroup($group);-
if (! is_callable([$instance, $direction])) {
$message = sprintf(lang('Migrations.missingMethod'), $direction);

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 2 times, most recently from c581a48 to 6a078a4CompareNovember 19, 2023 13:04
@MGatner

Copy link
Copy Markdown
Member

This is complicated. I'm tracking but let me know if you need me more. Thanks for handling.

Comment threadsystem/Database/MigrationRunner.php

@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!

@lonnieezell
lonnieezell merged commit 2420424 into codeigniter4:developDec 13, 2023
@paulbalandan
paulbalandan deleted the migration-runner branch December 13, 2023 05:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Migration runner allows a $db but its never passed to the Migration files

4 participants

@paulbalandan@kenjis@MGatner@lonnieezell
, '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: migrations not using custom DB connection of migration runner - #8221

Merged
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner
Dec 13, 2023
Merged

fix: migrations not using custom DB connection of migration runner#8221
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner

Conversation

@paulbalandan

@paulbalandanpaulbalandan commented Nov 15, 2023

Copy link
Copy Markdown
Member

Description
Closes#8060

When using custom array connection for migration runner, the migrations ran do not use the custom connection of the runner but instead uses the default shared connection.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@paulbalandanpaulbalandan added the bug Verified issues on the current code behavior or pull requests that will fix them label Nov 15, 2023
@paulbalandanpaulbalandan changed the title fix: migrations not using custom DB connections of migration runnerfix: migrations not using custom DB connection of migration runnerNov 15, 2023
@paulbalandan

Copy link
Copy Markdown
MemberAuthor

I found this bug while working on phpstan-codeigniter in trying to add an extension for properly identifying the property types of Entities.

@kenjis

Copy link
Copy Markdown
Member

@paulbalandan The code is indeed something wrong, but I don't understand the significance of passing DB connection to MigrationRunner.

@paulbalandan

Copy link
Copy Markdown
MemberAuthor

The use case is this: In order to infer the property types of Entities, I thought of using the database tables and the fields. So, I must run migrations in order to get the tables. However, I don't want to mess with the migrations of the end users so I thought of running the migrations in a separate connection. So, regardless of the default connection of the user, I run my own migrations using SQLite3 with a database file. I don't use command('migrate') because it will use the default group. I don't want either to alter the shared Config\Database. So, here comes the array connection. All went smoothly until I am listing all the tables using $db->listTables() to find out that the db file only contains the migrations table. Upon checking, migration files were found but were ran using the shared connection.

Comment threadsystem/Database/MigrationRunner.php Outdated
@kenjis

kenjis commented Nov 15, 2023

Copy link
Copy Markdown
Member

Okay, so you want to change the DB connection for testing.
After all, the parameter is for testing.

I sent PR #8222 to make it clear.

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 3 times, most recently from a7a6777 to fbdcf93CompareNovember 16, 2023 03:58
@kenjis

Copy link
Copy Markdown
Member

What should be the group for the added test?

sqlite> select * from migrations;
1|2018-01-24-102301|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1
2|2018-01-24-102302|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1

@kenjis

Copy link
Copy Markdown
Member

Comment threadsystem/Database/MigrationRunner.php
@kenjis

Copy link
Copy Markdown
Member

Frankly, Migration is complex and difficult to maintain consistency.

When temporarily changing a DB connection for testing purposes, it seems better to regard that the DB connection as the default group because it is easier to manipulate.

However, it seems a bit odd that the DB group name in the migration history is changed to the default group even if you specify the name of the DB group, e.g., db1.

Maybe the following patch is needed.

--- a/system/Database/MigrationRunner.php+++ b/system/Database/MigrationRunner.php@@ -141,10 +141,17 @@ class MigrationRunner
// Default name space is the app namespace
$this->namespace = APP_NAMESPACE;
- // get default database group- $config = config(Database::class);- $this->group = $config->defaultGroup;- unset($config);+ if (is_string($db)) {+ $this->group = $db;+ } else {+ // We use `defaultGroup` even if $db is ConnectionInterface or config+ // array. Because this is for testing purposes, and it is easier to+ // understand and operate as if the migrations were run on the+ // default group.+ $config = config(Database::class);+ $this->group = $config->defaultGroup;+ unset($config);+ }
// If no db connection passed in, use
// default database group.
@@ -841,7 +848,7 @@ class MigrationRunner
/** @var Migration $instance */
$instance = new $class(Database::forge($this->db));
- $group = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;+ $group = $instance->getDBGroup() ?? $this->group;
if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
// @codeCoverageIgnoreStart
@@ -857,8 +864,6 @@ class MigrationRunner
return true;
}
- $this->setGroup($group);-
if (! is_callable([$instance, $direction])) {
$message = sprintf(lang('Migrations.missingMethod'), $direction);

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 2 times, most recently from c581a48 to 6a078a4CompareNovember 19, 2023 13:04
@MGatner

Copy link
Copy Markdown
Member

This is complicated. I'm tracking but let me know if you need me more. Thanks for handling.

Comment threadsystem/Database/MigrationRunner.php

@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!

@lonnieezell
lonnieezell merged commit 2420424 into codeigniter4:developDec 13, 2023
@paulbalandan
paulbalandan deleted the migration-runner branch December 13, 2023 05:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Migration runner allows a $db but its never passed to the Migration files

4 participants

@paulbalandan@kenjis@MGatner@lonnieezell
, '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: migrations not using custom DB connection of migration runner - #8221

Merged
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner
Dec 13, 2023
Merged

fix: migrations not using custom DB connection of migration runner#8221
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner

Conversation

@paulbalandan

@paulbalandanpaulbalandan commented Nov 15, 2023

Copy link
Copy Markdown
Member

Description
Closes#8060

When using custom array connection for migration runner, the migrations ran do not use the custom connection of the runner but instead uses the default shared connection.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@paulbalandanpaulbalandan added the bug Verified issues on the current code behavior or pull requests that will fix them label Nov 15, 2023
@paulbalandanpaulbalandan changed the title fix: migrations not using custom DB connections of migration runnerfix: migrations not using custom DB connection of migration runnerNov 15, 2023
@paulbalandan

Copy link
Copy Markdown
MemberAuthor

I found this bug while working on phpstan-codeigniter in trying to add an extension for properly identifying the property types of Entities.

@kenjis

Copy link
Copy Markdown
Member

@paulbalandan The code is indeed something wrong, but I don't understand the significance of passing DB connection to MigrationRunner.

@paulbalandan

Copy link
Copy Markdown
MemberAuthor

The use case is this: In order to infer the property types of Entities, I thought of using the database tables and the fields. So, I must run migrations in order to get the tables. However, I don't want to mess with the migrations of the end users so I thought of running the migrations in a separate connection. So, regardless of the default connection of the user, I run my own migrations using SQLite3 with a database file. I don't use command('migrate') because it will use the default group. I don't want either to alter the shared Config\Database. So, here comes the array connection. All went smoothly until I am listing all the tables using $db->listTables() to find out that the db file only contains the migrations table. Upon checking, migration files were found but were ran using the shared connection.

Comment threadsystem/Database/MigrationRunner.php Outdated
@kenjis

kenjis commented Nov 15, 2023

Copy link
Copy Markdown
Member

Okay, so you want to change the DB connection for testing.
After all, the parameter is for testing.

I sent PR #8222 to make it clear.

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 3 times, most recently from a7a6777 to fbdcf93CompareNovember 16, 2023 03:58
@kenjis

Copy link
Copy Markdown
Member

What should be the group for the added test?

sqlite> select * from migrations;
1|2018-01-24-102301|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1
2|2018-01-24-102302|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1

@kenjis

Copy link
Copy Markdown
Member

Comment threadsystem/Database/MigrationRunner.php
@kenjis

Copy link
Copy Markdown
Member

Frankly, Migration is complex and difficult to maintain consistency.

When temporarily changing a DB connection for testing purposes, it seems better to regard that the DB connection as the default group because it is easier to manipulate.

However, it seems a bit odd that the DB group name in the migration history is changed to the default group even if you specify the name of the DB group, e.g., db1.

Maybe the following patch is needed.

--- a/system/Database/MigrationRunner.php+++ b/system/Database/MigrationRunner.php@@ -141,10 +141,17 @@ class MigrationRunner
// Default name space is the app namespace
$this->namespace = APP_NAMESPACE;
- // get default database group- $config = config(Database::class);- $this->group = $config->defaultGroup;- unset($config);+ if (is_string($db)) {+ $this->group = $db;+ } else {+ // We use `defaultGroup` even if $db is ConnectionInterface or config+ // array. Because this is for testing purposes, and it is easier to+ // understand and operate as if the migrations were run on the+ // default group.+ $config = config(Database::class);+ $this->group = $config->defaultGroup;+ unset($config);+ }
// If no db connection passed in, use
// default database group.
@@ -841,7 +848,7 @@ class MigrationRunner
/** @var Migration $instance */
$instance = new $class(Database::forge($this->db));
- $group = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;+ $group = $instance->getDBGroup() ?? $this->group;
if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
// @codeCoverageIgnoreStart
@@ -857,8 +864,6 @@ class MigrationRunner
return true;
}
- $this->setGroup($group);-
if (! is_callable([$instance, $direction])) {
$message = sprintf(lang('Migrations.missingMethod'), $direction);

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 2 times, most recently from c581a48 to 6a078a4CompareNovember 19, 2023 13:04
@MGatner

Copy link
Copy Markdown
Member

This is complicated. I'm tracking but let me know if you need me more. Thanks for handling.

Comment threadsystem/Database/MigrationRunner.php

@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!

@lonnieezell
lonnieezell merged commit 2420424 into codeigniter4:developDec 13, 2023
@paulbalandan
paulbalandan deleted the migration-runner branch December 13, 2023 05:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Migration runner allows a $db but its never passed to the Migration files

4 participants

@paulbalandan@kenjis@MGatner@lonnieezell
, '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: migrations not using custom DB connection of migration runner - #8221

Merged
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner
Dec 13, 2023
Merged

fix: migrations not using custom DB connection of migration runner#8221
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner

Conversation

@paulbalandan

@paulbalandanpaulbalandan commented Nov 15, 2023

Copy link
Copy Markdown
Member

Description
Closes#8060

When using custom array connection for migration runner, the migrations ran do not use the custom connection of the runner but instead uses the default shared connection.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@paulbalandanpaulbalandan added the bug Verified issues on the current code behavior or pull requests that will fix them label Nov 15, 2023
@paulbalandanpaulbalandan changed the title fix: migrations not using custom DB connections of migration runnerfix: migrations not using custom DB connection of migration runnerNov 15, 2023
@paulbalandan

Copy link
Copy Markdown
MemberAuthor

I found this bug while working on phpstan-codeigniter in trying to add an extension for properly identifying the property types of Entities.

@kenjis

Copy link
Copy Markdown
Member

@paulbalandan The code is indeed something wrong, but I don't understand the significance of passing DB connection to MigrationRunner.

@paulbalandan

Copy link
Copy Markdown
MemberAuthor

The use case is this: In order to infer the property types of Entities, I thought of using the database tables and the fields. So, I must run migrations in order to get the tables. However, I don't want to mess with the migrations of the end users so I thought of running the migrations in a separate connection. So, regardless of the default connection of the user, I run my own migrations using SQLite3 with a database file. I don't use command('migrate') because it will use the default group. I don't want either to alter the shared Config\Database. So, here comes the array connection. All went smoothly until I am listing all the tables using $db->listTables() to find out that the db file only contains the migrations table. Upon checking, migration files were found but were ran using the shared connection.

Comment threadsystem/Database/MigrationRunner.php Outdated
@kenjis

kenjis commented Nov 15, 2023

Copy link
Copy Markdown
Member

Okay, so you want to change the DB connection for testing.
After all, the parameter is for testing.

I sent PR #8222 to make it clear.

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 3 times, most recently from a7a6777 to fbdcf93CompareNovember 16, 2023 03:58
@kenjis

Copy link
Copy Markdown
Member

What should be the group for the added test?

sqlite> select * from migrations;
1|2018-01-24-102301|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1
2|2018-01-24-102302|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1

@kenjis

Copy link
Copy Markdown
Member

Comment threadsystem/Database/MigrationRunner.php
@kenjis

Copy link
Copy Markdown
Member

Frankly, Migration is complex and difficult to maintain consistency.

When temporarily changing a DB connection for testing purposes, it seems better to regard that the DB connection as the default group because it is easier to manipulate.

However, it seems a bit odd that the DB group name in the migration history is changed to the default group even if you specify the name of the DB group, e.g., db1.

Maybe the following patch is needed.

--- a/system/Database/MigrationRunner.php+++ b/system/Database/MigrationRunner.php@@ -141,10 +141,17 @@ class MigrationRunner
// Default name space is the app namespace
$this->namespace = APP_NAMESPACE;
- // get default database group- $config = config(Database::class);- $this->group = $config->defaultGroup;- unset($config);+ if (is_string($db)) {+ $this->group = $db;+ } else {+ // We use `defaultGroup` even if $db is ConnectionInterface or config+ // array. Because this is for testing purposes, and it is easier to+ // understand and operate as if the migrations were run on the+ // default group.+ $config = config(Database::class);+ $this->group = $config->defaultGroup;+ unset($config);+ }
// If no db connection passed in, use
// default database group.
@@ -841,7 +848,7 @@ class MigrationRunner
/** @var Migration $instance */
$instance = new $class(Database::forge($this->db));
- $group = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;+ $group = $instance->getDBGroup() ?? $this->group;
if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
// @codeCoverageIgnoreStart
@@ -857,8 +864,6 @@ class MigrationRunner
return true;
}
- $this->setGroup($group);-
if (! is_callable([$instance, $direction])) {
$message = sprintf(lang('Migrations.missingMethod'), $direction);

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 2 times, most recently from c581a48 to 6a078a4CompareNovember 19, 2023 13:04
@MGatner

Copy link
Copy Markdown
Member

This is complicated. I'm tracking but let me know if you need me more. Thanks for handling.

Comment threadsystem/Database/MigrationRunner.php

@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!

@lonnieezell
lonnieezell merged commit 2420424 into codeigniter4:developDec 13, 2023
@paulbalandan
paulbalandan deleted the migration-runner branch December 13, 2023 05:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Migration runner allows a $db but its never passed to the Migration files

4 participants

@paulbalandan@kenjis@MGatner@lonnieezell
, '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: migrations not using custom DB connection of migration runner - #8221

Merged
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner
Dec 13, 2023
Merged

fix: migrations not using custom DB connection of migration runner#8221
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner

Conversation

@paulbalandan

@paulbalandanpaulbalandan commented Nov 15, 2023

Copy link
Copy Markdown
Member

Description
Closes#8060

When using custom array connection for migration runner, the migrations ran do not use the custom connection of the runner but instead uses the default shared connection.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@paulbalandanpaulbalandan added the bug Verified issues on the current code behavior or pull requests that will fix them label Nov 15, 2023
@paulbalandanpaulbalandan changed the title fix: migrations not using custom DB connections of migration runnerfix: migrations not using custom DB connection of migration runnerNov 15, 2023
@paulbalandan

Copy link
Copy Markdown
MemberAuthor

I found this bug while working on phpstan-codeigniter in trying to add an extension for properly identifying the property types of Entities.

@kenjis

Copy link
Copy Markdown
Member

@paulbalandan The code is indeed something wrong, but I don't understand the significance of passing DB connection to MigrationRunner.

@paulbalandan

Copy link
Copy Markdown
MemberAuthor

The use case is this: In order to infer the property types of Entities, I thought of using the database tables and the fields. So, I must run migrations in order to get the tables. However, I don't want to mess with the migrations of the end users so I thought of running the migrations in a separate connection. So, regardless of the default connection of the user, I run my own migrations using SQLite3 with a database file. I don't use command('migrate') because it will use the default group. I don't want either to alter the shared Config\Database. So, here comes the array connection. All went smoothly until I am listing all the tables using $db->listTables() to find out that the db file only contains the migrations table. Upon checking, migration files were found but were ran using the shared connection.

Comment threadsystem/Database/MigrationRunner.php Outdated
@kenjis

kenjis commented Nov 15, 2023

Copy link
Copy Markdown
Member

Okay, so you want to change the DB connection for testing.
After all, the parameter is for testing.

I sent PR #8222 to make it clear.

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 3 times, most recently from a7a6777 to fbdcf93CompareNovember 16, 2023 03:58
@kenjis

Copy link
Copy Markdown
Member

What should be the group for the added test?

sqlite> select * from migrations;
1|2018-01-24-102301|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1
2|2018-01-24-102302|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1

@kenjis

Copy link
Copy Markdown
Member

Comment threadsystem/Database/MigrationRunner.php
@kenjis

Copy link
Copy Markdown
Member

Frankly, Migration is complex and difficult to maintain consistency.

When temporarily changing a DB connection for testing purposes, it seems better to regard that the DB connection as the default group because it is easier to manipulate.

However, it seems a bit odd that the DB group name in the migration history is changed to the default group even if you specify the name of the DB group, e.g., db1.

Maybe the following patch is needed.

--- a/system/Database/MigrationRunner.php+++ b/system/Database/MigrationRunner.php@@ -141,10 +141,17 @@ class MigrationRunner
// Default name space is the app namespace
$this->namespace = APP_NAMESPACE;
- // get default database group- $config = config(Database::class);- $this->group = $config->defaultGroup;- unset($config);+ if (is_string($db)) {+ $this->group = $db;+ } else {+ // We use `defaultGroup` even if $db is ConnectionInterface or config+ // array. Because this is for testing purposes, and it is easier to+ // understand and operate as if the migrations were run on the+ // default group.+ $config = config(Database::class);+ $this->group = $config->defaultGroup;+ unset($config);+ }
// If no db connection passed in, use
// default database group.
@@ -841,7 +848,7 @@ class MigrationRunner
/** @var Migration $instance */
$instance = new $class(Database::forge($this->db));
- $group = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;+ $group = $instance->getDBGroup() ?? $this->group;
if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
// @codeCoverageIgnoreStart
@@ -857,8 +864,6 @@ class MigrationRunner
return true;
}
- $this->setGroup($group);-
if (! is_callable([$instance, $direction])) {
$message = sprintf(lang('Migrations.missingMethod'), $direction);

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 2 times, most recently from c581a48 to 6a078a4CompareNovember 19, 2023 13:04
@MGatner

Copy link
Copy Markdown
Member

This is complicated. I'm tracking but let me know if you need me more. Thanks for handling.

Comment threadsystem/Database/MigrationRunner.php

@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!

@lonnieezell
lonnieezell merged commit 2420424 into codeigniter4:developDec 13, 2023
@paulbalandan
paulbalandan deleted the migration-runner branch December 13, 2023 05:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Migration runner allows a $db but its never passed to the Migration files

4 participants

@paulbalandan@kenjis@MGatner@lonnieezell
, '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: migrations not using custom DB connection of migration runner - #8221

Merged
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner
Dec 13, 2023
Merged

fix: migrations not using custom DB connection of migration runner#8221
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner

Conversation

@paulbalandan

@paulbalandanpaulbalandan commented Nov 15, 2023

Copy link
Copy Markdown
Member

Description
Closes#8060

When using custom array connection for migration runner, the migrations ran do not use the custom connection of the runner but instead uses the default shared connection.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@paulbalandanpaulbalandan added the bug Verified issues on the current code behavior or pull requests that will fix them label Nov 15, 2023
@paulbalandanpaulbalandan changed the title fix: migrations not using custom DB connections of migration runnerfix: migrations not using custom DB connection of migration runnerNov 15, 2023
@paulbalandan

Copy link
Copy Markdown
MemberAuthor

I found this bug while working on phpstan-codeigniter in trying to add an extension for properly identifying the property types of Entities.

@kenjis

Copy link
Copy Markdown
Member

@paulbalandan The code is indeed something wrong, but I don't understand the significance of passing DB connection to MigrationRunner.

@paulbalandan

Copy link
Copy Markdown
MemberAuthor

The use case is this: In order to infer the property types of Entities, I thought of using the database tables and the fields. So, I must run migrations in order to get the tables. However, I don't want to mess with the migrations of the end users so I thought of running the migrations in a separate connection. So, regardless of the default connection of the user, I run my own migrations using SQLite3 with a database file. I don't use command('migrate') because it will use the default group. I don't want either to alter the shared Config\Database. So, here comes the array connection. All went smoothly until I am listing all the tables using $db->listTables() to find out that the db file only contains the migrations table. Upon checking, migration files were found but were ran using the shared connection.

Comment threadsystem/Database/MigrationRunner.php Outdated
@kenjis

kenjis commented Nov 15, 2023

Copy link
Copy Markdown
Member

Okay, so you want to change the DB connection for testing.
After all, the parameter is for testing.

I sent PR #8222 to make it clear.

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 3 times, most recently from a7a6777 to fbdcf93CompareNovember 16, 2023 03:58
@kenjis

Copy link
Copy Markdown
Member

What should be the group for the added test?

sqlite> select * from migrations;
1|2018-01-24-102301|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1
2|2018-01-24-102302|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1

@kenjis

Copy link
Copy Markdown
Member

Comment threadsystem/Database/MigrationRunner.php
@kenjis

Copy link
Copy Markdown
Member

Frankly, Migration is complex and difficult to maintain consistency.

When temporarily changing a DB connection for testing purposes, it seems better to regard that the DB connection as the default group because it is easier to manipulate.

However, it seems a bit odd that the DB group name in the migration history is changed to the default group even if you specify the name of the DB group, e.g., db1.

Maybe the following patch is needed.

--- a/system/Database/MigrationRunner.php+++ b/system/Database/MigrationRunner.php@@ -141,10 +141,17 @@ class MigrationRunner
// Default name space is the app namespace
$this->namespace = APP_NAMESPACE;
- // get default database group- $config = config(Database::class);- $this->group = $config->defaultGroup;- unset($config);+ if (is_string($db)) {+ $this->group = $db;+ } else {+ // We use `defaultGroup` even if $db is ConnectionInterface or config+ // array. Because this is for testing purposes, and it is easier to+ // understand and operate as if the migrations were run on the+ // default group.+ $config = config(Database::class);+ $this->group = $config->defaultGroup;+ unset($config);+ }
// If no db connection passed in, use
// default database group.
@@ -841,7 +848,7 @@ class MigrationRunner
/** @var Migration $instance */
$instance = new $class(Database::forge($this->db));
- $group = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;+ $group = $instance->getDBGroup() ?? $this->group;
if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
// @codeCoverageIgnoreStart
@@ -857,8 +864,6 @@ class MigrationRunner
return true;
}
- $this->setGroup($group);-
if (! is_callable([$instance, $direction])) {
$message = sprintf(lang('Migrations.missingMethod'), $direction);

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 2 times, most recently from c581a48 to 6a078a4CompareNovember 19, 2023 13:04
@MGatner

Copy link
Copy Markdown
Member

This is complicated. I'm tracking but let me know if you need me more. Thanks for handling.

Comment threadsystem/Database/MigrationRunner.php

@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!

@lonnieezell
lonnieezell merged commit 2420424 into codeigniter4:developDec 13, 2023
@paulbalandan
paulbalandan deleted the migration-runner branch December 13, 2023 05:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Migration runner allows a $db but its never passed to the Migration files

4 participants

@paulbalandan@kenjis@MGatner@lonnieezell
, '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: migrations not using custom DB connection of migration runner - #8221

Merged
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner
Dec 13, 2023
Merged

fix: migrations not using custom DB connection of migration runner#8221
lonnieezell merged 4 commits into
codeigniter4:developfrom
paulbalandan:migration-runner

Conversation

@paulbalandan

@paulbalandanpaulbalandan commented Nov 15, 2023

Copy link
Copy Markdown
Member

Description
Closes#8060

When using custom array connection for migration runner, the migrations ran do not use the custom connection of the runner but instead uses the default shared connection.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@paulbalandanpaulbalandan added the bug Verified issues on the current code behavior or pull requests that will fix them label Nov 15, 2023
@paulbalandanpaulbalandan changed the title fix: migrations not using custom DB connections of migration runnerfix: migrations not using custom DB connection of migration runnerNov 15, 2023
@paulbalandan

Copy link
Copy Markdown
MemberAuthor

I found this bug while working on phpstan-codeigniter in trying to add an extension for properly identifying the property types of Entities.

@kenjis

Copy link
Copy Markdown
Member

@paulbalandan The code is indeed something wrong, but I don't understand the significance of passing DB connection to MigrationRunner.

@paulbalandan

Copy link
Copy Markdown
MemberAuthor

The use case is this: In order to infer the property types of Entities, I thought of using the database tables and the fields. So, I must run migrations in order to get the tables. However, I don't want to mess with the migrations of the end users so I thought of running the migrations in a separate connection. So, regardless of the default connection of the user, I run my own migrations using SQLite3 with a database file. I don't use command('migrate') because it will use the default group. I don't want either to alter the shared Config\Database. So, here comes the array connection. All went smoothly until I am listing all the tables using $db->listTables() to find out that the db file only contains the migrations table. Upon checking, migration files were found but were ran using the shared connection.

Comment threadsystem/Database/MigrationRunner.php Outdated
@kenjis

kenjis commented Nov 15, 2023

Copy link
Copy Markdown
Member

Okay, so you want to change the DB connection for testing.
After all, the parameter is for testing.

I sent PR #8222 to make it clear.

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 3 times, most recently from a7a6777 to fbdcf93CompareNovember 16, 2023 03:58
@kenjis

Copy link
Copy Markdown
Member

What should be the group for the added test?

sqlite> select * from migrations;
1|2018-01-24-102301|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1
2|2018-01-24-102302|Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration|tests|Tests\Support\MigrationTestMigrations|1700128890|1

@kenjis

Copy link
Copy Markdown
Member

Comment threadsystem/Database/MigrationRunner.php
@kenjis

Copy link
Copy Markdown
Member

Frankly, Migration is complex and difficult to maintain consistency.

When temporarily changing a DB connection for testing purposes, it seems better to regard that the DB connection as the default group because it is easier to manipulate.

However, it seems a bit odd that the DB group name in the migration history is changed to the default group even if you specify the name of the DB group, e.g., db1.

Maybe the following patch is needed.

--- a/system/Database/MigrationRunner.php+++ b/system/Database/MigrationRunner.php@@ -141,10 +141,17 @@ class MigrationRunner
// Default name space is the app namespace
$this->namespace = APP_NAMESPACE;
- // get default database group- $config = config(Database::class);- $this->group = $config->defaultGroup;- unset($config);+ if (is_string($db)) {+ $this->group = $db;+ } else {+ // We use `defaultGroup` even if $db is ConnectionInterface or config+ // array. Because this is for testing purposes, and it is easier to+ // understand and operate as if the migrations were run on the+ // default group.+ $config = config(Database::class);+ $this->group = $config->defaultGroup;+ unset($config);+ }
// If no db connection passed in, use
// default database group.
@@ -841,7 +848,7 @@ class MigrationRunner
/** @var Migration $instance */
$instance = new $class(Database::forge($this->db));
- $group = $instance->getDBGroup() ?? config(Database::class)->defaultGroup;+ $group = $instance->getDBGroup() ?? $this->group;
if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
// @codeCoverageIgnoreStart
@@ -857,8 +864,6 @@ class MigrationRunner
return true;
}
- $this->setGroup($group);-
if (! is_callable([$instance, $direction])) {
$message = sprintf(lang('Migrations.missingMethod'), $direction);

@paulbalandan
paulbalandanforce-pushed the migration-runner branch 2 times, most recently from c581a48 to 6a078a4CompareNovember 19, 2023 13:04
@MGatner

Copy link
Copy Markdown
Member

This is complicated. I'm tracking but let me know if you need me more. Thanks for handling.

Comment threadsystem/Database/MigrationRunner.php

@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!

@lonnieezell
lonnieezell merged commit 2420424 into codeigniter4:developDec 13, 2023
@paulbalandan
paulbalandan deleted the migration-runner branch December 13, 2023 05:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugVerified issues on the current code behavior or pull requests that will fix them

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Migration runner allows a $db but its never passed to the Migration files

4 participants

@paulbalandan@kenjis@MGatner@lonnieezell