projects
/
DBIx-DBSchema.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df03590
)
mysql: fix reverse-engineering of empty string default
author
ivan
<ivan>
Sat, 27 Mar 2010 04:09:09 +0000
(
04:09
+0000)
committer
ivan
<ivan>
Sat, 27 Mar 2010 04:09:09 +0000
(
04:09
+0000)
Changes
patch
|
blob
|
history
DBSchema/DBD/mysql.pm
patch
|
blob
|
history
diff --git
a/Changes
b/Changes
index
f4d33e1
..
d64ce74
100644
(file)
--- a/
Changes
+++ b/
Changes
@@
-4,6
+4,7
@@
Revision history for Perl extension DBIx::DBSchema.
- mysql: TEXT->LONGTEXT
- mysql: when reverse engineering, transform a default of
CURRENT_TIMESTAMP into the more common NOW()
- mysql: TEXT->LONGTEXT
- mysql: when reverse engineering, transform a default of
CURRENT_TIMESTAMP into the more common NOW()
+ - mysql: fix reverse-engineering of empty string default
0.38 Thu Jan 14 15:26:13 PST 2010
- Bump version number for ->quoted_default availability & default
0.38 Thu Jan 14 15:26:13 PST 2010
- Bump version number for ->quoted_default availability & default
diff --git
a/DBSchema/DBD/mysql.pm
b/DBSchema/DBD/mysql.pm
index
148d215
..
7f3582f
100644
(file)
--- a/
DBSchema/DBD/mysql.pm
+++ b/
DBSchema/DBD/mysql.pm
@@
-48,9
+48,13
@@
sub columns {
my($type, $length) = ($1, $2);
my $default = $_->{'Default'};
my($type, $length) = ($1, $2);
my $default = $_->{'Default'};
- $default = '' unless defined($default);
- $default = \0 if $default eq '0';
- $default = \'NOW()' if uc($default) eq 'CURRENT_TIMESTAMP';
+ if ( defined($default) ) {
+ $default = \"''" if $default eq '';
+ $default = \0 if $default eq '0';
+ $default = \'NOW()' if uc($default) eq 'CURRENT_TIMESTAMP';
+ } else {
+ $default = '';
+ }
[
$_->{'Field'},
[
$_->{'Field'},