Added variable declaration and "use strict" to Build.PL and Makefile.PL.
This commit is contained in:
		
							
								
								
									
										15
									
								
								Build.PL
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								Build.PL
									
									
									
									
									
								
							| @@ -1,11 +1,12 @@ | |||||||
| #! /usr/bin/perl -w | #! /usr/bin/perl -w | ||||||
|  | use strict; | ||||||
| use Module::Build; | use Module::Build; | ||||||
| use lib qw(lib); | use lib qw(lib); | ||||||
| use DbFramework::Util; | use DbFramework::Util; | ||||||
| require 't/util.pl'; | require 't/util.pl'; | ||||||
|  |  | ||||||
| $catalog_db = 'dbframework_catalog'; | my $catalog_db = 'dbframework_catalog'; | ||||||
| %keytypes   = (primary => 0, foreign => 1, index => 2); | my %keytypes   = (primary => 0, foreign => 1, index => 2); | ||||||
|  |  | ||||||
| Module::Build->prompt(<<EOF, ""); | Module::Build->prompt(<<EOF, ""); | ||||||
|  |  | ||||||
| @@ -25,7 +26,7 @@ unless ( -f $config && Module::Build->prompt("$config exists, use it?", "Y") =~ | |||||||
|   my @drivers = grep eval "require DBD::$_; 1;", qw/mysql mSQL Pg/; |   my @drivers = grep eval "require DBD::$_; 1;", qw/mysql mSQL Pg/; | ||||||
|   my $drivers = Module::Build->prompt("Enter (space seperated) DBI drivers to test:", join(" ", @drivers)); |   my $drivers = Module::Build->prompt("Enter (space seperated) DBI drivers to test:", join(" ", @drivers)); | ||||||
|   @drivers = split /\s/,$drivers; |   @drivers = split /\s/,$drivers; | ||||||
|   $test_db = 'test'; |   my $test_db = 'test'; | ||||||
|  |  | ||||||
|   my %driver; |   my %driver; | ||||||
|   for my $driver ( @drivers ) { |   for my $driver ( @drivers ) { | ||||||
| @@ -53,10 +54,10 @@ to $db i.e. 'DBI:$driver:[dsn_string]':}, $db); | |||||||
| 	  # create catalog schema | 	  # create catalog schema | ||||||
| 	  my %sql = %{catalog_schema()}; | 	  my %sql = %{catalog_schema()}; | ||||||
| 	  # default to mysql DDL syntax | 	  # default to mysql DDL syntax | ||||||
| 	  $ddl = (exists $sql{$driver}) ? $driver : 'mysql'; | 	  my $ddl = (exists $sql{$driver}) ? $driver : 'mysql'; | ||||||
| 	  $dsn = $driver{$driver}->{$db}->{dsn}; | 	  $dsn    = $driver{$driver}->{$db}->{dsn}; | ||||||
| 	  $u   = $driver{$driver}->{$db}->{u}; | 	  my $u   = $driver{$driver}->{$db}->{u}; | ||||||
| 	  $p   = $driver{$driver}->{$db}->{p}; | 	  my $p   = $driver{$driver}->{$db}->{p}; | ||||||
| 	  my $dbh = DbFramework::Util::get_dbh($dsn,$u,$p); | 	  my $dbh = DbFramework::Util::get_dbh($dsn,$u,$p); | ||||||
| 	  $dbh->{PrintError} = 0; | 	  $dbh->{PrintError} = 0; | ||||||
| 	  for my $table ( qw/c_db c_key c_relationship c_table/ ) { | 	  for my $table ( qw/c_db c_key c_relationship c_table/ ) { | ||||||
|   | |||||||
							
								
								
									
										15
									
								
								Makefile.PL
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								Makefile.PL
									
									
									
									
									
								
							| @@ -1,13 +1,14 @@ | |||||||
| #! /usr/bin/perl -w | #! /usr/bin/perl -w | ||||||
| # See lib/ExtUtils/MakeMaker.pm for details of how to influence | # See lib/ExtUtils/MakeMaker.pm for details of how to influence | ||||||
| # the contents of the Makefile that is written. | # the contents of the Makefile that is written. | ||||||
|  | use strict; | ||||||
| use ExtUtils::MakeMaker; | use ExtUtils::MakeMaker; | ||||||
| use lib qw(lib); | use lib qw(lib); | ||||||
| use DbFramework::Util; | use DbFramework::Util; | ||||||
| require 't/util.pl'; | require 't/util.pl'; | ||||||
|  |  | ||||||
| $catalog_db = 'dbframework_catalog'; | my $catalog_db = 'dbframework_catalog'; | ||||||
| %keytypes   = (primary => 0, foreign => 1, index => 2); | my %keytypes   = (primary => 0, foreign => 1, index => 2); | ||||||
|  |  | ||||||
| prompt(<<EOF); | prompt(<<EOF); | ||||||
|  |  | ||||||
| @@ -27,7 +28,7 @@ unless ( -f $config && prompt("$config exists, use it?", "Y") =~ /^y/i ) { | |||||||
|   my @drivers = grep eval "require DBD::$_; 1;", qw/mysql mSQL Pg/; |   my @drivers = grep eval "require DBD::$_; 1;", qw/mysql mSQL Pg/; | ||||||
|   my $drivers = prompt("Enter (space seperated) DBI drivers to test:", join(" ", @drivers)); |   my $drivers = prompt("Enter (space seperated) DBI drivers to test:", join(" ", @drivers)); | ||||||
|   @drivers = split /\s/,$drivers; |   @drivers = split /\s/,$drivers; | ||||||
|   $test_db = 'test'; |   my $test_db = 'test'; | ||||||
|  |  | ||||||
|   my %driver; |   my %driver; | ||||||
|   for my $driver ( @drivers ) { |   for my $driver ( @drivers ) { | ||||||
| @@ -55,10 +56,10 @@ to $db i.e. 'DBI:$driver:[dsn_string]':}, $dsn); | |||||||
| 	  # create catalog schema | 	  # create catalog schema | ||||||
| 	  my %sql = %{catalog_schema()}; | 	  my %sql = %{catalog_schema()}; | ||||||
| 	  # default to mysql DDL syntax | 	  # default to mysql DDL syntax | ||||||
| 	  $ddl = (exists $sql{$driver}) ? $driver : 'mysql'; | 	  my $ddl = (exists $sql{$driver}) ? $driver : 'mysql'; | ||||||
| 	  $dsn = $driver{$driver}->{$db}->{dsn}; | 	  $dsn    = $driver{$driver}->{$db}->{dsn}; | ||||||
| 	  $u   = $driver{$driver}->{$db}->{u}; | 	  my $u   = $driver{$driver}->{$db}->{u}; | ||||||
| 	  $p   = $driver{$driver}->{$db}->{p}; | 	  my $p   = $driver{$driver}->{$db}->{p}; | ||||||
| 	  my $dbh = DbFramework::Util::get_dbh($dsn,$u,$p); | 	  my $dbh = DbFramework::Util::get_dbh($dsn,$u,$p); | ||||||
| 	  $dbh->{PrintError} = 0; | 	  $dbh->{PrintError} = 0; | ||||||
| 	  for my $table ( qw/c_db c_key c_relationship c_table/ ) { | 	  for my $table ( qw/c_db c_key c_relationship c_table/ ) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user