Merge branch 'q'

[dbsrgits/SQL-Abstract.git] / maint / podregen

diff --git a/maint/podregen b/maint/podregen
index 4da2eaf..cbb5ed2 100755 (executable)
--- a/maint/podregen
+++ b/maint/podregen
@@ -3,15 +3,14 @@
 use lib 'lib';
 use strictures 2;
 use Data::Dumper::Compact;
+use Devel::DDCWarn;
 use SQL::Abstract::Formatter;
 use SQL::Abstract;
-use SQL::Abstract::ExtraClauses;
 
 my $ddc = Data::Dumper::Compact->new(max_width => 72);
 my $sqla = SQL::Abstract->new(
   lazy_join_sql_parts => 1,
-);
-SQL::Abstract::ExtraClauses->apply_to($sqla);
+)->plugin('+ExtraClauses');
 my $sqlaf = SQL::Abstract::Formatter->new(max_width => 72);
 
 while (1) {
@@ -51,7 +50,7 @@ while ($slurp =~ m/\G$expr_re/gc) {
   print $qpre.$qindent.$qtype;
   my ($sql, @bind) = $sqla->render_statement($expr);
   my $fsql = (ref($sql) ? $sqlaf->format(@$sql) : $sql);
-  $fsql =~ s/^/$indent/mg;
+  s/^/$indent/mg, s/\n+\Z// for $fsql;
   print $fsql."\n";
   print reformat(\@bind, $qindent);
   print "\n";