Skip to content

Commit

Permalink
Spelling fixes.
Browse files Browse the repository at this point in the history
Signed-off-by: H.Merijn Brand - Tux <[email protected]>
  • Loading branch information
scop authored and H.Merijn Brand - Tux committed Jun 17, 2013
1 parent 724d5bb commit 1a1ce3f
Show file tree
Hide file tree
Showing 25 changed files with 50 additions and 50 deletions.
10 changes: 5 additions & 5 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ Jens Rehsack, Martin J. Evans, and H.Merijn Brand for all their contributions.
Fixed DBI::PurePerl neat() to behave more like XS neat().

Increased default $DBI::neat_maxlen from 400 to 1000.
Increased timeout on tests to accomodate very slow systems.
Increased timeout on tests to accommodate very slow systems.
Changed behaviour of trace levels 1..4 to show less information
at lower levels.
Changed the format of the key used for $h->{CachedKids}
Expand Down Expand Up @@ -1200,7 +1200,7 @@ Jens Rehsack, Martin J. Evans, and H.Merijn Brand for all their contributions.

Documentation changes:
Documented $high_resolution_time = dbi_time() function.
Documented that bind_col() can take an atribute hash.
Documented that bind_col() can take an attribute hash.
Clarified documentation for ParamValues attribute hash keys.
Many good DBI documentation tweaks from Jonathan Leffler,
including a major update to the DBI::DBD driver author guide.
Expand Down Expand Up @@ -1339,7 +1339,7 @@ Jens Rehsack, Martin J. Evans, and H.Merijn Brand for all their contributions.
: If you are still using perl 5.005_03 you should be making plans to
: upgrade to at least perl 5.6.1, or 5.8.0. Perl 5.8.0 is due to be
: released in the next week or so. (Although it's a "point 0" release,
: it is the most throughly tested release ever.)
: it is the most thoroughly tested release ever.)

Added XS/C implementations of selectrow_array, selectrow_arrayref, and
selectall_arrayref to Driver.xst. See DBI 1.26 Changes for more info.
Expand Down Expand Up @@ -1383,7 +1383,7 @@ Jens Rehsack, Martin J. Evans, and H.Merijn Brand for all their contributions.

Added C implementations of selectrow_arrayref() and fetchall_arrayref()
in Driver.xst. All compiled drivers using Driver.xst will now be
faster making those calls. Most noticable with fetchall_arrayref for
faster making those calls. Most noticeable with fetchall_arrayref for
many rows or selectrow_arrayref with a fast query. For example, using
DBD::mysql a selectrow_arrayref for a single row using a primary key
is ~20% faster, and fetchall_arrayref for 20000 rows is twice as fast!
Expand Down Expand Up @@ -2335,7 +2335,7 @@ Jens Rehsack, Martin J. Evans, and H.Merijn Brand for all their contributions.
Added DBI->internal->{DebugLog} = $filename;
Reworked internal logging.
Added $VERSION.
Made disconnect_all a compulsary method for drivers.
Made disconnect_all a compulsory method for drivers.


=head1 ANCIENT HISTORY
Expand Down
2 changes: 1 addition & 1 deletion DBI.xs
Original file line number Diff line number Diff line change
Expand Up @@ -3516,7 +3516,7 @@ XS(XS_DBI_dispatch)
*/
/* we want to localize $_ for the callback but can't just do that alone
* because we're not using SAVETMPS & FREETMPS, so we have to get sneaky.
* We still localize, so we're safe from the callback dieing,
* We still localize, so we're safe from the callback die-ing,
* but after the callback we manually restore the original $_.
*/
orig_defsv = DEFSV; /* remember the current $_ */
Expand Down
2 changes: 1 addition & 1 deletion DBIXS.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include "dbi_sql.h"


#define DBIXS_VERSION 93 /* superceeded by DBIXS_REVISION */
#define DBIXS_VERSION 93 /* superseded by DBIXS_REVISION */

#ifdef NEED_DBIXS_VERSION
#if NEED_DBIXS_VERSION > DBIXS_VERSION
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ precompiled binary of DBI using a package manager (e.g., ppm for ActiveState,
Synaptic for Ubuntu, port for FreeBSD etc)

---
If you get compiler errors refering to Perl's own header files
If you get compiler errors referring to Perl's own header files
(.../CORE/...h) or the compiler complains about bad options etc then
there is something wrong with your perl installation. If the compiler complains
of missing files (.../perl.h: error: sys/types.h: No such file) then you may
Expand Down
2 changes: 1 addition & 1 deletion Old/TODO_gofer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ add comparisons with other proxies to gofer docs (see notes)
http://code.nytimes.com/projects/dbslayer
update gofer pdf in distribution
talk about multiple statements in single sql for gofer
inbalance between two calls to _store_response_in_cache
imbalance between two calls to _store_response_in_cache
- the call in transmit_request doesn't have the response_needs_retransmit logic

Add server-side caching.
Expand Down
2 changes: 1 addition & 1 deletion dbiproxy.PL
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ UID's can be passed as group names or numeric values.
=item B<--version>
Supresses startup of the server; instead the version string will
Suppresses startup of the server; instead the version string will
be printed and the program exits immediately.
=back
Expand Down
2 changes: 1 addition & 1 deletion devel/README
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DBI being maintained by several people now causes a mixture
of styles. It has been proven that people are most productive
when they can do things `ther way'.
when they can do things `their way'.

Tim Bunce is the owner and main maintainer of DBI. He can and
should veto anything that is forbidden, but for now, you'll
Expand Down
2 changes: 1 addition & 1 deletion lib/DBD/DBM.pm
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ sub get_dbm_versions
eval {
$dver = $meta->{dbm_type}->VERSION();

# *) when we're still alive here, everthing went ok - no need to check for $@
# *) when we're still alive here, everything went ok - no need to check for $@
$dtype .= " ($dver)";
};
if ( $meta->{dbm_mldbm} )
Expand Down
4 changes: 2 additions & 2 deletions lib/DBD/File.pm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ sub driver ($;$)
# We use a hash here to have one singleton per subclass.
# (Otherwise DBD::CSV and DBD::DBM, for example, would
# share the same driver object which would cause problems.)
# An alternative would be not not cache the $drh here at all
# An alternative would be to not cache the $drh here at all
# and require that subclasses do that. Subclasses should do
# their own caching, so caching here just provides extra safety.
$drh->{$class} and return $drh->{$class};
Expand Down Expand Up @@ -244,7 +244,7 @@ sub get_f_versions
eval {
$dver = IO::File->VERSION ();

# when we're still alive here, everthing went ok - no need to check for $@
# when we're still alive here, everything went ok - no need to check for $@
$dtype .= " ($dver)";
};

Expand Down
4 changes: 2 additions & 2 deletions lib/DBD/Gofer.pm
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@
or return undef; # no more result sets
#warn "more_results: ".Data::Dumper::Dumper($meta);

# pull out the special non-atributes first
# pull out the special non-attributes first
my ($rowset, $err, $errstr, $state)
= delete @{$meta}{qw(rowset err errstr state)};

Expand Down Expand Up @@ -1159,7 +1159,7 @@ The code reference is called like this:
$transport = $h->{go_transport};
$retry = $transport->go_retry_hook->($request, $response, $transport);
If it returns true then the request will be retried, upto the C<retry_limit>.
If it returns true then the request will be retried, up to the C<retry_limit>.
If it returns a false but defined value then the request will not be retried.
If it returns undef then the default behaviour will be used, as if C<retry_hook>
had not been specified.
Expand Down
2 changes: 1 addition & 1 deletion lib/DBD/Gofer/Transport/Base.pm
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ sub response_retry_preference {
# This is the main decision point. We don't retry requests that got
# as far as executing because the error is probably from the database
# (not transport) so retrying is unlikely to help. But note that any
# severe transport error occuring after execute is likely to return
# severe transport error occurring after execute is likely to return
# a new response object that doesn't have the execute flag set. Beware!
return 0 if $response->executed_flag_set;

Expand Down
8 changes: 4 additions & 4 deletions lib/DBD/Multiplex.pm
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ sub mx_method_all {
}
}

# this is where result-selection/comparision functionality can go
# this is where result-selection/comparison functionality can go
my $return_result = $results->[0];

return $return_result->[0] unless wantarray;
Expand Down Expand Up @@ -412,7 +412,7 @@ sub connect {
}

# The forced DESTROY before calling set_err using pre-cached values
# is due to a wierd DBI interaction re errors and 'last handle'
# is due to a weird DBI interaction re errors and 'last handle'
undef @mx_dbh_list; # force DESTROY now
$drh->set_err($err, "$errstr [from mx_id=$mx_id: $dsn]");
return;
Expand Down Expand Up @@ -602,7 +602,7 @@ for (sort keys %{ $DBI::DBI_methods{db} }) {


########################################
# AUTOLOAD to catch methods not explictly handled elsewhere,
# AUTOLOAD to catch methods not explicitly handled elsewhere,
# including driver-specific methods, and multiplex via func
# XXX using func isn't quite right, integrate with install_method/can?
########################################
Expand Down Expand Up @@ -768,7 +768,7 @@ for (sort keys %{ $DBI::DBI_methods{st} }) {
}

########################################
# AUTOLOAD to catch methods not explictly handled elsewhere,
# AUTOLOAD to catch methods not explicitly handled elsewhere,
# including driver-specific methods, and multiplex via func
# XXX using func isn't quite right, integrate with install_method/can?
########################################
Expand Down
2 changes: 1 addition & 1 deletion lib/DBD/NullP.pm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
elsif ($sth->{Statement} =~ m/^ \s* ERROR \s+ (\d+) \s* (.*) /xmsi) {
return $sth->set_err($1, $2);
}
# anything else is silently ignored, sucessfully
# anything else is silently ignored, successfully
1;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/DBD/Proxy.pm
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ persistent connections.
However, if you set the I<proxy_no_finish> attribute to a TRUE value,
either in the database handle or in the statement handle, then finish()
calls will be supressed. This is what you want, for example, in small
calls will be suppressed. This is what you want, for example, in small
and fast CGI applications.
=item proxy_quote
Expand Down
6 changes: 3 additions & 3 deletions lib/DBI/DBD.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3453,16 +3453,16 @@ sub dbd_postamble {
my $dbi_driver_xst= File::Spec->catfile($dbi_instarch_dir, 'Driver.xst');
my $xstf_h = File::Spec->catfile($dbi_instarch_dir, 'Driver_xst.h');

# we must be careful of quotes, expecially for Win32 here.
# we must be careful of quotes, especially for Win32 here.
return '
# --- This section was generated by DBI::DBD::dbd_postamble()
DBI_INSTARCH_DIR='.$dbi_instarch_dir.'
DBI_DRIVER_XST='.$dbi_driver_xst.'
# The main dependancy (technically correct but probably not used)
# The main dependency (technically correct but probably not used)
$(BASEEXT).c: $(BASEEXT).xsi
# This dependancy is needed since MakeMaker uses the .xs.o rule
# This dependency is needed since MakeMaker uses the .xs.o rule
$(BASEEXT)$(OBJ_EXT): $(BASEEXT).xsi
$(BASEEXT).xsi: $(DBI_DRIVER_XST) '.$xstf_h.'
Expand Down
6 changes: 3 additions & 3 deletions lib/DBI/DBD/SqlEngine.pm
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ sub driver ($;$)
# We use a hash here to have one singleton per subclass.
# (Otherwise DBD::CSV and DBD::DBM, for example, would
# share the same driver object which would cause problems.)
# An alternative would be not not cache the $drh here at all
# An alternative would be to not cache the $drh here at all
# and require that subclasses do that. Subclasses should do
# their own caching, so caching here just provides extra safety.
$drh->{$class} and return $drh->{$class};
Expand Down Expand Up @@ -1269,7 +1269,7 @@ sub fetch ($)
{
$sth->set_err(
$DBI::stderr,
"Attempt to fetch row without a preceeding execute () call or from a non-SELECT statement"
"Attempt to fetch row without a preceding execute () call or from a non-SELECT statement"
);
return;
}
Expand Down Expand Up @@ -2024,7 +2024,7 @@ following:
$dbh->func( "list_tables" );
Everytime where an C<\%attr> argument can be specified, this C<\%attr>
Every time where an C<\%attr> argument can be specified, this C<\%attr>
object's C<sql_table_source> attribute is preferred over the C<$dbh>
attribute or the driver default, eg.
Expand Down
2 changes: 1 addition & 1 deletion lib/DBI/FAQ.pm
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ Extracted from ``I<DBI - The Database Interface for Perl 5>'':
To sum up, DBM is a perfectly satisfactory solution for essentially read-only
databases, or small and simple datasets. However, for more
scaleable dataset handling, not to mention robust transactional locking,
scalable dataset handling, not to mention robust transactional locking,
users are recommended to use a more powerful database engine I<via> I<DBI>.
Chapter 2 of "Programming the Perl DBI" discusses DBM files in detail.
Expand Down
2 changes: 1 addition & 1 deletion lib/DBI/Gofer/Execute.pm
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ sub _install_rand_callbacks {
next;
}
unless (defined $fail_percent or defined $delay_percent) {
warn "Ignored DBI_GOFER_RANDOM item '$spec' because not preceeded by 'fail=N' and/or 'delayN=N'";
warn "Ignored DBI_GOFER_RANDOM item '$spec' because not preceded by 'fail=N' and/or 'delayN=N'";
next;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/DBI/ProxyServer.pm
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ Create a configuration file "proxy_oracle.cfg" at the dbproxy-server:
},
# rule: employee_workplace
# desc: get detailled information
# desc: get detailed information
{
# any IP-address is meant here
mask => '^10\.95\.81\.(\d+)$',
Expand Down Expand Up @@ -809,7 +809,7 @@ Controlling which person at which machine is allowed to access
=item * "mask" is a perl regular expression against the plain ip-address of the machine which wishes to connect _or_ the reverse-lookup from a nameserver.
=item * "accept" tells the dbiproxy-server wether ip-adresse like in "mask" are allowed to connect or not (0/1)
=item * "accept" tells the dbiproxy-server whether ip-adresse like in "mask" are allowed to connect or not (0/1)
=item * "users" is a reference to a list of usernames which must be matched, this is NOT a regular expression.
Expand Down
4 changes: 2 additions & 2 deletions t/01basics.t
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ is(neat(undef), "undef", '... neat : undef -> "undef"');

## testing neat_list

is(neat_list([ 1 + 1, "2", undef, "foobarbaz"], 8, "|"), "2|'2'|undef|'foo...'", '... test array argument w/seperator and maxlen');
is(neat_list([ 1 + 1, "2", undef, "foobarbaz"]), "2, '2', undef, 'foobarbaz'", '... test array argument w/out seperator or maxlen');
is(neat_list([ 1 + 1, "2", undef, "foobarbaz"], 8, "|"), "2|'2'|undef|'foo...'", '... test array argument w/separator and maxlen');
is(neat_list([ 1 + 1, "2", undef, "foobarbaz"]), "2, '2', undef, 'foobarbaz'", '... test array argument w/out separator or maxlen');


## ----------------------------------------------------------------------------
Expand Down
14 changes: 7 additions & 7 deletions t/03handle.t
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ do {
[ values %{$ck} ],
[ $sth1 ]
),
'... our statment handle should be in the CachedKids');
'... our statement handle should be in the CachedKids');

ok($sth1->{Active}, '... our first statment is Active');
ok($sth1->{Active}, '... our first statement is Active');

{
my $warn = 0; # use this to check that we are warned
Expand All @@ -87,7 +87,7 @@ do {
is($sth1, $sth2, '... prepare_cached returned the same statement handle');
cmp_ok($warn,'==', 1, '... we got warned about our first statement handle being still active');

ok(!$sth1->{Active}, '... our first statment is no longer Active since we re-prepared it');
ok(!$sth1->{Active}, '... our first statement is no longer Active since we re-prepared it');

my $sth3 = $dbh->prepare_cached($sql, { foo => 1 });
isa_ok($sth3, 'DBI::st');
Expand All @@ -98,7 +98,7 @@ do {
[ values %{$ck} ],
[ $sth1, $sth3 ]
),
'... both statment handles should be in the CachedKids');
'... both statement handles should be in the CachedKids');

ok($sth1->execute("."), '... executing first statement handle again');
ok($sth1->{Active}, '... first statement handle is now active again');
Expand All @@ -114,7 +114,7 @@ do {
[ values %{$ck} ],
[ $sth2, $sth4 ]
),
'... second and fourth statment handles should be in the CachedKids');
'... second and fourth statement handles should be in the CachedKids');

$sth1->finish;
ok(!$sth1->{Active}, '... first statement handle is no longer active');
Expand All @@ -136,7 +136,7 @@ do {
[ values %{$ck} ],
[ $sth2, $sth5 ]
),
'... second and fourth/fifth statment handles should be in the CachedKids');
'... second and fourth/fifth statement handles should be in the CachedKids');
}

SKIP: {
Expand Down Expand Up @@ -219,7 +219,7 @@ SKIP: {
# this test checks for reference leaks by testing the Kids attribute
# which is not supported by DBI::PurePerl, so we just do not run this
# for DBI::PurePerl all together. Even though some of the tests would
# pass, it does not make sense becuase in the end, what is actually
# pass, it does not make sense because in the end, what is actually
# being tested for will give a false positive

sub work {
Expand Down
8 changes: 4 additions & 4 deletions t/06attrs.t
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ ok( $dbh->{Warn}, '... checking Warn attribute for dbh');
ok( $dbh->{Active}, '... checking Active attribute for dbh');
ok( $dbh->{AutoCommit}, '... checking AutoCommit attribute for dbh');
ok(!$dbh->{CompatMode}, '... checking CompatMode attribute for dbh');
ok(!$dbh->{InactiveDestroy}, '... checking InactiveDestory attribute for dbh');
ok(!$dbh->{AutoInactiveDestroy}, '... checking AutoInactiveDestory attribute for dbh');
ok(!$dbh->{InactiveDestroy}, '... checking InactiveDestroy attribute for dbh');
ok(!$dbh->{AutoInactiveDestroy}, '... checking AutoInactiveDestroy attribute for dbh');
ok(!$dbh->{PrintError}, '... checking PrintError attribute for dbh');
ok( $dbh->{PrintWarn}, '... checking PrintWarn attribute for dbh'); # true because of perl -w above
ok( $dbh->{RaiseError}, '... checking RaiseError attribute for dbh');
Expand Down Expand Up @@ -111,8 +111,8 @@ ok( $drh->{Warn}, '... checking Warn attribute for drh');
ok( $drh->{Active}, '... checking Active attribute for drh');
ok( $drh->{AutoCommit}, '... checking AutoCommit attribute for drh');
ok(!$drh->{CompatMode}, '... checking CompatMode attribute for drh');
ok(!$drh->{InactiveDestroy}, '... checking InactiveDestory attribute for drh');
ok(!$drh->{AutoInactiveDestroy}, '... checking AutoInactiveDestory attribute for drh');
ok(!$drh->{InactiveDestroy}, '... checking InactiveDestroy attribute for drh');
ok(!$drh->{AutoInactiveDestroy}, '... checking AutoInactiveDestroy attribute for drh');
ok(!$drh->{PrintError}, '... checking PrintError attribute for drh');
ok( $drh->{PrintWarn}, '... checking PrintWarn attribute for drh'); # true because of perl -w above
ok(!$drh->{RaiseError}, '... checking RaiseError attribute for drh');
Expand Down
4 changes: 2 additions & 2 deletions t/30subclass.t
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ sub fetch {
if $row->[0] < 0;
# ... and providing alternate results
# (although typically would trap and hide and error from SUPER::fetch)
return $sth->set_err(2,"Don't exagerate",undef, undef, [ 42,"zz",0 ])
return $sth->set_err(2,"Don't exaggerate",undef, undef, [ 42,"zz",0 ])
if $row->[0] > 42;
}
return $row;
Expand Down Expand Up @@ -130,7 +130,7 @@ $row = eval { $sth->fetch };
isa_ok($row, 'ARRAY');
is($row->[0], 42);
is($DBI::err, 2);
like($DBI::errstr, qr/Don't exagerate/);
like($DBI::errstr, qr/Don't exaggerate/);
is($@ =~ /Don't be so negative/, $@);


Expand Down
Loading

0 comments on commit 1a1ce3f

Please sign in to comment.