[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.3-104-g4c5ce27d2
? sunnavy
sunnavy at bestpractical.com
Fri Dec 14 12:31:14 EST 2018
The branch, 4.4-trunk has been updated
via 4c5ce27d2481020cce87d5dbc0fa0187dc5b7800 (commit)
via 032c67fc5cf7a60449a4949b32c468ae811ea2f9 (commit)
via 0546b38ca0fdc998c70fb725066e1ce322ec078b (commit)
from 110f87acf8ce0a2a56361fd05ef75323a7faf498 (commit)
Summary of changes:
configure.ac | 1 +
.../{upgrade-assets.in => reset-sequences.in} | 133 +++++++++++++--------
2 files changed, 84 insertions(+), 50 deletions(-)
copy etc/upgrade/{upgrade-assets.in => reset-sequences.in} (69%)
- Log -----------------------------------------------------------------
commit 0546b38ca0fdc998c70fb725066e1ce322ec078b
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Mon Oct 30 15:34:48 2017 -0400
Script to automatically update DB sequences to the next available value
When running a full serializer export and then an import using the
--clone option, the target database is typically initialized using
rt-setup-database --action create,schema,acl. This correctly creates
the empty tables, however Postgres and Oracle use sequences on RT's
tables and after the import, the sequences can still be at their initial
values. Provide a script to set sequences to the next available value.
diff --git a/configure.ac b/configure.ac
index d7685d80d..55773a96b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -454,6 +454,7 @@ AC_CONFIG_FILES([
etc/upgrade/3.8-ical-extension
etc/upgrade/4.0-customfield-checkbox-extension
etc/upgrade/generate-rtaddressregexp
+ etc/upgrade/reset-sequences
etc/upgrade/sanity-check-stylesheets
etc/upgrade/shrink-cgm-table
etc/upgrade/shrink-transactions-table
diff --git a/etc/upgrade/reset-sequences.in b/etc/upgrade/reset-sequences.in
new file mode 100644
index 000000000..6954081ae
--- /dev/null
+++ b/etc/upgrade/reset-sequences.in
@@ -0,0 +1,231 @@
+#!@PERL@
+# BEGIN BPS TAGGED BLOCK {{{
+#
+# COPYRIGHT:
+#
+# This software is Copyright (c) 1996-2018 Best Practical Solutions, LLC
+# <sales at bestpractical.com>
+#
+# (Except where explicitly superseded by other copyright notices)
+#
+#
+# LICENSE:
+#
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+#
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+#
+#
+# CONTRIBUTION SUBMISSION POLICY:
+#
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+#
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+#
+# END BPS TAGGED BLOCK }}}
+use 5.10.1;
+use strict;
+use warnings;
+
+use lib "@LOCAL_LIB_PATH@";
+use lib "@RT_LIB_PATH@";
+
+use Term::ReadKey;
+use Getopt::Long;
+
+$| = 1; # unbuffer all output.
+
+my %args;
+GetOptions(
+ \%args,
+ 'dba=s', 'dba-password=s', 'prompt-for-dba-password',
+);
+
+no warnings 'once';
+use RT::Interface::CLI qw(Init);
+Init();
+
+my $db_type = RT->Config->Get('DatabaseType') || '';
+my $db_host = RT->Config->Get('DatabaseHost') || '';
+my $db_port = RT->Config->Get('DatabasePort') || '';
+my $db_name = RT->Config->Get('DatabaseName') || '';
+my $db_user = RT->Config->Get('DatabaseUser') || '';
+my $db_pass = RT->Config->Get('DatabasePassword') || '';
+
+my $dba_user = $args{'dba'} || $ENV{'RT_DBA_USER'} || RT->Config->Get('DatabaseAdmin') || '';
+my $dba_pass = $args{'dba-password'} || $ENV{'RT_DBA_PASSWORD'};
+
+if ( !$args{force} && ( !defined $dba_pass || $args{'prompt-for-dba-password'} ) ) {
+ $dba_pass = get_dba_password();
+ chomp $dba_pass if defined($dba_pass);
+}
+
+my $dbh = get_admin_dbh();
+
+unless ( $dbh ){
+ print "Unable to connect to database.\n\n";
+ exit;
+}
+
+my @sequence_tables = qw(
+ ATTACHMENTS
+ QUEUES
+ LINKS
+ PRINCIPALS
+ GROUPS
+ SCRIPCONDITIONS
+ TRANSACTIONS
+ SCRIPS
+ OBJECTSCRIPS
+ ACL
+ GROUPMEMBERS
+ CACHEDGROUPMEMBERS
+ USERS
+ TICKETS
+ SCRIPACTIONS
+ TEMPLATES
+ OBJECTCUSTOMFIELDS
+ OBJECTCUSTOMFIELDVALUES
+ CUSTOMFIELDS
+ CUSTOMFIELDVALUES
+ ATTRIBUTES
+ CLASSES
+ ARTICLES
+ TOPICS
+ OBJECTTOPICS
+ OBJECTCLASSES
+ ASSETS
+ CATALOGS
+ CUSTOMROLES
+ OBJECTCUSTOMROLES
+ );
+
+
+my $found_tables = {};
+foreach my $name ( $RT::Handle->_TableNames ) {
+ my ($table) = grep lc($name) eq lc($_), @sequence_tables;
+ next unless $table;
+ warn "Found table $table";
+ $found_tables->{$table}++;
+}
+
+print "Working with:\n"
+ ."Type:\t$db_type\nHost:\t$db_host\nPort:\t$db_port\nName:\t$db_name\n"
+ ."User:\t$db_user\nDBA:\t$dba_user" . ($args{'skip-create'} ? ' (No DBA)' : '') . "\n\n";
+
+foreach my $table ( keys %$found_tables ){
+ fix_id_sequence($table, {
+ Pg => lc($table) . '_id_seq',
+ Oracle => $table . '_seq',
+ });
+}
+
+print "Sequence updates complete.\n\n";
+
+
+sub fix_id_sequence {
+ my ($table, $sequence_per_db) = @_;
+ my $sequence = $sequence_per_db->{$db_type} or return;
+ my ($max, $query);
+
+ if ($db_type eq 'Oracle') {
+ my $user = RT->Config->Get('DatabaseUser');
+ $query = "SELECT MAX(ID) FROM $user.$table";
+ }
+ else {
+ $query = "SELECT MAX(ID) FROM $table";
+ }
+
+ my $sth = $dbh->prepare($query) or die $dbh->errstr;
+ $sth->execute();
+ ($max) = $sth->fetchrow_array();
+
+ my $next_id = ($max || 0) + 1;
+
+ # Nothing to do if there are no rows
+ return if $next_id == 1;
+
+ warn "Resetting $sequence to $next_id for $table";
+
+ my @sql;
+ if ($db_type eq 'Pg') {
+ @sql = "ALTER SEQUENCE $sequence RESTART WITH $next_id;";
+ }
+ elsif ($db_type eq 'Oracle') {
+ my $user = RT->Config->Get('DatabaseUser');
+ @sql = (
+ "ALTER SEQUENCE $user.$sequence INCREMENT BY " . ($next_id - 1) . "",
+ "SELECT $user.$sequence.nextval FROM dual",
+ "ALTER SEQUENCE $user.$sequence INCREMENT BY 1",
+ );
+ }
+
+ foreach my $statement ( @sql ) {
+ my $rv = $dbh->do($statement);
+
+ if ( not defined $rv ) {
+ warn "Error: " . $dbh->errstr;
+ }
+ }
+ return;
+}
+
+sub get_dba_password {
+ return "" if $db_type eq 'SQLite';
+ print "In order to create or update your RT database,"
+ . " this script needs to connect to your "
+ . " $db_type instance on $db_host (port '$db_port') as $dba_user\n";
+ print "Please specify that user's database password below. If the user has no database\n";
+ print "password, just press return.\n\n";
+ print "Password: ";
+ ReadMode('noecho');
+ my $password = ReadLine(0);
+ ReadMode('normal');
+ print "\n";
+ return ($password);
+}
+
+sub get_admin_dbh {
+ return _get_dbh( RT::Handle->DSN, $dba_user, $dba_pass );
+}
+
+sub _get_dbh {
+ my ($dsn, $user, $pass) = @_;
+ my $dbh = DBI->connect(
+ $dsn, $user, $pass,
+ { RaiseError => 0, PrintError => 0 },
+ );
+ unless ( $dbh ) {
+ my $msg = "Failed to connect to $dsn as user '$user': ". $DBI::errstr;
+ if ( $args{'debug'} ) {
+ require Carp; Carp::confess( $msg );
+ } else {
+ print STDERR $msg; exit -1;
+ }
+ }
+ return $dbh;
+}
+
commit 032c67fc5cf7a60449a4949b32c468ae811ea2f9
Author: Brian C. Duggan <brian at bestpractical.com>
Date: Wed Jun 27 16:27:55 2018 -0400
Use correct sequence name for Pg tables
The Postgres schema uses '_id_seq' suffixes for all tables excect
OBJECTCUSTOMFIELDS and OBJECTCUSTOMFIELDVALUES, which use '_id_s'.
This change allows the reset-sequences script to use the correct suffix
for the tables for Postgres.
diff --git a/etc/upgrade/reset-sequences.in b/etc/upgrade/reset-sequences.in
index 6954081ae..ec40cdb61 100644
--- a/etc/upgrade/reset-sequences.in
+++ b/etc/upgrade/reset-sequences.in
@@ -137,8 +137,16 @@ print "Working with:\n"
."User:\t$db_user\nDBA:\t$dba_user" . ($args{'skip-create'} ? ' (No DBA)' : '') . "\n\n";
foreach my $table ( keys %$found_tables ){
+
+ my $pg_seq = '_id_seq';
+
+ # Two of the Pg sequences don't follow the standard _id_seq ending
+ if ( $table eq 'OBJECTCUSTOMFIELDS' or $table eq 'OBJECTCUSTOMFIELDVALUES' ){
+ $pg_seq = '_id_s';
+ }
+
fix_id_sequence($table, {
- Pg => lc($table) . '_id_seq',
+ Pg => lc($table) . $pg_seq,
Oracle => $table . '_seq',
});
}
commit 4c5ce27d2481020cce87d5dbc0fa0187dc5b7800
Merge: 110f87acf 032c67fc5
Author: sunnavy <sunnavy at bestpractical.com>
Date: Sat Dec 15 01:30:20 2018 +0800
Merge branch '4.4/reset-sequences' into 4.4-trunk
-----------------------------------------------------------------------
More information about the rt-commit
mailing list