Partial Indexes #1048
Merged
Partial Indexes #1048
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
salacr
commented
Apr 16, 2025
vrana
requested changes
Apr 17, 2025
adminer/include/adminer.inc.php
Outdated
|
|
||
| $partial_index_condition_exists = false; | ||
| foreach ($indexes as $name => $index) { | ||
| $partial_index_condition_exists |= $index["partial_index_condition"]; |
Owner
There was a problem hiding this comment.
Fatal error: Uncaught TypeError: Unsupported operand types: int | string in adminer\include\adminer.inc.php:356
adminer/drivers/pgsql.inc.php
Outdated
| $columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2); | ||
| foreach ( | ||
| get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial, pg_am.amname as algorithm | ||
| get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial, pg_am.amname as algorithm, pg_get_expr(pg_index.indpred, pg_index.indrelid, true) AS partial_index_condition |
adminer/drivers/pgsql.inc.php
Outdated
| $columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2); | ||
| foreach ( | ||
| get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial, pg_am.amname as algorithm | ||
| get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial, pg_am.amname as algorithm, pg_get_expr(pg_index.indpred, pg_index.indrelid, true) AS partial_index_condition |
Owner
There was a problem hiding this comment.
Please check if pg_get_expr is available in CockroachDB and call it conditionally if not.
Contributor
Author
There was a problem hiding this comment.
It should be supported: cockroachdb/cockroach#10952
adminer/drivers/pgsql.inc.php
Outdated
| $queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . ($val[3] ? " USING $val[3]" : "") . " (" . implode(", ", $val[2]) . ")"; | ||
| $index_condition = ""; | ||
| if ($val[4]) { | ||
| $index_condition = " WHERE ".$val[4]; |
Owner
There was a problem hiding this comment.
Inline the string: "WHERE $val[4]"
adminer/drivers/pgsql.inc.php
Outdated
| if ($val[4]) { | ||
| $index_condition = " WHERE ".$val[4]; | ||
| } | ||
| $queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . ($val[3] ? " USING $val[3]" : "") . " (" . implode(", ", $val[2]) . ")".$index_condition; |
Owner
There was a problem hiding this comment.
Wrap this to more lines using logical blocks. Then you can inline $index_condition here.
adminer/include/adminer.inc.php
Outdated
| echo "<th>$index[type]" . ($index['algorithm'] != first(driver()->indexMethods()) ? " ($index[algorithm])" : ""); | ||
| echo "<td>" . implode(", ", $print); | ||
| if ($partial_index_condition_exists) { | ||
| echo "<td>" . ($index['partial_index_condition'] ? "WHERE ".$index['partial_index_condition'] : ""); |
adminer/include/adminer.inc.php
Outdated
| echo "<th>$index[type]" . ($index['algorithm'] != first(driver()->indexMethods()) ? " ($index[algorithm])" : ""); | ||
| echo "<td>" . implode(", ", $print); | ||
| if ($partial_index_condition_exists) { | ||
| echo "<td>" . ($index['partial_index_condition'] ? "WHERE ".$index['partial_index_condition'] : ""); |
| echo "<td>" . implode(", ", $print); | ||
| if ($partial_index_condition_exists) { | ||
| echo "<td>" . ($index['partial_index_condition'] ? "WHERE ".$index['partial_index_condition'] : ""); | ||
| } |
Owner
There was a problem hiding this comment.
This could look nicer if wrapped into "<code class='jush-" . JUSH . "'>".
adminer/lang/xx.inc.php
Outdated
| '<a%s>Configure</a> %s in %s.' => '<a%s>Xx</a> %s xx %s.', | ||
| 'screenshot' => 'xx', | ||
| 'Algorithm' => 'Xx', | ||
| 'Condition' => 'Xx', |
Owner
There was a problem hiding this comment.
Move to the block with Index translations.
Contributor
Author
There was a problem hiding this comment.
I think that both Algorithm / Condition are quite common terms but fixed
Owner
|
Also consider adding tests for new features so that they don't break in the future. You need Katalon Recorder to run the tests. |
vrana
reviewed
Apr 17, 2025
adminer/drivers/pgsql.inc.php
Outdated
| } else { | ||
| $queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . ($val[3] ? " USING $val[3]" : "") . " (" . implode(", ", $val[2]) . ")"; | ||
| $index_condition = ""; | ||
| if ($val[4]) { |
Owner
There was a problem hiding this comment.
Update doc-comment in mysql.inc.php.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.