projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 75817 - fixed saving of password for new contacts, and password validation on...
[freeside.git]
/
bin
/
fix-sequences
diff --git
a/bin/fix-sequences
b/bin/fix-sequences
index
55639d9
..
896f01c
100755
(executable)
--- a/
bin/fix-sequences
+++ b/
bin/fix-sequences
@@
-1,12
+1,8
@@
#!/usr/bin/perl -Tw
#!/usr/bin/perl -Tw
+# run dbdef-create first!
+
use strict;
use strict;
-use DBI;
-use DBIx::DBSchema 0.21;
-use DBIx::DBSchema::Table;
-use DBIx::DBSchema::Column;
-use DBIx::DBSchema::ColGroup::Unique;
-use DBIx::DBSchema::ColGroup::Index;
use FS::UID qw(adminsuidsetup driver_name);
use FS::Record qw(dbdef);
use FS::UID qw(adminsuidsetup driver_name);
use FS::Record qw(dbdef);
@@
-18,8
+14,10
@@
my $schema = dbdef();
#false laziness w/fs-setup
my @tables = scalar(@ARGV)
? @ARGV
#false laziness w/fs-setup
my @tables = scalar(@ARGV)
? @ARGV
- : grep { ! /^h_/ } $schema->tables;
+ #: grep { ! /^h_/ } $schema->tables;
+ : $schema->tables;
foreach my $table ( @tables ) {
foreach my $table ( @tables ) {
+
my $tableobj = $schema->table($table)
or die "unknown table $table (did you run dbdef-create?)\n";
my $tableobj = $schema->table($table)
or die "unknown table $table (did you run dbdef-create?)\n";
@@
-28,30
+26,42
@@
foreach my $table ( @tables ) {
my $col = $tableobj->column($primary_key);
my $col = $tableobj->column($primary_key);
+#warn $col->type;
+my $default = ref($col->default) ? ${ $col->default } : $col->default;
+#use Data::Dumper;
+#warn Dumper $col;
next unless uc($col->type) eq 'SERIAL'
|| ( driver_name eq 'Pg'
next unless uc($col->type) eq 'SERIAL'
|| ( driver_name eq 'Pg'
- && defined($
col->
default)
- && $
col->
default =~ /^nextval\(/i
+ && defined($default)
+ && $default =~ /^nextval\(/i
)
|| ( driver_name eq 'mysql'
&& defined($col->local)
&& $col->local =~ /AUTO_INCREMENT/i
);
)
|| ( driver_name eq 'mysql'
&& defined($col->local)
&& $col->local =~ /AUTO_INCREMENT/i
);
- my $seq = "${table}_${primary_key}_seq";
+ my $suffix = '_seq';
+ if ( $table =~ /^(objectcustomfields|objectcustomfieldvalues)$/ ) {
+ $suffix = '_s';
+ }
+
+ my $seq = "${table}_${primary_key}$suffix";
if ( driver_name eq 'Pg'
if ( driver_name eq 'Pg'
- && defined($
col->
default)
- && $
col->default =~ /^nextval\('"(\w+_seq)"'::text
\)$/
+ && defined($default)
+ && $
default =~ /^nextval\('"(public\.)?(\w+_seq)"'::(text|regclass)
\)$/
) {
) {
- $seq = $
1
;
+ $seq = $
2
;
}
warn "fixing sequence for $table\n";
}
warn "fixing sequence for $table\n";
- $dbh->do( "SELECT setval( '$seq',
- ( SELECT max($primary_key) FROM $table ) );" )
- or die $dbh->errstr;
+
+ my $sql = "SELECT setval( '$seq',
+ ( SELECT max($primary_key) FROM $table ) );";
+
+ #warn $col->default. " $seq\n$sql\n";
+ $dbh->do( $sql ) or die $dbh->errstr;
}
}