Merge pull request #122

Fix building on AppVeyor

Author: pali

.gitignore

@@ -1,16 +1,16 @@
-Makefile
-blib
-dbdimp.o
-MariaDB.bs
-MariaDB.c
-MariaDB.o
-MariaDB.xsi
-socket.o
-pm_to_blib
-t/MariaDB.mtest
-MYMETA.*
-*.tmp
-*.bak
-*.old
-INSTALL.html
-/DBD-MariaDB-*
+/*.exe
+/*.o
+/DBD-MariaDB-*.tar.gz
+/MYMETA.json
+/MYMETA.yml
+/Makefile
+/Makefile.old
+/MariaDB.bs
+/MariaDB.c
+/MariaDB.def
+/MariaDB.xsi
+/blib/
+/dll.base
+/dll.exp
+/pm_to_blib
+/t/MariaDB.mtest

.travis.yml

@@ -474,7 +474,9 @@ before_script:
         export DBD_MARIADB_CONFIG="skip" ;
       fi ;
     elif [ -n "$DB" ]; then
-      export DBD_MARIADB_CONFIG="$SANDBOX_HOME/msb/my sql_config" ;
+      printf '#!/bin/sh\nexec %s/msb/my sql_config "$@"\n' $SANDBOX_HOME > "$HOME/mysql_config" ;
+      chmod +x $HOME/mysql_config ;
+      export DBD_MARIADB_CONFIG="$HOME/mysql_config" ;
     elif [ "$MYSQL_CONFIG" = "PIC" ]; then
       sed 's/-L\$pkglibdir  *-lmysqld/-L\/usr\/lib\/mysql -lmysqld_pic /' `which mysql_config_pic` > "$HOME/mysql_config_pic" ;
       chmod +x $HOME/mysql_config_pic ;

MANIFEST.SKIP

@@ -1,18 +1,21 @@
-\B\.git\b
-^blib\/
-pm_to_blib
-\~$
-^Makefile(\.old)?$
-.gitignore
-^DBD-MariaDB-\d
-\.bak$
-\.tmp$
-\.o$
-t/MariaDB.mtest
-^MYMETA
-MariaDB.c
-MariaDB.xsi
-MariaDB.bs
-appveyor.yml
-.mailmap
-.travis.yml
+^.*\.exe$
+^.*\.o$
+^DBD-MariaDB-.*\.tar\.gz$
+^MYMETA\.json$
+^MYMETA\.yml$
+^Makefile$
+^Makefile\.old$
+^MariaDB\.bs$
+^MariaDB\.c$
+^MariaDB\.def$
+^MariaDB\.xsi$
+^\.git/.*$
+^\.gitignore$
+^\.mailmap$
+^\.travis\.yml$
+^appveyor\.yml$
+^blib/.*$
+^dll\.base$
+^dll\.exp$
+^pm_to_blib$
+^t/MariaDB\.mtest$

Makefile.PL

@@ -16,6 +16,12 @@ require DBI::DBD;
 
 my $TESTDB = "test";
 
+# On WIN32 windows.h and winsock.h need to be included before mysql.h
+# Otherwise SOCKET type which is needed for mysql.h is not defined
+my @mysql_headers;
+push @mysql_headers, 'windows.h', 'winsock.h' if $^O eq 'MSWin32';
+push @mysql_headers, 'mysql.h';
+
 our $opt = { "help" => \&Usage, };
 
 my ($test_host, $test_port, $test_socket);
@@ -68,7 +74,7 @@ my $source = {};
     if ($opt->{'mysql_config'} ne 'skip') {
     $opt->{'mysql_config'} = Win32::GetShortPathName($opt->{'mysql_config'})
         if $^O eq 'MSWin32';
-    if (! defined `$opt->{'mysql_config'} 2>&1`)
+    if (!CanExecute($opt->{'mysql_config'}))
     {
       die <<"MSG";
 
@@ -80,11 +86,11 @@ MSG
   }
   else
   {
-    if (defined `mariadb_config 2>&1`)
+    if (CanExecute("mariadb_config"))
     {
       $opt->{'mysql_config'} = "mariadb_config";
     }
-    elsif (defined `mysql_config 2>&1`)
+    elsif (CanExecute("mysql_config"))
     {
       $opt->{'mysql_config'} = "mysql_config";
     }
@@ -223,7 +229,7 @@ assert_lib(
   LIBS => (join ' ', @libdirs, $main_lib, @libs),
   ccflags => (join ' ', $opt->{cflags}, ($Config{usedl} ? $Config{cccdlflags} : ())),
   ldflags => (join ' ', @libdirs, @ldflags, ($Config{usedl} ? $Config{lddlflags} : ())),
-  header => 'mysql.h',
+  header => \@mysql_headers,
   not_execute => 1,
 );
 
@@ -233,7 +239,7 @@ check_lib(
   LIBS => (join ' ', @libdirs, $main_lib),
   ccflags => $opt->{cflags},
   ldflags => (join ' ', @libdirs, @libs, @ldflags),
-  header => 'mysql.h',
+  header => \@mysql_headers,
   function => "\n#ifndef MYSQL_VERSION_ID\n#include <mysql_version.h>\n#endif\nreturn (MYSQL_VERSION_ID >= 40108) ? 0 : 1;\n",
 ) or die <<"MSG";
 
@@ -248,7 +254,7 @@ my $have_embedded = check_lib(
   LIBS => (join ' ', @libdirs, $main_lib),
   ccflags => $opt->{cflags},
   ldflags => (join ' ', @libdirs, @libs, @ldflags),
-  header => 'mysql.h',
+  header => \@mysql_headers,
   function => 'return mysql_embedded() ? 0 : 1;',
 );
 
@@ -258,23 +264,23 @@ my $have_get_charset_number = check_lib(
   LIBS => (join ' ', @libdirs, $main_lib),
   ccflags => $opt->{cflags},
   ldflags => (join ' ', @libdirs, @libs, @ldflags),
-  header => 'mysql.h',
+  header => \@mysql_headers,
   function => 'unsigned int get_charset_number(const char *cs_name, unsigned int cs_flags); mysql_server_init(-1, 0, 0); get_charset_number("utf8", 32); return 0;',
 );
 
 my $have_get_option = check_lib(
   LIBS => (join ' ', @libdirs, $main_lib),
   ccflags => $opt->{cflags},
   ldflags => (join ' ', @libdirs, @libs, @ldflags),
-  header => 'mysql.h',
+  header => \@mysql_headers,
   function => 'MYSQL mysql; char buf[1024]; mysql_server_init(-1, 0, 0); mysql_init(&mysql); mysql_get_option(&mysql, 0, &buf); return 0;',
 );
 
 my $have_deinitialize_ssl = check_lib(
   LIBS => (join ' ', @libdirs, $main_lib),
   ccflags => $opt->{cflags},
   ldflags => (join ' ', @libdirs, @libs, @ldflags),
-  header => 'mysql.h',
+  header => \@mysql_headers,
   function => 'mariadb_deinitialize_ssl = 0; return 0;',
 );
 
@@ -416,7 +422,7 @@ if (eval { ExtUtils::MakeMaker->VERSION(5.43) }) {
       prereqs => {
         test => {
           recommends => {
-            'Net::SSLeay' => 0,
+            'Net::SSLeay' => '1.43',
             'Proc::ProcessTable' => 0,
             'TAP::Harness' => '3.31',
             'CPAN::Meta::YAML' => 0,
@@ -525,13 +531,23 @@ USAGE
 }
 
 
+sub CanExecute {
+  my ($command) = @_;
+  return MM->maybe_command($command) if File::Spec->file_name_is_absolute($command);
+  foreach my $dir (File::Spec->path) {
+    return 1 if MM->maybe_command(File::Spec->catfile($dir, $command));
+  }
+  return 0;
+}
+
+
 my %ParsedCache;
 sub ParseMySQLConfig {
   my ($opt, $param) = @_;
   return $ParsedCache{$param} if exists $ParsedCache{$param};
   return undef unless $opt->{'mysql_config'} and $opt->{'mysql_config'} ne 'skip';
   my $output = `$opt->{'mysql_config'} --$param 2>&1`;
-  if (defined $output and $output !~ /Options:|Usage:|unrecognized option/) {
+  if ($? == 0 and defined $output and $output !~ /Options:|Usage:|unrecognized option/) {
     $output =~ s/\s+$//s;
     $output =~ s/^\s+//s;
     $ParsedCache{$param} = $output;
@@ -611,7 +627,7 @@ sub Configure {
                             LIBS => (join ' ', @libdirs, $main_lib),
                             ldflags => (join ' ', @libdirs, $ldflags, $Config{lddlflags}),
                             ccflags => (join ' ', $opt->{cflags}, $Config{cccdlflags}),
-                            header => 'mysql.h',
+                            header => \@mysql_headers,
                             function => $function,
                             not_execute => 1,
                         ) or next;
@@ -621,7 +637,7 @@ sub Configure {
                         LIBS => (join ' ', @libdirs, $main_lib),
                         ldflags => (join ' ', @libdirs, $ldflags),
                         ccflags => $opt->{cflags},
-                        header => 'mysql.h',
+                        header => \@mysql_headers,
                         function => $function,
                     ) or next;
                     $str .= ' ' . $add_ldflags if defined $add_ldflags;

MariaDB.xs

@@ -68,7 +68,10 @@ BOOT:
    * See: https://github.com/gooddata/DBD-MariaDB/issues/119 */
   mariadb_deinitialize_ssl = 0;
 #endif
+#ifndef _WIN32
+  /* Calling mysql_thread_init() on WIN32 cause crash */
   mysql_thread_init();
+#endif
 }
 
 MODULE = DBD::MariaDB    PACKAGE = DBD::MariaDB::db

README.pod

@@ -1,6 +1,17 @@
 =head1 DBD::MariaDB - database driver for Perl
 
-=for html <a href="https://travis-ci.org/gooddata/DBD-MariaDB"><img src="https://travis-ci.org/gooddata/DBD-MariaDB.svg?branch=master"></a>
+=begin html
+
+<p>
+<a href="https://travis-ci.org/gooddata/DBD-MariaDB/branches">
+<img src="https://travis-ci.org/gooddata/DBD-MariaDB.svg?branch=master"
+  alt="Travis CI Build Status"></a>
+<a href="https://ci.appveyor.com/project/gooddata/dbd-mariadb/branch/master">
+<img src="https://ci.appveyor.com/api/projects/status/github/gooddata/dbd-mariadb?branch=master&amp;svg=true"
+  alt="AppVeyor Build Status"></a>
+</p>
+
+=end html
 
 This is the Perl L<DBI> driver for access to MariaDB and MySQL databases.
 

appveyor.yml

@@ -6,35 +6,55 @@ cache:
 
 environment:
   matrix:
+    - perl: "5.8.9.5"
+    - perl: "5.10.1.5"
+    - perl: "5.12.3.20180709"
     - perl: "5.14.4.1"
     - perl: "5.16.3.20170202"
     - perl: "5.18.4.1"
     - perl: "5.20.3.3"
     - perl: "5.22.3.1"
-    - perl: "5.24.1.1"
-    - perl: "5.26.0.1"
+    - perl: "5.24.4.1"
+    - perl: "5.26.2.1"
+    - perl: "5.28.0.1"
 
 platform:
   - x86
   - x64
 
+matrix:
+  exclude:
+    - platform: x64
+      perl: "5.8.9.5"
+    - platform: x64
+      perl: "5.10.1.5"
+
 services:
   - mysql
 
 install:
+  - ren C:\MinGW MinGW_do_not_use
+  - ren C:\Perl Perl_do_not_use
+  - ren "C:\\Program Files\\Git\\usr\\bin\\perl.exe" perl.exe_do_not_use
   - if /I %PLATFORM% == x86 (set x86=--forcex86) else (set "x86= ")
   - choco config set cacheLocation C:\ProgramData\chocolatey\cache
   - cinst StrawberryPerl --version %perl% %x86% --allow-empty-checksums
-  - path C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;C:\strawberry\c\bin;%PATH%
+  - refreshenv
   - perl -V
   - cpan -T App::cpanminus
-  - cpanm --quiet --notest --skip-satisfied Devel::CheckLib
+  - perl -MExtUtils::MakeMaker=6.58 -e "" || cpanm --quiet --notest ExtUtils::[email protected]
+  - cpanm --quiet --notest --skip-satisfied DBI~1.608 Devel::CheckLib~1.12
   - cpanm --quiet --notest --skip-satisfied --installdeps --with-configure --with-develop --with-recommends --with-suggests .
 
 build_script:
-  - perl Makefile.PL --mysql_config=c:\strawberry\c\bin\mysql_config.bat --testuser=root --testpassword=Password12!
+  - set DBD_MARIADB_TESTUSER=root
+  - set DBD_MARIADB_TESTPASSWORD=Password12!
+  - perl -MConfig -e "system({$Config{make}} $Config{make}, @ARGV); exit((($? >> 8) | ($? & 127)) & 255)" realclean || (exit 0)
+  - perl Makefile.PL
   - perl -MConfig -e "system({$Config{make}} $Config{make}, @ARGV); exit((($? >> 8) | ($? & 127)) & 255)"
 
 test_script:
+  - set HARNESS_OPTIONS=j4
+  - set RELEASE_TESTING=1
   - set CONNECTION_TESTING=1
   - perl -MConfig -e "system({$Config{make}} $Config{make}, @ARGV); exit((($? >> 8) | ($? & 127)) & 255)" test

dbdimp.h

@@ -17,17 +17,27 @@
 /*
  *  Header files we use
  */
-#include <DBIXS.h>  /* installed by the DBI module                        */
+
+/*
+ * On WIN32 windows.h and winsock.h need to be included before mysql.h
+ * Otherwise SOCKET type which is needed for mysql.h is not defined
+ */
+#ifdef _WIN32
+#include <windows.h>
+#include <winsock.h>
+#endif
+
 #include <mysql.h>  /* Comes with MySQL-devel */
 #include <mysqld_error.h>  /* Comes MySQL */
-
 #include <errmsg.h> /* Comes with MySQL-devel */
-#include <stdint.h> /* For uint32_t */
 
 #ifndef MYSQL_VERSION_ID
 #include <mysql_version.h> /* Comes with MySQL-devel */
 #endif
 
+#include <DBIXS.h>  /* installed by the DBI module */
+#include <stdint.h> /* For uint32_t */
+
 #if !defined(MARIADB_BASE_VERSION) && defined(MARIADB_PACKAGE_VERSION)
 #define MARIADB_BASE_VERSION
 #endif