Merge pull request #116

Miscellaneous fixes in tests

Author: pali

.travis.yml

@@ -26,6 +26,8 @@ perl:
   - "5.24"
   - "5.24-shrplib"
   - "5.26"
+  - "5.26-shrplib"
+  - "5.28"
 
 matrix:
   include:
@@ -264,6 +266,8 @@ matrix:
       env: DB=MariaDB VERSION=10.3.10
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.3.11
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.4.0
     - perl: "5.22"
       env: CONC_DB=MySQL CONC_VERSION=6.0.0-beta
     - perl: "5.22"
@@ -377,7 +381,7 @@ before_install:
     elif [ "$DB" = "MariaDB" ]; then
       case "$VERSION" in
         5.*|10.[012].*)   SANDBOX_URL=https://downloads.mariadb.com/MariaDB/mariadb-$VERSION/bintar-linux-x86_64/mariadb-$VERSION-linux-x86_64.tar.gz ;;
-        10.3.*)           SANDBOX_URL=https://downloads.mariadb.com/MariaDB/mariadb-$VERSION/bintar-linux-glibc_214-x86_64/mariadb-$VERSION-linux-glibc_214-x86_64.tar.gz ;;
+        10.[34].*)        SANDBOX_URL=https://downloads.mariadb.com/MariaDB/mariadb-$VERSION/bintar-linux-glibc_214-x86_64/mariadb-$VERSION-linux-glibc_214-x86_64.tar.gz ;;
         *)                echo "Unsupported MariaDB version '$VERSION'"; exit 1 ;;
       esac ;
       SANDBOX_CACHE_FILE="$HOME/cache/$(basename "$SANDBOX_URL")" ;

MANIFEST

@@ -12,7 +12,7 @@ MANIFEST.SKIP
 MariaDB.xs
 README.pod
 socket.c
-testrules.yml
+t/testrules.yml
 t/00base.t
 t/05dbcreate.t
 t/10connect.t

Makefile.PL

@@ -409,6 +409,7 @@ if (eval { ExtUtils::MakeMaker->VERSION(5.43) }) {
           recommends => {
             'Proc::ProcessTable' => 0,
             'TAP::Harness' => '3.31',
+            'CPAN::Meta::YAML' => 0,
           },
           suggests => {
             'Storable' => 0,

lib/DBD/MariaDB.pod

@@ -32,7 +32,7 @@ DBD::MariaDB - MariaDB and MySQL driver for the Perl5 Database Interface (DBI)
   # Connect to the database.
   my $dbh = DBI->connect('DBI:MariaDB:database=test;host=localhost',
                          'joe', q(joe's password),
-                         {'RaiseError' => 1});
+                         { RaiseError => 1, PrintError => 0 });
 
   # Drop table 'foo'. This may fail, if 'foo' doesn't exist
   # Thus we put an eval around it.
@@ -83,7 +83,8 @@ types of objects are available: database handles and statement handles. Perl
 returns a database handle to the connect method like so:
 
   my $dbh = DBI->connect("DBI:MariaDB:database=$db;host=$host",
-                         $user, $password, {RaiseError => 1});
+                         $user, $password,
+                         { RaiseError => 1, PrintError => 0 });
 
 Once you have connected to a database, you can execute SQL statements with:
 
@@ -366,7 +367,7 @@ I<mariadb_server_prepare> in the connect:
       'DBI:MariaDB:database=test;host=localhost;mariadb_server_prepare=1',
       'user',
       'password',
-      { RaiseError => 1, AutoCommit => 1 },
+      { RaiseError => 1, PrintError => 0 },
   );
 
 or:
@@ -375,7 +376,7 @@ or:
       'DBI:MariaDB:database=test;host=localhost',
       'user',
       'password',
-      { RaiseError => 1, AutoCommit => 1, mariadb_server_prepare => 1 },
+      { RaiseError => 1, PrintError => 0, mariadb_server_prepare => 1 },
   );
 
 There are many benefits to using server side prepare statements, mostly if you

t/05dbcreate.t

@@ -32,11 +32,11 @@ sub fatal_error {
 }
 
 sub connect_to_server {
-    return eval { DBI->connect($test_dsn_without_db, $test_user, $test_password, { RaiseError => 1, PrintError => 0, AutoCommit => 1 }) };
+    return eval { DBI->connect($test_dsn_without_db, $test_user, $test_password, { RaiseError => 1, PrintError => 0 }) };
 }
 
 sub connect_to_database {
-    return eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0, AutoCommit => 1 }) };
+    return eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0 }) };
 }
 
 my $dbh = connect_to_database();

t/10connect.t

@@ -10,7 +10,7 @@ use vars qw($test_dsn $test_user $test_password);
 use lib 't', '.';
 require 'lib.pl';
 
-my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 1, AutoCommit => 0 }) };
+my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0, AutoCommit => 0 }) };
 if (not defined $dbh) {
     my $err = $@;
     $err = "unknown error" unless $err;
@@ -92,22 +92,30 @@ foreach (sort keys %{$info_hashref}) {
     diag("$_ is: ". $info_hashref->{$_});
 }
 
-ok($dbh->disconnect(), 'Disconnected');
+SKIP: {
+
+skip $dbh->errstr(), 2 unless eval { $dbh->do('SHOW GRANTS') };
+skip 'Server accepts connections with invalid user/password', 2
+  if eval { DBI->connect($test_dsn, '4yZ73s9qeECdWi', '64heUGwAsVoNqo', { RaiseError => 1, PrintError => 0 }) };
 
 # dbi docs state:
 # The username and password can also be specified using the attributes
 # Username and Password, in which case they take precedence over the $username
 # and $password parameters.
 # see https://rt.cpan.org/Ticket/Display.html?id=89835
 
-my $failed = not eval {$dbh= DBI->connect($test_dsn, $test_user, $test_password,
-   { RaiseError => 1, PrintError => 1, AutoCommit => 0,
+my $failed = not eval { DBI->connect($test_dsn, $test_user, $test_password,
+   { RaiseError => 1, PrintError => 0, AutoCommit => 0,
      Username => '4yZ73s9qeECdWi', Password => '64heUGwAsVoNqo' });};
 ok($failed, 'Username and Password attributes override');
 
-my $success = eval {$dbh= DBI->connect($test_dsn, '4yZ73s9qeECdWi', '64heUGwAsVoNqo',
-   { RaiseError => 1, PrintError => 1, AutoCommit => 0,
+my $success = eval { DBI->connect($test_dsn, '4yZ73s9qeECdWi', '64heUGwAsVoNqo',
+   { RaiseError => 1, PrintError => 0, AutoCommit => 0,
      Username => $test_user, Password => $test_password });};
-ok($success, 'Username and Password attributes override');
+ok($success, 'Username and Password attributes override') or diag(DBI->errstr());
+
+}
+
+ok($dbh->disconnect(), 'Disconnected');
 
 done_testing;

t/11data_sources.t

@@ -18,7 +18,7 @@ $attributes{user} = $test_user;
 $attributes{password} = $test_password;
 delete $attributes{database};
 
-my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 1, AutoCommit => 0 });
+my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0, AutoCommit => 0 });
 
 plan tests => 2;
 

t/12embedded.t

@@ -39,11 +39,11 @@ sub connect_to_embedded_server {
     my $lang_arg = $ENV{DBD_MARIADB_TESTLANGDIR} ? ",--language=$ENV{DBD_MARIADB_TESTLANGDIR}" : '';
     my $emb_dsn = "DBI:MariaDB:host=embedded;mariadb_embedded_options=--datadir=$tmpdir$lang_arg;";
     $emb_dsn .= "database=$database" if defined $database;
-    return eval { DBI->connect($emb_dsn, undef, undef, { RaiseError => 1, PrintError => 1, AutoCommit => 1 }) };
+    return eval { DBI->connect($emb_dsn, undef, undef, { RaiseError => 1, PrintError => 0 }) };
 }
 
 sub connect_to_real_server {
-    my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 1, AutoCommit => 0 }) };
+    my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0, AutoCommit => 0 }) };
     if (not defined $dbh) {
         my $err = $@;
         $err =~ s/ at \S+ line \d+\.?\s*$//;

t/13disconnect.t

@@ -8,16 +8,16 @@ use vars qw($test_dsn $test_user $test_password);
 use lib 't', '.';
 require 'lib.pl';
 
-my $dbh1 = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1 });
+my $dbh1 = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0 });
 
 plan tests => 17;
 
 ok $dbh1->{Active};
 ok $dbh1->disconnect();
 ok !$dbh1->{Active};
 
-ok my $dbh2 = DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1 });
-ok my $dbh3 = DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1 });
+ok my $dbh2 = DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0 });
+ok my $dbh3 = DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0 });
 
 ok $dbh2->{Active};
 ok $dbh2->disconnect();
@@ -27,8 +27,8 @@ ok $dbh3->{Active};
 ok $dbh3->disconnect();
 ok !$dbh3->{Active};
 
-ok my $dbh4 = DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1 });
-ok our $dbh5 = DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1 });
+ok my $dbh4 = DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0 });
+ok our $dbh5 = DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, PrintError => 0 });
 
 ok $dbh4->{Active};
 ok $dbh5->{Active};

t/15reconnect.t

@@ -13,14 +13,14 @@ my $dbh;
 my $sth;
 
 $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
-  { RaiseError => 1, AutoCommit => 1});
+  { RaiseError => 1, PrintError => 0 });
 $dbh->disconnect();
 
 plan tests => 18 * 2;
 
 for my $mariadb_server_prepare (0, 1) {
 $dbh= DBI->connect("$test_dsn;mariadb_server_prepare=$mariadb_server_prepare;mariadb_server_prepare_disable_fallback=1", $test_user, $test_password,
-                      { RaiseError => 1, PrintError => 1, AutoCommit => 0 });
+                      { RaiseError => 1, PrintError => 0, AutoCommit => 0 });
 
 ok(defined $dbh, "Connected to database");