Changeset 15 in bookmarks for trunk

Timestamp:

02/09/13 21:02:43 (12 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)

Location:

trunk

Files:

• BookmarkApp.pm (modified) (2 diffs)
• Bookmarks.pm (modified) (3 diffs)
• bkmk (modified) (2 diffs)
• bookmarks.sql (modified) (2 diffs)

trunk/BookmarkApp.pm

@@ -6 +6 @@
 use CGI::Application::Plugin::TT;
 
-use DBI;
 use Encode;
 use JSON;
@@ -18 +17 @@
 $base_uri->path($ENV{SCRIPT_NAME} . '/');
 
-my $dbname = 'new.db';
-my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", { RaiseError => 1 });
+my $dbname = 'fk.db';
 my $bookmarks = Bookmarks->new({
-    dbh => $dbh,
+    dbname   => $dbname,
     base_uri => $base_uri->canonical,
 });

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 ($@) {

trunk/bkmk

@@ -2 +2 @@
 use strict;
 
-use DBI;
 use YAML;
 use Bookmarks;
+use Getopt::Long;
 
-my $dbname = 'new.db';
+GetOptions(
+    'file|f=s' => \my $DBNAME,
+);
 
-my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", { RaiseError => 1, PrintError => 0 });
+die "Usage: $0 --file <dbname> <command>\n" unless $DBNAME;
 
 my $bookmarks = Bookmarks->new({
-    dbh => $dbh,
+    dbname => $DBNAME,
 });
 
@@ -34 +36 @@
         # TODO: coordinate this commandline script with the CGI app
         print Dump(\@resources);
-    }
+    },
+    load => sub {
+        my ($src_file) = @_;
+        my $src_bookmarks = YAML::LoadFile($src_file);
+        for my $bookmark (@{ $src_bookmarks }) {
+            $bookmarks->add($bookmark);
+        }
+    },
 );
 

trunk/bookmarks.sql

@@ -8 +8 @@
 create table bookmarks (
     id integer primary key,
-    uri varchar,
+    uri varchar references resources(uri) on update cascade,
     ctime integer, -- creation time of the bookmark
     mtime integer,  -- modification time of the bookmark
@@ -34 +34 @@
 -- TODO: machine-tag style tags? e.g. format:video or creator:NASA; implicit tag prefix is "subject:"
 create table tags (
-    uri varchar,
+    uri varchar references resources(uri) on update cascade,
     tag varchar,
     constraint unique_tag primary key (uri, tag)