Changeset 15 in bookmarks for trunk/Bookmarks.pm

Timestamp:

02/09/13 21:02:43 (11 years ago)

Author:

peter

Message:

• Bookmarks uses Moose instead of Class::Accessor
• if not dbh is specified in the Bookmarks constructor, it can use a dbname parameter to create a SQLite DBH
• the SQLite DBH created form dbname has the foreign_keys pragma set
• added foreign key constraints to the bookmarks.sql table definitions for bookmarks and tags
• added a required --file option to bkmk to specify the database file to use
• added a load command to bkmk that loads bookmarks dumped as YAML using bkmk list
• Bookmarks::add() can take mtime and id parameters (useful for reconstructing a database from the YAML dump of bkmk list)
• BookmarkApp and bkmk no longer use DBI directly; just pass a dbname to the Bookmarks constructor
• changed the default database for BookmarkApp to fk.db (schema from this revision's updated bookmarks.sql, with foreign keys)

File:

• trunk/Bookmarks.pm (modified) (3 diffs)

trunk/Bookmarks.pm

@@ -1 +1 @@
 package Bookmarks;
 
-use Class::Accessor 'antlers';
+use Moose;
 use SQL::Interp qw{:all};
 use Bookmark;
 
-has dbh      => ( is => 'ro' );
+has dbh      => ( is => 'rw' );
 has base_uri => ( is => 'ro' );
+
+sub BUILD {
+    my $self = shift;
+    my $args = shift;
+
+    if (!$self->dbh) {
+        if ($args->{dbname}) {
+            require DBI;
+            $self->dbh(DBI->connect("dbi:SQLite:dbname=$$args{dbname}", "", "", { RaiseError => 1, PrintError => 0 }));
+            # enable foreign key support (requires DBD::SQLite 1.26_05 or above (sqlite 3.6.19 or above))
+            $self->dbh->do('pragma foreign_keys = on;');
+        } else {
+            #TODO: figure out how to make croak play nice with Moose to get the user-visible caller line
+            die "No dbh or dbname specified in the constructor";
+        }
+    }
+}
 
 sub get_bookmark {
@@ -91 +108 @@
     my $title = $bookmark->{title};
     #TODO: accept a ctime or mtime
-    my $mtime = my $ctime = $bookmark->{ctime} || time;
+    my $ctime = $bookmark->{ctime} || time;
+    my $mtime = $bookmark->{mtime} || $ctime;
+    my $id = $bookmark->{id};
 
     # create an entry for the resource
@@ -110 +129 @@
 
     # create the bookmark
-    my $sth_bookmark = $self->dbh->prepare('insert into bookmarks (uri, ctime, mtime) values (?, ?, ?)');
+    my ($sql_bookmark, @bind_bookmark) = sql_interp(
+        'insert into bookmarks', { ($id ? (id => $id) : ()), uri => $uri, ctime => $ctime, mtime => $mtime }
+    );
+    my $sth_bookmark = $self->dbh->prepare($sql_bookmark);
     eval {
-        $sth_bookmark->execute($uri, $ctime, $mtime);
+        $sth_bookmark->execute(@bind_bookmark);
     };
     if ($@) {