Hello community,
here is the log from the commit of package perl-SQL-Translator for
openSUSE:Factory checked in at 2020-04-22 20:55:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-SQL-Translator (Old)
and /work/SRC/openSUSE:Factory/.perl-SQL-Translator.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-SQL-Translator"
Wed Apr 22 20:55:46 2020 rev:15 rq:796189 version:1.61
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-SQL-Translator/perl-SQL-Translator.changes
2019-06-19 21:03:06.582225750 +0200
+++
/work/SRC/openSUSE:Factory/.perl-SQL-Translator.new.2738/perl-SQL-Translator.changes
2020-04-22 20:55:49.647725261 +0200
@@ -1,0 +2,13 @@
+Mon Apr 20 03:12:03 UTC 2020 - <[email protected]>
+
+- updated to 1.61
+ see /usr/share/doc/packages/perl-SQL-Translator/Changes
+
+ 1.61 - 2020-04-19
+ * Fixes for Sybase producer
+ * Support CHECK (expr) for SQLite and MySQLoids
+ * Avoid accidentally whole objects in YAML output
+ * Prettify comment generation
+ * Tyop fixes
+
+-------------------------------------------------------------------
Old:
----
SQL-Translator-1.60.tar.gz
New:
----
SQL-Translator-1.61.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-SQL-Translator.spec ++++++
--- /var/tmp/diff_new_pack.0bYeyq/_old 2020-04-22 20:55:50.799727516 +0200
+++ /var/tmp/diff_new_pack.0bYeyq/_new 2020-04-22 20:55:50.803727524 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-SQL-Translator
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: perl-SQL-Translator
-Version: 1.60
+Version: 1.61
Release: 0
#Upstream: Artistic-1.0 or GPL-1.0-or-later
%define cpan_name SQL-Translator
@@ -25,7 +25,7 @@
License: (Artistic-1.0 OR GPL-1.0-or-later) AND GPL-2.0-only
Group: Development/Libraries/Perl
Url: https://metacpan.org/release/%{cpan_name}
-Source0:
https://cpan.metacpan.org/authors/id/I/IL/ILMARI/%{cpan_name}-%{version}.tar.gz
+Source0:
https://cpan.metacpan.org/authors/id/M/MS/MSTROUT/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -84,7 +84,7 @@
%prep
%setup -q -n %{cpan_name}-%{version}
-find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644
+find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path
"*/script/*" ! -name "configure" -print0 | xargs -0 chmod 644
# MANUAL BEGIN
sed -i -e 's/use inc::Module::Install/use lib q[.];\nuse
inc::Module::Install/' Makefile.PL
# MANUAL END
++++++ SQL-Translator-1.60.tar.gz -> SQL-Translator-1.61.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/AUTHORS
new/SQL-Translator-1.61/AUTHORS
--- old/SQL-Translator-1.60/AUTHORS 2019-04-28 13:33:51.000000000 +0200
+++ new/SQL-Translator-1.61/AUTHORS 2020-04-19 17:06:28.000000000 +0200
@@ -57,7 +57,7 @@
- Stephen Bennett <[email protected]>
- Stephen Clouse <[email protected]>
- SymKat <[email protected]>
-- Tina Müller <[email protected]>
+- Tina Müller <[email protected]>
- Vincent Bachelier <[email protected]>
- Wallace Reis <[email protected]>
- William Wolf <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/Changes
new/SQL-Translator-1.61/Changes
--- old/SQL-Translator-1.60/Changes 2019-05-29 20:35:30.000000000 +0200
+++ new/SQL-Translator-1.61/Changes 2020-04-19 17:07:03.000000000 +0200
@@ -1,5 +1,12 @@
Changes for SQL::Translator
+1.61 - 2020-04-19
+ * Fixes for Sybase producer
+ * Support CHECK (expr) for SQLite and MySQLoids
+ * Avoid accidentally whole objects in YAML output
+ * Prettify comment generation
+ * Tyop fixes
+
1.60 - 2019-05-29
* No changes since 1.59_01
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/META.json
new/SQL-Translator-1.61/META.json
--- old/SQL-Translator-1.60/META.json 2019-05-29 21:35:23.000000000 +0200
+++ new/SQL-Translator-1.61/META.json 2020-04-19 17:08:13.000000000 +0200
@@ -4,13 +4,13 @@
"Ken Youens-Clark <[email protected]>"
],
"dynamic_config" : 0,
- "generated_by" : "ExtUtils::MakeMaker version 7.36, CPAN::Meta::Converter
version 2.150010",
+ "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter
version 2.150010",
"license" : [
"perl_5"
],
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
- "version" : 2
+ "version" : "2"
},
"name" : "SQL-Translator",
"no_index" : {
@@ -100,7 +100,7 @@
"x_IRC" : "irc://irc.perl.org/#sql-translator",
"x_Ratings" : "http://cpanratings.perl.org/d/SQL-Translator";
},
- "version" : "1.60",
+ "version" : "1.61",
"x_authority" : "cpan:JROBINSON",
- "x_serialization_backend" : "JSON::PP version 4.02"
+ "x_serialization_backend" : "JSON::PP version 2.27300"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/META.yml
new/SQL-Translator-1.61/META.yml
--- old/SQL-Translator-1.60/META.yml 2019-05-29 21:35:22.000000000 +0200
+++ new/SQL-Translator-1.61/META.yml 2020-04-19 17:08:13.000000000 +0200
@@ -15,7 +15,7 @@
ExtUtils::MakeMaker: '6.54'
File::ShareDir::Install: '0'
dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 7.36, CPAN::Meta::Converter version
2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version
2.150010'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -54,6 +54,6 @@
bugtracker: https://rt.cpan.org/NoAuth/Bugs.html?Dist=SQL-Translator
license: http://dev.perl.org/licenses/
repository: https://github.com/dbsrgits/sql-translator/
-version: '1.60'
+version: '1.61'
x_authority: cpan:JROBINSON
-x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.012'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Filter/DefaultExtra.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Filter/DefaultExtra.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Filter/DefaultExtra.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Filter/DefaultExtra.pm
2020-04-19 17:06:28.000000000 +0200
@@ -33,7 +33,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
sub filter {
my $schema = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Filter/Globals.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Filter/Globals.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Filter/Globals.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Filter/Globals.pm
2020-04-19 17:06:28.000000000 +0200
@@ -38,7 +38,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
sub filter {
my $schema = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Filter/Names.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Filter/Names.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Filter/Names.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Filter/Names.pm 2020-04-19
17:06:28.000000000 +0200
@@ -29,7 +29,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
sub filter {
my $schema = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Access.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Access.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Access.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Access.pm 2020-04-19
17:06:28.000000000 +0200
@@ -22,7 +22,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/DB2.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/DB2.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/DB2.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/DB2.pm
2020-04-19 17:06:28.000000000 +0200
@@ -23,7 +23,7 @@
use SQL::Translator::Schema::Constants;
our ($DEBUG, $VERSION, @EXPORT_OK );
-# $VERSION = '1.60';
+# $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
sub parse {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/MySQL.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/MySQL.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/MySQL.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/MySQL.pm
2020-04-19 17:06:28.000000000 +0200
@@ -24,7 +24,7 @@
use SQL::Translator::Parser::MySQL;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
sub parse {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/Oracle.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/Oracle.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/Oracle.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/Oracle.pm
2020-04-19 17:06:28.000000000 +0200
@@ -22,7 +22,7 @@
use SQL::Translator::Schema::Field;
use SQL::Translator::Schema::Constraint;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
sub parse {
my ( $tr, $dbh ) = @_;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/PostgreSQL.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/PostgreSQL.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/PostgreSQL.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/PostgreSQL.pm
2020-04-19 17:06:28.000000000 +0200
@@ -21,7 +21,7 @@
use SQL::Translator::Schema::Constants;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
my $actions = {c => 'cascade',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/SQLServer.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/SQLServer.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/SQLServer.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/SQLServer.pm
2020-04-19 17:06:28.000000000 +0200
@@ -21,7 +21,7 @@
use Data::Dumper;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
no strict 'refs';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/SQLite.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/SQLite.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/SQLite.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/SQLite.pm
2020-04-19 17:06:28.000000000 +0200
@@ -26,7 +26,7 @@
use Data::Dumper;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
sub parse {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/Sybase.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/Sybase.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI/Sybase.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI/Sybase.pm
2020-04-19 17:06:28.000000000 +0200
@@ -21,7 +21,7 @@
use Data::Dumper;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
no strict 'refs';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/DBI.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/DBI.pm 2020-04-19
17:06:28.000000000 +0200
@@ -102,7 +102,7 @@
use warnings;
use DBI;
our @EXPORT;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use constant DRIVERS => {
mysql => 'MySQL',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Excel.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Excel.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Excel.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Excel.pm 2020-04-19
17:06:28.000000000 +0200
@@ -32,7 +32,7 @@
use warnings;
our ($DEBUG, @EXPORT_OK);
$DEBUG = 0 unless defined $DEBUG;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use Spreadsheet::ParseExcel;
use Exporter;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/JSON.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/JSON.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/JSON.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/JSON.pm 2020-04-19
17:06:28.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use SQL::Translator::Schema;
use SQL::Translator::Utils qw(header_comment);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/MySQL.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/MySQL.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/MySQL.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/MySQL.pm 2020-04-19
17:06:28.000000000 +0200
@@ -132,7 +132,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
@@ -692,6 +692,11 @@
{
$return = $item[2];
}
+ |
+ /default/i NAME # column value, allowed in MariaDB
+ {
+ $return = $item[2];
+ }
auto_inc : /auto_increment/i { 1 }
@@ -700,8 +705,31 @@
constraint : primary_key_def
| unique_key_def
| foreign_key_def
+ | check_def
| <error>
+expr : /[^)]* \( [^)]+ \) [^)]*/x # parens, balanced one deep
+ | /[^)]+/
+
+check_def : check_def_begin '(' expr ')'
+ {
+ $return = {
+ supertype => 'constraint',
+ type => 'check',
+ name => $item[1],
+ expression => $item[3],
+ }
+ }
+
+check_def_begin : /constraint/i /check/i NAME
+ { $return = $item[3] }
+ |
+ /constraint/i NAME /check/i
+ { $return = $item[2] }
+ |
+ /constraint/i /check/i
+ { $return = '' }
+
foreign_key_def : foreign_key_def_begin parens_field_list reference_definition
{
$return = {
@@ -1017,6 +1045,7 @@
name => $cdata->{'name'},
type => $cdata->{'type'},
fields => $cdata->{'fields'},
+ expression => $cdata->{'expression'},
reference_table => $cdata->{'reference_table'},
reference_fields => $cdata->{'reference_fields'},
match_type => $cdata->{'match_type'} || '',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Oracle.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Oracle.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Oracle.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Oracle.pm 2020-04-19
17:06:28.000000000 +0200
@@ -78,7 +78,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/PostgreSQL.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/PostgreSQL.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/PostgreSQL.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/PostgreSQL.pm
2020-04-19 17:06:28.000000000 +0200
@@ -89,7 +89,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/SQLServer.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/SQLServer.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/SQLServer.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/SQLServer.pm
2020-04-19 17:06:28.000000000 +0200
@@ -19,7 +19,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/SQLite.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/SQLite.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/SQLite.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/SQLite.pm 2020-04-19
17:06:28.000000000 +0200
@@ -133,7 +133,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
@@ -477,7 +477,8 @@
parens_value_list : '(' VALUE(s /,/) ')'
{ $item[2] }
-expr : /[^)]+/
+expr : /[^)]* \( [^)]+ \) [^)]*/x # parens, balanced one deep
+ | /[^)]+/
sort_order : /(ASC|DESC)/i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Storable.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Storable.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Storable.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Storable.pm
2020-04-19 17:06:28.000000000 +0200
@@ -21,7 +21,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Sybase.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Sybase.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/Sybase.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/Sybase.pm 2020-04-19
17:06:28.000000000 +0200
@@ -20,7 +20,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/XML/SQLFairy.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/XML/SQLFairy.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/XML/SQLFairy.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/XML/SQLFairy.pm
2020-04-19 17:06:28.000000000 +0200
@@ -79,7 +79,7 @@
use warnings;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
use Data::Dumper;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/SQL/Translator/Parser/XML.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/XML.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/XML.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/XML.pm 2020-04-19
17:06:28.000000000 +0200
@@ -23,7 +23,7 @@
use strict;
use warnings;
our $DEBUG;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 1 unless defined $DEBUG;
use SQL::Translator::Parser::XML::SQLFairy;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Parser/YAML.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/YAML.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/YAML.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/YAML.pm 2020-04-19
17:06:28.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use SQL::Translator::Schema;
use SQL::Translator::Utils qw(header_comment);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/SQL/Translator/Parser/xSV.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser/xSV.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser/xSV.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser/xSV.pm 2020-04-19
17:06:28.000000000 +0200
@@ -46,7 +46,7 @@
use strict;
use warnings;
our @EXPORT;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use Exporter;
use Text::ParseWords qw(quotewords);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/SQL/Translator/Parser.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Parser.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Parser.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Parser.pm 2020-04-19
17:06:28.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
sub parse { "" }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/ClassDBI.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/ClassDBI.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/ClassDBI.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/ClassDBI.pm
2020-04-19 17:06:28.000000000 +0200
@@ -3,7 +3,7 @@
use strict;
use warnings;
our $DEBUG;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 1 unless defined $DEBUG;
use SQL::Translator::Schema::Constants;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/DB2.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/DB2.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/DB2.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/DB2.pm 2020-04-19
17:06:28.000000000 +0200
@@ -21,7 +21,7 @@
use strict;
use warnings;
our ( $DEBUG, $WARN );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
use SQL::Translator::Schema::Constants;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/DiaUml.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/DiaUml.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/DiaUml.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/DiaUml.pm
2020-04-19 17:06:28.000000000 +0200
@@ -34,7 +34,7 @@
use warnings;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
use File::ShareDir qw/dist_dir/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Diagram.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Diagram.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Diagram.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Diagram.pm
2020-04-19 17:06:28.000000000 +0200
@@ -47,7 +47,7 @@
use SQL::Translator::Utils qw(debug);
our $DEBUG;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
use constant VALID_FONT_SIZE => {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Dumper.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Dumper.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Dumper.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Dumper.pm
2020-04-19 17:06:28.000000000 +0200
@@ -41,7 +41,7 @@
use Data::Dumper;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
sub produce {
my $t = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/GraphViz.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/GraphViz.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/GraphViz.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/GraphViz.pm
2020-04-19 17:06:28.000000000 +0200
@@ -230,7 +230,7 @@
use Scalar::Util qw/openhandle/;
our $DEBUG;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
sub produce {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/HTML.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/HTML.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/HTML.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/HTML.pm 2020-04-19
17:06:28.000000000 +0200
@@ -4,7 +4,7 @@
use warnings;
use Data::Dumper;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our $NAME = __PACKAGE__;
our $NOWRAP = 0 unless defined $NOWRAP;
our $NOLINKTABLE = 0 unless defined $NOLINKTABLE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/JSON.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/JSON.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/JSON.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/JSON.pm 2020-04-19
17:06:28.000000000 +0200
@@ -18,7 +18,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use JSON::MaybeXS 'to_json';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Latex.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Latex.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Latex.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Latex.pm
2020-04-19 17:06:28.000000000 +0200
@@ -34,7 +34,7 @@
use warnings;
our @EXPORT_OK;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use SQL::Translator::Utils 'debug';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/MySQL.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/MySQL.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/MySQL.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/MySQL.pm
2020-04-19 17:06:28.000000000 +0200
@@ -82,7 +82,7 @@
use strict;
use warnings;
our ( $DEBUG, %used_names );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
# Maximum length for most identifiers is 64, according to:
@@ -716,7 +716,7 @@
push @out, $c->type;
}
else {
- push @out, ($c->type eq FOREIGN_KEY ? $c->type : "INDEX"),
+ push @out, ($c->type eq FOREIGN_KEY ? $c->type : "CONSTRAINT"),
$generator->quote($c->name);
}
return join(' ',@out);
@@ -743,12 +743,14 @@
my $reference_table_name = $generator->quote($c->reference_table);
- my @fields = $c->fields or return;
+ my @fields = $c->fields;
if ( $c->type eq PRIMARY_KEY ) {
+ return unless @fields;
return 'PRIMARY KEY (' . join(", ", map { $generator->quote($_) }
@fields) . ')';
}
elsif ( $c->type eq UNIQUE ) {
+ return unless @fields;
return sprintf 'UNIQUE %s(%s)',
((defined $c->name && $c->name)
? $generator->quote(
@@ -760,6 +762,7 @@
;
}
elsif ( $c->type eq FOREIGN_KEY ) {
+ return unless @fields;
#
# Make sure FK field is indexed or MySQL complains.
#
@@ -813,6 +816,20 @@
}
return $def;
}
+ elsif ( $c->type eq CHECK_C ) {
+ my $table = $c->table;
+ my $c_name = truncate_id_uniquely( $c->name, $options->{max_id_length}
|| $DEFAULT_MAX_ID_LENGTH );
+
+ my $def = join(' ',
+ 'CONSTRAINT',
+ ($c_name ? $generator->quote($c_name) : () ),
+ 'CHECK'
+ );
+
+
+ $def .= ' ('. $c->expression . ')';
+ return $def;
+ }
return undef;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Oracle.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Oracle.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Oracle.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Oracle.pm
2020-04-19 17:06:28.000000000 +0200
@@ -90,7 +90,7 @@
use strict;
use warnings;
our ( $DEBUG, $WARN );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
use base 'SQL::Translator::Producer';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/POD.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/POD.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/POD.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/POD.pm 2020-04-19
17:06:28.000000000 +0200
@@ -22,7 +22,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use SQL::Translator::Schema::Constants;
use SQL::Translator::Utils qw(header_comment);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/PostgreSQL.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/PostgreSQL.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/PostgreSQL.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/PostgreSQL.pm
2020-04-19 17:06:28.000000000 +0200
@@ -22,7 +22,7 @@
use strict;
use warnings;
our ( $DEBUG, $WARN );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
use base qw(SQL::Translator::Producer);
@@ -785,7 +785,7 @@
# ALTER TABLE users ALTER COLUMN column SET DEFAULT ThisIsUnescaped;
if(ref $default_value eq "SCALAR" ) {
$default_value = $$default_value;
- } elsif( defined $default_value && $to_dt =~ /^(character|text)/xsmi ) {
+ } elsif( defined $default_value && $to_dt =~
/^(character|text|timestamp|date)/xsmi ) {
$default_value = __PACKAGE__->_quote_string($default_value);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/SQLServer.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/SQLServer.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/SQLServer.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/SQLServer.pm
2020-04-19 17:06:28.000000000 +0200
@@ -3,7 +3,7 @@
use strict;
use warnings;
our ( $DEBUG, $WARN );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 1 unless defined $DEBUG;
use SQL::Translator::Schema::Constants;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/SQLite.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/SQLite.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/SQLite.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/SQLite.pm
2020-04-19 17:06:28.000000000 +0200
@@ -25,7 +25,7 @@
use SQL::Translator::Generator::DDL::SQLite;
our ( $DEBUG, $WARN );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
$WARN = 0 unless defined $WARN;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Storable.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Storable.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Storable.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Storable.pm
2020-04-19 17:06:28.000000000 +0200
@@ -25,7 +25,7 @@
use warnings;
our ( $DEBUG, @EXPORT_OK );
$DEBUG = 0 unless defined $DEBUG;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use Storable;
use Exporter;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Sybase.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Sybase.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/Sybase.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/Sybase.pm
2020-04-19 17:06:28.000000000 +0200
@@ -20,7 +20,7 @@
use strict;
use warnings;
our ( $DEBUG, $WARN );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 1 unless defined $DEBUG;
use Data::Dumper;
@@ -123,8 +123,10 @@
my $add_drop_table = $translator->add_drop_table;
my $schema = $translator->schema;
- my $output;
- $output .= header_comment unless ($no_comments);
+ my @output;
+ push @output, header_comment unless ($no_comments);
+
+ my @foreign_keys;
for my $table ( $schema->get_tables ) {
my $table_name = $table->name or next;
@@ -163,6 +165,8 @@
my $commalist = join( ', ', map { qq['$_'] } @$list );
my $seq_name;
+ my $identity = '';
+
if ( $data_type eq 'enum' ) {
my $check_name = mk_name(
$table_name.'_'.$field_name, 'chk' ,undef, 1
@@ -174,10 +178,10 @@
elsif ( $data_type eq 'set' ) {
$data_type .= 'character varying';
}
- elsif ( $field->is_auto_increment ) {
- $field_def .= ' IDENTITY';
- }
else {
+ if ( $field->is_auto_increment ) {
+ $identity = 'IDENTITY';
+ }
if ( defined $translate{ $data_type } ) {
$data_type = $translate{ $data_type };
}
@@ -209,6 +213,7 @@
$field_def .= " $data_type";
$field_def .= "($size)" if $size;
+ $field_def .= " $identity" if $identity;
#
# Default value
@@ -257,8 +262,8 @@
}
elsif ( $type eq FOREIGN_KEY ) {
$name ||= mk_name( $table_name, 'fk', undef,1 );
- push @constraint_defs,
- "CONSTRAINT $name FOREIGN KEY".
+ push @foreign_keys,
+ "ALTER TABLE $table ADD CONSTRAINT $name FOREIGN KEY".
' (' . join( ', ', @fields ) . ') REFERENCES '.
$constraint->reference_table.
' (' . join( ', ', @rfields ) . ')';
@@ -281,25 +286,23 @@
push @index_defs,
'CREATE INDEX ' . $index->name .
" ON $table_name (".
- join( ', ', $index->fields ) . ");";
+ join( ', ', $index->fields ) . ")";
}
- my $create_statement;
- $create_statement = qq[DROP TABLE $table_name_ur;\n]
- if $add_drop_table;
- $create_statement .= qq[CREATE TABLE $table_name_ur (\n].
+ my $drop_statement = $add_drop_table
+ ? qq[DROP TABLE $table_name_ur] : '';
+ my $create_statement = qq[CREATE TABLE $table_name_ur (\n].
join( ",\n",
map { " $_" } @field_defs, @constraint_defs
).
- "\n);"
+ "\n)"
;
- $output .= join( "\n\n",
- @comments,
+ $create_statement = join("\n\n", @comments) . "\n\n" .
$create_statement;
+ push @output,
$create_statement,
@index_defs,
- ''
- );
+ ;
}
foreach my $view ( $schema->get_views ) {
@@ -311,7 +314,7 @@
# text of view is already a 'create view' statement so no need
# to do anything fancy.
- $output .= join("\n\n",
+ push @output, join("\n\n",
@comments,
$view->sql(),
);
@@ -330,11 +333,12 @@
# think about doing fancy stuff with granting permissions and
# so on.
- $output .= join("\n\n",
+ push @output, join("\n\n",
@comments,
$procedure->sql(),
);
}
+ push @output, @foreign_keys;
if ( $WARN ) {
if ( %truncated ) {
@@ -349,7 +353,7 @@
}
}
- return $output;
+ return wantarray ? @output : join ";\n\n", @output;
}
sub mk_name {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/TT/Base.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/TT/Base.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/TT/Base.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/TT/Base.pm
2020-04-19 17:06:28.000000000 +0200
@@ -13,7 +13,7 @@
use warnings;
our @EXPORT_OK;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use Template;
use Data::Dumper;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/TT/Table.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/TT/Table.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/TT/Table.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/TT/Table.pm
2020-04-19 17:06:28.000000000 +0200
@@ -157,7 +157,7 @@
use warnings;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
use File::Path;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/TTSchema.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/TTSchema.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/TTSchema.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/TTSchema.pm
2020-04-19 17:06:28.000000000 +0200
@@ -110,7 +110,7 @@
use warnings;
our ( $DEBUG, @EXPORT_OK );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 0 unless defined $DEBUG;
use Template;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/XML/SQLFairy.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/XML/SQLFairy.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/XML/SQLFairy.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/XML/SQLFairy.pm
2020-04-19 17:06:28.000000000 +0200
@@ -143,7 +143,7 @@
use strict;
use warnings;
our @EXPORT_OK;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use Exporter;
use base qw(Exporter);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/XML.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/XML.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/XML.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/XML.pm 2020-04-19
17:06:28.000000000 +0200
@@ -25,7 +25,7 @@
use strict;
use warnings;
our $DEBUG;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$DEBUG = 1 unless defined $DEBUG;
use SQL::Translator::Producer::XML::SQLFairy;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Producer/YAML.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer/YAML.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer/YAML.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer/YAML.pm 2020-04-19
17:06:29.000000000 +0200
@@ -21,7 +21,7 @@
use strict;
use warnings;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
use YAML qw(Dump);
@@ -173,7 +173,7 @@
return {
'name' => scalar $index->name,
'type' => scalar $index->type,
- 'fields' => scalar $index->fields,
+ 'fields' => [ map { ref($_) ? $_->name : $_ } $index->fields ],
'options' => scalar $index->options,
keys %{$index->extra} ? ('extra' => { $index->extra } ) : (),
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/SQL/Translator/Producer.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Producer.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Producer.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Producer.pm 2020-04-19
17:06:28.000000000 +0200
@@ -3,7 +3,7 @@
use strict;
use warnings;
use Scalar::Util ();
-our $VERSION = '1.60';
+our $VERSION = '1.61';
sub produce { "" }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Constants.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Constants.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Constants.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Constants.pm
2020-04-19 17:06:29.000000000 +0200
@@ -43,7 +43,7 @@
use warnings;
use base qw( Exporter );
require Exporter;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our @EXPORT = qw[
CHECK_C
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Constraint.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Constraint.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Constraint.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Constraint.pm
2020-04-19 17:06:29.000000000 +0200
@@ -32,7 +32,7 @@
extends 'SQL::Translator::Schema::Object';
-our $VERSION = '1.60';
+our $VERSION = '1.61';
my %VALID_CONSTRAINT_TYPE = (
PRIMARY_KEY, 1,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Field.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Field.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Field.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Field.pm 2020-04-19
17:06:29.000000000 +0200
@@ -31,7 +31,7 @@
extends 'SQL::Translator::Schema::Object';
-our $VERSION = '1.60';
+our $VERSION = '1.61';
# Stringify to our name, being careful not to pass any args through so we don't
# accidentally set it to undef. We also have to tweak bool so the object is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Index.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Index.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Index.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Index.pm 2020-04-19
17:06:29.000000000 +0200
@@ -34,7 +34,7 @@
extends 'SQL::Translator::Schema::Object';
-our $VERSION = '1.60';
+our $VERSION = '1.61';
my %VALID_INDEX_TYPE = (
UNIQUE => 1,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Object.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Object.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Object.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Object.pm 2020-04-19
17:06:29.000000000 +0200
@@ -41,7 +41,7 @@
use Moo 1.000003;
# screw you PAUSE
-our $VERSION = '1.60';
+our $VERSION = '1.61';
with qw(
SQL::Translator::Role::Error
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Procedure.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Procedure.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Procedure.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Procedure.pm
2020-04-19 17:06:29.000000000 +0200
@@ -35,7 +35,7 @@
extends 'SQL::Translator::Schema::Object';
-our $VERSION = '1.60';
+our $VERSION = '1.61';
=head2 new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Table.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Table.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Table.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Table.pm 2020-04-19
17:06:29.000000000 +0200
@@ -34,7 +34,7 @@
extends 'SQL::Translator::Schema::Object';
-our $VERSION = '1.60';
+our $VERSION = '1.61';
# Stringify to our name, being careful not to pass any args through so we don't
# accidentally set it to undef. We also have to tweak bool so the object is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Trigger.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Trigger.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/Trigger.pm
2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/Trigger.pm
2020-04-19 17:06:29.000000000 +0200
@@ -35,7 +35,7 @@
extends 'SQL::Translator::Schema::Object';
-our $VERSION = '1.60';
+our $VERSION = '1.61';
=head2 new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/SQL-Translator-1.60/lib/SQL/Translator/Schema/View.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema/View.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema/View.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema/View.pm 2020-04-19
17:06:29.000000000 +0200
@@ -31,7 +31,7 @@
extends 'SQL::Translator::Schema::Object';
-our $VERSION = '1.60';
+our $VERSION = '1.61';
=head2 new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/SQL/Translator/Schema.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Schema.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Schema.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Schema.pm 2020-04-19
17:06:29.000000000 +0200
@@ -39,7 +39,7 @@
extends 'SQL::Translator::Schema::Object';
-our $VERSION = '1.60';
+our $VERSION = '1.61';
has _order => (is => 'ro', default => quote_sub(q{ +{ map { $_ => 0 } qw/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/SQL/Translator/Utils.pm
new/SQL-Translator-1.61/lib/SQL/Translator/Utils.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator/Utils.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator/Utils.pm 2020-04-19
17:06:29.000000000 +0200
@@ -8,8 +8,7 @@
use Try::Tiny;
use Carp qw(carp croak);
-our $VERSION = '1.60';
-our $DEFAULT_COMMENT = '-- ';
+our $VERSION = '1.61';
use base qw(Exporter);
our @EXPORT_OK = qw(
@@ -21,6 +20,8 @@
);
use constant COLLISION_TAG_LENGTH => 8;
+our $DEFAULT_COMMENT = '--';
+
sub debug {
my ($pkg, $file, $line, $sub) = caller(0);
{
@@ -111,14 +112,14 @@
my $header_comment =<<"HEADER_COMMENT";
${comment_char}
-${comment_char}Created by $producer
-${comment_char}Created on $now
+${comment_char} Created by $producer
+${comment_char} Created on $now
${comment_char}
HEADER_COMMENT
# Any additional stuff passed in
for my $additional_comment (@_) {
- $header_comment .= "${comment_char}${additional_comment}\n";
+ $header_comment .= "${comment_char} ${additional_comment}\n";
}
return $header_comment;
@@ -547,7 +548,7 @@
=head2 $DEFAULT_COMMENT
-This is the default comment string, '-- ' by default. Useful for
+This is the default comment string, '--' by default. Useful for
C<header_comment>.
=head2 parse_mysql_version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/SQL/Translator.pm
new/SQL-Translator-1.61/lib/SQL/Translator.pm
--- old/SQL-Translator-1.60/lib/SQL/Translator.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/SQL/Translator.pm 2020-04-19
17:06:28.000000000 +0200
@@ -3,7 +3,7 @@
use Moo;
our ( $DEFAULT_SUB, $DEBUG, $ERROR );
-our $VERSION = '1.60';
+our $VERSION = '1.61';
$VERSION =~ tr/_//d;
$DEBUG = 0 unless defined $DEBUG;
$ERROR = "";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/lib/Test/SQL/Translator.pm
new/SQL-Translator-1.61/lib/Test/SQL/Translator.pm
--- old/SQL-Translator-1.60/lib/Test/SQL/Translator.pm 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/lib/Test/SQL/Translator.pm 2020-04-19
17:06:29.000000000 +0200
@@ -15,7 +15,7 @@
use base qw(Exporter);
our @EXPORT_OK;
-our $VERSION = '1.60';
+our $VERSION = '1.61';
our @EXPORT = qw(
schema_ok
table_ok
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/script/sqlt
new/SQL-Translator-1.61/script/sqlt
--- old/SQL-Translator-1.60/script/sqlt 2019-05-29 20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/script/sqlt 2020-04-19 17:06:29.000000000 +0200
@@ -87,7 +87,7 @@
--add-drop-table Add 'DROP TABLE' statements before creates
--quote-table-names Quote all table names in statements
- --quote-field-names Qjuote all field names in statements
+ --quote-field-names Quote all field names in statements
--no-comments Don't include comments in SQL output
PostgreSQL Producer Options:
@@ -153,7 +153,7 @@
use SQL::Translator;
use vars qw( $VERSION );
-$VERSION = '1.60';
+$VERSION = '1.61';
my $from; # the original database
my $to; # the destination database
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/script/sqlt-diagram
new/SQL-Translator-1.61/script/sqlt-diagram
--- old/SQL-Translator-1.60/script/sqlt-diagram 2019-05-29 20:32:24.000000000
+0200
+++ new/SQL-Translator-1.61/script/sqlt-diagram 2020-04-19 17:06:29.000000000
+0200
@@ -77,7 +77,7 @@
use SQL::Translator;
use vars '$VERSION';
-$VERSION = '1.60';
+$VERSION = '1.61';
#
# Get arguments.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/script/sqlt-diff
new/SQL-Translator-1.61/script/sqlt-diff
--- old/SQL-Translator-1.60/script/sqlt-diff 2019-05-29 20:32:24.000000000
+0200
+++ new/SQL-Translator-1.61/script/sqlt-diff 2020-04-19 17:06:29.000000000
+0200
@@ -114,7 +114,7 @@
use SQL::Translator::Schema::Constants;
use vars qw( $VERSION );
-$VERSION = '1.60';
+$VERSION = '1.61';
my ( @input, $list, $help, $debug, $trace, $caseopt, $ignore_index_names,
$ignore_constraint_names, $output_db, $mysql_parser_version,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/script/sqlt-diff-old
new/SQL-Translator-1.61/script/sqlt-diff-old
--- old/SQL-Translator-1.60/script/sqlt-diff-old 2019-05-29
20:32:24.000000000 +0200
+++ new/SQL-Translator-1.61/script/sqlt-diff-old 2020-04-19
17:06:29.000000000 +0200
@@ -96,7 +96,7 @@
use SQL::Translator::Schema::Constants;
use vars qw( $VERSION );
-$VERSION = '1.60';
+$VERSION = '1.61';
my ( @input, $list, $help, $debug );
for my $arg ( @ARGV ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/script/sqlt-dumper
new/SQL-Translator-1.61/script/sqlt-dumper
--- old/SQL-Translator-1.60/script/sqlt-dumper 2019-05-29 20:32:24.000000000
+0200
+++ new/SQL-Translator-1.61/script/sqlt-dumper 2020-04-19 17:06:29.000000000
+0200
@@ -63,7 +63,7 @@
use File::Basename qw(basename);
use vars '$VERSION';
-$VERSION = '1.60';
+$VERSION = '1.61';
my ( $help, $db, $skip, $skiplike, $db_user, $db_pass, $dsn );
GetOptions(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/script/sqlt-graph
new/SQL-Translator-1.61/script/sqlt-graph
--- old/SQL-Translator-1.60/script/sqlt-graph 2019-05-29 20:32:24.000000000
+0200
+++ new/SQL-Translator-1.61/script/sqlt-graph 2020-04-19 17:06:29.000000000
+0200
@@ -108,7 +108,7 @@
use SQL::Translator;
use vars '$VERSION';
-$VERSION = '1.60';
+$VERSION = '1.61';
#
# Get arguments.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/script/sqlt.cgi
new/SQL-Translator-1.61/script/sqlt.cgi
--- old/SQL-Translator-1.60/script/sqlt.cgi 2019-05-29 20:32:24.000000000
+0200
+++ new/SQL-Translator-1.61/script/sqlt.cgi 2020-04-19 17:06:29.000000000
+0200
@@ -38,7 +38,7 @@
use SQL::Translator;
use vars '$VERSION';
-$VERSION = '1.60';
+$VERSION = '1.61';
my $q = CGI->new;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/t/12header_comment.t
new/SQL-Translator-1.61/t/12header_comment.t
--- old/SQL-Translator-1.60/t/12header_comment.t 2014-06-27
23:32:37.000000000 +0200
+++ new/SQL-Translator-1.61/t/12header_comment.t 2020-04-19
17:06:29.000000000 +0200
@@ -8,7 +8,7 @@
# Superfluous test, but that's ok
use_ok("SQL::Translator::Utils");
-is($DEFAULT_COMMENT, '-- ', 'default comment');
+is($DEFAULT_COMMENT, '--', 'default comment');
like(header_comment("foo"), qr/[-][-] Created by foo/, "Created by...");
my $comm = header_comment("My::Producer",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/t/17sqlfxml-producer.t
new/SQL-Translator-1.61/t/17sqlfxml-producer.t
--- old/SQL-Translator-1.60/t/17sqlfxml-producer.t 2018-01-27
22:47:20.000000000 +0100
+++ new/SQL-Translator-1.61/t/17sqlfxml-producer.t 2020-04-06
23:26:39.000000000 +0200
@@ -48,7 +48,7 @@
my ($got, $expect, $msg) = (@_, "XML looks right");
$got =~ s/^ +//gm;
$expect =~ s/^ +//gm;
- eq_or_diff $got, $expect, $msg;
+ eq_or_diff $got, $expect, $msg, { context => 1 };
}
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/t/30sqlt-new-diff-mysql.t
new/SQL-Translator-1.61/t/30sqlt-new-diff-mysql.t
--- old/SQL-Translator-1.60/t/30sqlt-new-diff-mysql.t 2015-06-28
15:49:25.000000000 +0200
+++ new/SQL-Translator-1.61/t/30sqlt-new-diff-mysql.t 2020-04-06
23:26:39.000000000 +0200
@@ -19,7 +19,7 @@
my $tr = SQL::Translator->new;
-my ( $source_schema, $target_schema, $parsed_sql_schema ) = map {
+my ( $source_schema, $target_schema ) = map {
my $t = SQL::Translator->new;
$t->parser( 'YAML' )
or die $tr->error;
@@ -47,7 +47,7 @@
my $out = join('', @out);
-eq_or_diff($out, <<'## END OF DIFF', "Diff as expected");
+eq_or_diff($out, <<'## END OF DIFF', "Diff as expected", { context => 1 });
-- Convert schema 'create1.yml' to 'create2.yml':;
BEGIN;
@@ -64,7 +64,7 @@
ALTER TABLE employee DROP FOREIGN KEY FK5302D47D93FE702E;
-ALTER TABLE person DROP INDEX UC_age_name;
+ALTER TABLE person DROP CONSTRAINT UC_age_name;
ALTER TABLE person DROP INDEX u_name;
@@ -109,7 +109,7 @@
producer_args => { quote_identifiers => 0 },
});
-eq_or_diff($out, <<'## END OF DIFF', "Diff as expected");
+eq_or_diff($out, <<'## END OF DIFF', "Diff as expected", { context => 1 });
-- Convert schema 'create1.yml' to 'create2.yml':;
BEGIN;
@@ -127,7 +127,7 @@
ALTER TABLE old_name RENAME TO new_name,
ADD COLUMN new_field integer NULL;
-ALTER TABLE person DROP INDEX UC_age_name,
+ALTER TABLE person DROP CONSTRAINT UC_age_name,
ADD COLUMN is_rock_star tinyint(4) NULL DEFAULT 1,
CHANGE COLUMN person_id person_id integer(11) NOT NULL
auto_increment,
CHANGE COLUMN name name varchar(20) NOT NULL,
@@ -151,7 +151,7 @@
# Test for sameness
$out = SQL::Translator::Diff::schema_diff($source_schema, 'MySQL',
$source_schema, 'MySQL' );
-eq_or_diff($out, <<'## END OF DIFF', "No differences found");
+eq_or_diff($out, <<'## END OF DIFF', "No differences found", { context => 1 });
-- Convert schema 'create1.yml' to 'create1.yml':;
-- No differences found;
@@ -179,7 +179,7 @@
$field->data_type('integer');
$field->size(0);
$out = SQL::Translator::Diff::schema_diff($schema, 'MySQL', $target_schema,
'MySQL', { producer_args => { quote_identifiers => 0 } } );
- eq_or_diff($out, <<'## END OF DIFF', "No differences found");
+ eq_or_diff($out, <<'## END OF DIFF', "No differences found", { context => 1
});
-- Convert schema 'create.sql' to 'create2.yml':;
BEGIN;
@@ -193,10 +193,11 @@
SET foreign_key_checks=1;
ALTER TABLE employee DROP FOREIGN KEY FK5302D47D93FE702E,
+ DROP CONSTRAINT demo_constraint,
DROP COLUMN job_title,
ADD CONSTRAINT FK5302D47D93FE702E_diff FOREIGN KEY
(employee_id) REFERENCES person (person_id);
-ALTER TABLE person DROP INDEX UC_age_name,
+ALTER TABLE person DROP CONSTRAINT UC_age_name,
DROP INDEX u_name,
ADD COLUMN is_rock_star tinyint(4) NULL DEFAULT 1,
ADD COLUMN value double(8, 2) NULL DEFAULT 0.00,
@@ -251,7 +252,7 @@
my $out = SQL::Translator::Diff::schema_diff($s1, 'MySQL', $s2, 'MySQL' );
- eq_or_diff($out, <<'## END OF DIFF', "Batch alter of constraints work for
InnoDB");
+ eq_or_diff($out, <<'## END OF DIFF', "Batch alter of constraints work for
InnoDB", { context => 1 });
-- Convert schema 'Schema 1' to 'Schema 2':;
BEGIN;
@@ -302,7 +303,7 @@
);
my $out = SQL::Translator::Diff::schema_diff($s1, 'MySQL', $s2, 'MySQL' );
- eq_or_diff($out, <<'## END OF DIFF', "Alter/drop constraints works with
rename table");
+ eq_or_diff($out, <<'## END OF DIFF', "Alter/drop constraints works with
rename table", { context => 1 });
-- Convert schema 'Schema 3' to 'Schema 4':;
BEGIN;
@@ -324,7 +325,7 @@
$out = SQL::Translator::Diff::schema_diff($s1, 'MySQL', $s2, 'MySQL',
{ producer_args => { quote_identifiers => 1 } }
);
- eq_or_diff($out, <<'## END OF DIFF', "Quoting can be turned on");
+ eq_or_diff($out, <<'## END OF DIFF', "Quoting can be turned on", { context
=> 1 });
-- Convert schema 'Schema 3' to 'Schema 4':;
BEGIN;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/t/30sqlt-new-diff-pgsql.t
new/SQL-Translator-1.61/t/30sqlt-new-diff-pgsql.t
--- old/SQL-Translator-1.60/t/30sqlt-new-diff-pgsql.t 2015-09-09
13:24:52.000000000 +0200
+++ new/SQL-Translator-1.61/t/30sqlt-new-diff-pgsql.t 2020-04-06
23:26:39.000000000 +0200
@@ -19,7 +19,7 @@
my $tr = SQL::Translator->new;
-my ( $source_schema, $target_schema, $parsed_sql_schema ) = map {
+my ( $source_schema, $target_schema ) = map {
my $t = SQL::Translator->new;
$t->parser( 'YAML' )
or die $tr->error;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/t/data/mysql/create.sql
new/SQL-Translator-1.61/t/data/mysql/create.sql
--- old/SQL-Translator-1.60/t/data/mysql/create.sql 2014-06-27
23:32:37.000000000 +0200
+++ new/SQL-Translator-1.61/t/data/mysql/create.sql 2020-04-06
23:26:39.000000000 +0200
@@ -4,18 +4,19 @@
age integer,
weight double(11,2),
iq tinyint default '0',
- description text,
+ description text default `name`,
UNIQUE KEY UC_age_name (age)
) ENGINE=MyISAM;
create unique index u_name on person (name);
create table employee (
- position varchar(50),
- employee_id integer,
+ position varchar(50),
+ employee_id integer,
job_title varchar(255),
- CONSTRAINT FK5302D47D93FE702E FOREIGN KEY (employee_id) REFERENCES
person (person_id),
- PRIMARY KEY (position, employee_id) USING BTREE
+ CONSTRAINT FK5302D47D93FE702E FOREIGN KEY (employee_id) REFERENCES person
(person_id),
+ CONSTRAINT `demo_constraint` CHECK (`employee_id` > 0 and `employee_id` IS
NOT NULL),
+ PRIMARY KEY (position, employee_id) USING BTREE
) ENGINE=InnoDB;
create table deleted (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/t/data/mysql/create2.sql
new/SQL-Translator-1.61/t/data/mysql/create2.sql
--- old/SQL-Translator-1.60/t/data/mysql/create2.sql 2014-06-27
23:32:37.000000000 +0200
+++ new/SQL-Translator-1.61/t/data/mysql/create2.sql 2020-04-06
23:26:39.000000000 +0200
@@ -16,6 +16,7 @@
position varchar(50),
employee_id INTEGER,
CONSTRAINT FK5302D47D93FE702E_diff FOREIGN KEY (employee_id) REFERENCES
person (person_id),
+ CONSTRAINT `demo_constraint` CHECK (`employee_id` > 0 and `employee_id`
IS NOT NULL and `employee_id` not in (0)),
PRIMARY KEY (employee_id, position)
) ENGINE=InnoDB;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/t/data/roundtrip_autogen.yaml
new/SQL-Translator-1.61/t/data/roundtrip_autogen.yaml
--- old/SQL-Translator-1.60/t/data/roundtrip_autogen.yaml 2019-05-29
21:33:30.000000000 +0200
+++ new/SQL-Translator-1.61/t/data/roundtrip_autogen.yaml 2020-04-06
23:31:02.000000000 +0200
@@ -336,4 +336,4 @@
producer_type: SQL::Translator::Producer::YAML
show_warnings: 0
trace: 0
- version: 1.60
+ version: 1.61
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SQL-Translator-1.60/t/data/sqlite/named.sql
new/SQL-Translator-1.61/t/data/sqlite/named.sql
--- old/SQL-Translator-1.60/t/data/sqlite/named.sql 2014-06-27
23:32:37.000000000 +0200
+++ new/SQL-Translator-1.61/t/data/sqlite/named.sql 2020-04-06
23:26:39.000000000 +0200
@@ -8,6 +8,6 @@
constraint fk_person_id_3 references person(person_id) on update NO ACTION,
"name" varchar(30),
"age" int,
- constraint age_under_100 check ( age < 100 ),
+ constraint age_under_100 check ( age < 100 and age not in (101, 102) ),
constraint pk_pet primary key (pet_id, person_id)
);
