Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
milsorm committed May 10, 2018
2 parents c7a272f + 7731a3c commit 34c2089
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 18 deletions.
6 changes: 6 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
Revision history for Perl extension dbMan

0.46 <20180510>
- extension SQLOutputCube typo
- extension SQLOutputHTML typo
- extension SQLOutputInsert typo
- extension SQLOutputPlain typo

0.45 <20180306>
- extension SQLOutputTable supports colortable format
- config: tablecolor_head, tablecolor_content and tablecolor_lines options for colortable colors
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dbMan 0.45
dbMan 0.46
(c) Copyright 1999-2018 by Milan Sorm, [email protected]

If you plan to use this program you must respect LICENSE file.
Expand Down
2 changes: 1 addition & 1 deletion bin/cdbman
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Report bugs directly to [email protected].
=head1 LAST MODIFIED
Tue Mar 6 13:43:50 CET 2018
Thu May 10 11:11:15 CEST 2018
=head1 SEE ALSO
Expand Down
4 changes: 2 additions & 2 deletions bin/dbman
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $dbman->start;

=head1 VERSION
0.45
0.46
=head1 LICENSE
Expand All @@ -71,7 +71,7 @@ Report bugs directly to [email protected].
=head1 LAST MODIFIED
Tue Mar 6 13:43:35 CET 2018
Thu May 10 11:11:01 CEST 2018
=head1 SEE ALSO
Expand Down
4 changes: 2 additions & 2 deletions lib/DBIx/dbMan.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package DBIx::dbMan;

=comment
dbMan 0.45
dbMan 0.46
(c) Copyright 1999-2018 by Milan Sorm, [email protected]
All rights reserved.
Expand All @@ -21,7 +21,7 @@ use DBIx::dbMan::DBI; # dbMan DBI interface package
use DBIx::dbMan::MemPool; # dbMan memory management system package
use Data::Dumper;

our $VERSION = '0.45';
our $VERSION = '0.46';

# constructor, arguments are hash of style -option => value, stored in internal attributes hash
sub new {
Expand Down
6 changes: 3 additions & 3 deletions lib/DBIx/dbMan/Extension/SQLOutputCube.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ use strict;
use base 'DBIx::dbMan::Extension';
use Text::FormatTable;

our $VERSION = '0.03';
our $VERSION = '0.04';

1;

sub IDENTIFICATION { return "000001-000082-000003"; }
sub IDENTIFICATION { return "000001-000082-000004"; }

sub preference { return 0; }

Expand All @@ -24,7 +24,7 @@ sub done {
$obj->{-mempool}->deregister('output_format','cube');
if ($obj->{-mempool}->get('output_format') eq 'cube') {
my @all_formats = $obj->{-mempool}->get_register('output_format');
$obj->{-mempool}->set('output_format',$all_formats ? $all_formats[0] : '');
$obj->{-mempool}->set('output_format', @all_formats ? $all_formats[0] : '');
}
}

Expand Down
6 changes: 3 additions & 3 deletions lib/DBIx/dbMan/Extension/SQLOutputHTML.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package DBIx::dbMan::Extension::SQLOutputHTML;
use strict;
use base 'DBIx::dbMan::Extension';

our $VERSION = '0.05';
our $VERSION = '0.06';

1;

sub IDENTIFICATION { return "000001-000028-000005"; }
sub IDENTIFICATION { return "000001-000028-000006"; }

sub preference { return 0; }

Expand All @@ -21,7 +21,7 @@ sub done {
$obj->{-mempool}->deregister('output_format','html');
if ($obj->{-mempool}->get('output_format') eq 'html') {
my @all_formats = $obj->{-mempool}->get_register('output_format');
$obj->{-mempool}->set('output_format',$all_formats ? $all_formats[0] : '');
$obj->{-mempool}->set('output_format', @all_formats ? $all_formats[0] : '');
}
}

Expand Down
6 changes: 3 additions & 3 deletions lib/DBIx/dbMan/Extension/SQLOutputInsert.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package DBIx::dbMan::Extension::SQLOutputInsert;
use strict;
use base 'DBIx::dbMan::Extension';

our $VERSION = '0.05';
our $VERSION = '0.06';

1;

sub IDENTIFICATION { return "000001-000070-000005"; }
sub IDENTIFICATION { return "000001-000070-000006"; }

sub preference { return 0; }

Expand All @@ -23,7 +23,7 @@ sub done {
$obj->{-mempool}->deregister('output_format','insert');
if ($obj->{-mempool}->get('output_format') eq 'insert') {
my @all_formats = $obj->{-mempool}->get_register('output_format');
$obj->{-mempool}->set('output_format',$all_formats ? $all_formats[0] : '');
$obj->{-mempool}->set('output_format', @all_formats ? $all_formats[0] : '');
}
}

Expand Down
6 changes: 3 additions & 3 deletions lib/DBIx/dbMan/Extension/SQLOutputPlain.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package DBIx::dbMan::Extension::SQLOutputPlain;
use strict;
use base 'DBIx::dbMan::Extension';

our $VERSION = '0.08';
our $VERSION = '0.09';

1;

sub IDENTIFICATION { return "000001-000027-000008"; }
sub IDENTIFICATION { return "000001-000027-000009"; }

sub preference { return 0; }

Expand All @@ -23,7 +23,7 @@ sub done {
$obj->{-mempool}->deregister('output_format','plain');
if ($obj->{-mempool}->get('output_format') eq 'plain') {
my @all_formats = $obj->{-mempool}->get_register('output_format');
$obj->{-mempool}->set('output_format',$all_formats ? $all_formats[0] : '');
$obj->{-mempool}->set('output_format', @all_formats ? $all_formats[0] : '');
}
}

Expand Down

0 comments on commit 34c2089

Please sign in to comment.