Changeset 6

Timestamp:

05/03/06 23:59:06 (4 years ago)

Author:

sky

Message:

r9@crucially-3 (orig r926): btrott | 2005-06-23 14:32:15 -0700
Moved default init_db into DBI.pm.
Removed audit stuff from BaseObject.

Location:

trunk/lib/Data

Files:

• ObjectDriver.pm (modified) (1 diff)
• ObjectDriver/BaseObject.pm (modified) (1 diff)
• ObjectDriver/Driver/DBI.pm (modified) (2 diffs)
• ObjectDriver/Driver/DBI/Pg.pm (added)
• ObjectDriver/Driver/DBI/mysql.pm (modified) (1 diff)

trunk/lib/Data/ObjectDriver.pm

@@ -10 +10 @@
 ## refactoring the DBI.pm code
 ##      - ability to define column => database for each value
-##      - plugin interface for doing things like audit, filters
+##      - plugin interface for doing things like audit, filters, column_defs
 ## test suite
 ## dbh needs to stay around at least as long as sth in iterator

trunk/lib/Data/ObjectDriver/BaseObject.pm

@@ -83 +83 @@
 
 sub column_names {
-    my $obj = shift;
-    my $props = $obj->properties;
-    my @cols = @{ $props->{columns} };
-    push @cols, qw( created_on modified_on )
-        if $props->{audit};
-    \@cols;
+    ## Reference to a copy.
+    [ @{ shift->properties->{columns} } ]
 }
 

trunk/lib/Data/ObjectDriver/Driver/DBI.pm

@@ -22 +22 @@
     ## Rebless the driver into the DSN-specific subclass (e.g. "mysql").
     my($type) = lc($driver->dsn) =~ /^dbi:(\w*)/;
-    my $class = __PACKAGE__ . '::' . $type;
+    my $class = ref($driver) . '::' . $type;
     eval "use $class";
     die $@ if $@;
@@ -45 +45 @@
 # Override in DB Driver to pass correct attributes to bind_param call
 sub bind_param_attributes { return undef }
+
+sub init_db {
+    my $driver = shift;
+    my $dbh;
+    eval {
+        local $SIG{ALRM} = sub { die "alarm\n" };
+        $dbh = DBI->connect($driver->dsn, $driver->username, $driver->password,
+            { RaiseError => 1, PrintError => 0, AutoCommit => 1 })
+            or Carp::croak("Connection error: " . $DBI::errstr);
+        alarm 0;
+    };
+    if ($@) {
+        Carp::croak(@$ eq "alarm\n" ? "Connection timeout" : $@);
+    }
+    $dbh;
+}
 
 sub rw_handle {

trunk/lib/Data/ObjectDriver/Driver/DBI/mysql.pm

@@ -9 +9 @@
 sub fetch_id { $_[1]->{mysql_insertid} || $_[1]->{insertid} }
 
-sub init_db {
-    my $driver = shift;
-    my $dbh;
-    eval {
-        local $SIG{ALRM} = sub { die "alarm\n" };
-        $dbh = DBI->connect($driver->dsn, $driver->username, $driver->password,
-            { RaiseError => 1, PrintError => 0, AutoCommit => 1 })
-            or Carp::croak("Connection error: " . $DBI::errstr);
-        alarm 0;
-    };
-    if ($@) {
-        Carp::croak(@$ eq "alarm\n" ? "Connection timeout" : $@);
-    }
-    $dbh;
-}
-
 sub commit   { 1 }
 sub rollback { 1 }