Skip to content

Repair the update of database schema changes on postgreSQL #19707

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
merged 4 commits into from
Aug 10, 2018
Merged

Repair the update of database schema changes on postgreSQL #19707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2df1ea4
Repair the update of database schema changes on postgreSQL
Feb 16, 2018
8f5cc76
Add a better regex to split actions by comma
Feb 19, 2018
143e069
Remove useless code
Feb 20, 2018
daed6e3
Add a comment to sql file
May 17, 2018
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
6 changes: 5 additions & 1 deletion administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/* Changes to tables where data type conflicts exist with MySQL (mainly dealing with null values */
ALTER TABLE "#__modules" ALTER COLUMN "content" SET DEFAULT '';
ALTER TABLE "#__updates" ALTER COLUMN "data" SET DEFAULT '';
--
-- The following statement has to be disabled because it conflicts with
-- a later change added with Joomla! 3.8.8 to repair the update of database schema changes
--
-- ALTER TABLE "#__updates" ALTER COLUMN "data" SET DEFAULT '';

/* Tags database schema */

Expand Down
177 changes: 128 additions & 49 deletions libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,28 @@ protected function buildCheckQuery()
{
// Initialize fields in case we can't create a check query
$this->checkStatus = -1; // change status to skipped

$result = null;
$splitIntoWords = "~'[^']*'(*SKIP)(*F)|\s+~";
$splitIntoActions = "~'[^']*'(*SKIP)(*F)|\([^)]*\)(*SKIP)(*F)|,~";

// Remove any newlines
$this->updateQuery = str_replace("\n", '', $this->updateQuery);

// Remove trailing whitespace and semicolon
$this->updateQuery = rtrim($this->updateQuery, "; \t\n\r\0\x0B");

// Fix up extra spaces around () and in general
$find = array('#((\s*)\(\s*([^)\s]+)\s*)(\))#', '#(\s)(\s*)#');
$replace = array('($3)', '$1');
$updateQuery = preg_replace($find, $replace, $this->updateQuery);
$wordArray = explode(' ', $updateQuery);
$wordArray = preg_split($splitIntoWords, $updateQuery, null, PREG_SPLIT_NO_EMPTY);

$totalWords = count($wordArray);

// First, make sure we have an array of at least 6 elements
// if not, we can't make a check query for this one
if (count($wordArray) < 6)
if ($totalWords < 6)
{
// Done with method
return;
Expand All @@ -64,93 +72,164 @@ protected function buildCheckQuery()

if ($command === 'ALTER TABLE')
{
// Check only the last action
$actions = ltrim(substr($updateQuery, strpos($updateQuery, $wordArray[2]) + strlen($wordArray[2])));
$actions = preg_split($splitIntoActions, $actions);

// Get the last action
$lastActionArray = preg_split($splitIntoWords, end($actions), null, PREG_SPLIT_NO_EMPTY);

// Replace all actions by the last one
array_splice($wordArray, 3, $totalWords, $lastActionArray);

$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);

if ($alterCommand === 'ADD COLUMN')
{
$result = 'SELECT column_name FROM information_schema.columns WHERE table_name='
. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5]);
$result = 'SELECT column_name'
. ' FROM information_schema.columns'
. ' WHERE table_name='
. $this->fixQuote($wordArray[2])
. ' AND column_name=' . $this->fixQuote($wordArray[5]);

$this->queryType = 'ADD_COLUMN';
$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
$this->msgElements = array(
$this->fixQuote($wordArray[2]),
$this->fixQuote($wordArray[5])
);
}
elseif ($alterCommand === 'DROP COLUMN')
{
$result = 'SELECT column_name FROM information_schema.columns WHERE table_name='
. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5]);
$result = 'SELECT column_name'
. ' FROM information_schema.columns'
. ' WHERE table_name='
. $this->fixQuote($wordArray[2])
. ' AND column_name=' . $this->fixQuote($wordArray[5]);

$this->queryType = 'DROP_COLUMN';
$this->checkQueryExpected = 0;
$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
$this->msgElements = array(
$this->fixQuote($wordArray[2]),
$this->fixQuote($wordArray[5])
);
}
elseif ($alterCommand === 'ALTER COLUMN')
{
if (strtoupper($wordArray[6]) === 'TYPE')
$alterAction = strtoupper($wordArray[6]);

if ($alterAction === 'TYPE')
{
$type = '';
$type = implode(' ', array_slice($wordArray, 7));

for ($i = 7, $iMax = count($wordArray); $i < $iMax; $i++)
if ($pos = stripos($type, ' USING '))
{
$type .= $wordArray[$i] . ' ';
$type = substr($type, 0, $pos);
}

if ($pos = strpos($type, '('))
{
$type = substr($type, 0, $pos);
$datatype = substr($type, 0, $pos);
}

if ($pos = strpos($type, ';'))
else
{
$type = substr($type, 0, $pos);
$datatype = $type;
}

$result = 'SELECT column_name, data_type FROM information_schema.columns WHERE table_name='
. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
. ' AND data_type=' . $this->fixQuote($type);
$result = 'SELECT column_name, data_type '
. 'FROM information_schema.columns WHERE table_name='
. $this->fixQuote($wordArray[2]) . ' AND column_name='
. $this->fixQuote($wordArray[5])
. ' AND data_type=' . $this->fixQuote($datatype);

if ($datatype === 'character varying')
{
$result .= ' AND character_maximum_length = ' . (int) substr($type, $pos + 1);
}

$this->queryType = 'CHANGE_COLUMN_TYPE';
$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $type);
$this->msgElements = array(
$this->fixQuote($wordArray[2]),
$this->fixQuote($wordArray[5]),
$type
);
}
elseif (strtoupper($wordArray[7] . ' ' . $wordArray[8]) === 'NOT NULL')
elseif ($alterAction === 'SET')
{
if (strtoupper($wordArray[6]) === 'SET')
$alterType = strtoupper($wordArray[7]);

if ($alterType === 'NOT' && strtoupper($wordArray[8]) === 'NULL')
{
// SET NOT NULL
$isNullable = $this->fixQuote('NO');
$result = 'SELECT column_name, data_type, is_nullable'
. ' FROM information_schema.columns'
. ' WHERE table_name=' . $this->fixQuote($wordArray[2])
. ' AND column_name=' . $this->fixQuote($wordArray[5])
. ' AND is_nullable=' . $this->fixQuote('NO');

$this->queryType = 'CHANGE_COLUMN_TYPE';
$this->msgElements = array(
$this->fixQuote($wordArray[2]),
$this->fixQuote($wordArray[5]),
'NOT NULL'
);
}
else
elseif ($alterType === 'DEFAULT')
{
// DROP NOT NULL
$isNullable = $this->fixQuote('YES');
}
$result = 'SELECT column_name, data_type, is_nullable'
. ' FROM information_schema.columns'
. ' WHERE table_name=' . $this->fixQuote($wordArray[2])
. ' AND column_name=' . $this->fixQuote($wordArray[5])
. ' AND (CASE (position(' . $this->db->quote('::') . ' in column_default))'
. ' WHEN 0 THEN '
. ' column_default = ' . $this->db->quote($wordArray[8])
. ' ELSE '
. ' substring(column_default, 1, (position(' . $this->db->quote('::')
. ' in column_default) -1)) = ' . $this->db->quote($wordArray[8])
. ' END)';

$result = 'SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_name='
. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
. ' AND is_nullable=' . $isNullable;

$this->queryType = 'CHANGE_COLUMN_TYPE';
$this->checkQueryExpected = 1;
$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $isNullable);
$this->queryType = 'CHANGE_COLUMN_TYPE';
$this->msgElements = array(
$this->fixQuote($wordArray[2]),
$this->fixQuote($wordArray[5]),
'DEFAULT ' . $wordArray[8]
);
}
}
elseif (strtoupper($wordArray[7]) === 'DEFAULT')
elseif ($alterAction === 'DROP')
{
if (strtoupper($wordArray[6]) === 'SET')
$alterType = strtoupper($wordArray[7]);

if ($alterType === 'DEFAULT')
{
$isNullDef = 'IS NOT NULL';
$result = 'SELECT column_name, data_type, is_nullable , column_default'
. ' FROM information_schema.columns'
. ' WHERE table_name=' . $this->fixQuote($wordArray[2])
. ' AND column_name=' . $this->fixQuote($wordArray[5])
. ' AND column_default IS NOT NULL';

$this->queryType = 'CHANGE_COLUMN_TYPE';
$this->checkQueryExpected = 0;
$this->msgElements = array(
$this->fixQuote($wordArray[2]),
$this->fixQuote($wordArray[5]),
'NOT DEFAULT'
);
}
else
elseif ($alterType === 'NOT' && strtoupper($wordArray[8]) === 'NULL')
{
// DROP DEFAULT
$isNullDef = 'IS NULL';
}
$result = 'SELECT column_name, data_type, is_nullable , column_default'
. ' FROM information_schema.columns'
. ' WHERE table_name=' . $this->fixQuote($wordArray[2])
. ' AND column_name=' . $this->fixQuote($wordArray[5])
. ' AND is_nullable = ' . $this->fixQuote('NO');

$result = 'SELECT column_name, data_type, column_default FROM information_schema.columns WHERE table_name='
. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
. ' AND column_default ' . $isNullDef;

$this->queryType = 'CHANGE_COLUMN_TYPE';
$this->checkQueryExpected = 1;
$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $isNullDef);
$this->queryType = 'CHANGE_COLUMN_TYPE';
$this->checkQueryExpected = 0;
$this->msgElements = array(
$this->fixQuote($wordArray[2]),
$this->fixQuote($wordArray[5]),
'NULL'
);
}
}
}
}
Expand Down