Changeset 404

Timestamp:

02/04/08 22:09:56 (10 months ago)

Author:

eevee

Message:

Bit of a shoutbox test. Not particularly amazing. For the life of me I can't figure out how to log in and stay that way. (#152)
Tossing in my schema cleanup script, too. Ugh dirty mixed commits~

Location:

veekun/trunk

Files:

• lib/Vee/Model/DBIC.pm (modified) (1 diff)
• lib/Vee/Schema.pm (modified) (1 diff)
• lib/Vee/Schema/Sessions.pm (modified) (1 diff)
• lib/Vee/Schema/Shoutbox.pm (modified) (1 diff)
• script/utils/schema-cleanup.pl (added)
• t/controller_Shoutbox.t (deleted)
• t/shoutbox.t (added)

veekun/trunk/lib/Vee/Model/DBIC.pm

@@ -8 +8 @@
 
 sub new {
+    # For testing purposes, allow use of a temporary SQLite db
+    if ($ENV{VEEKUN_USE_TEMP_DB}) {
+        # Use Catalyst's global config override and an in-memory db
+        $_[-1]->{connect_info} = ["dbi:SQLite:dbname=:memory:"];
+    }
+
     my $self = shift->NEXT::new(@_);
 
+    if ($ENV{VEEKUN_USE_TEMP_DB}) {
+        $self->schema->add_simple_column_types;
+        $self->schema->deploy({ producer => 'SQLite' });
+    }
+
+    # TODO: What to do here?  Temp db won't have any data!
     Vee::Dex::initialize( $self );
 

veekun/trunk/lib/Vee/Schema.pm

@@ -1 +1 @@
 package Vee::Schema;
-
-# Created by DBIx::Class::Schema::Loader v0.03003 @ 2006-07-09 12:56:13
 
 use strict;
 use warnings;
-
 use base 'DBIx::Class::Schema';
 
 __PACKAGE__->load_classes;
 
+=head1 METHODS
+
+=head2 add_simple_column_types
+
+Iterates over every column in every table in the schema.  Primary key columns
+named C<id> are given a C<data_type> of C<integer>; all other columns are set
+C<is_nullable>.
+
+This method is really a hack for deploying the schema to SQLite and testing with
+dummy data; autoincrement will only work on single-column integral primary keys,
+and defaults for every column would be a pain to mark just for tests.
+
+=cut
+
+sub add_simple_column_types {
+    my ($self) = @_;
+
+    for my $table_name ($self->sources) {
+        my $table = $self->source($table_name);
+
+        for my $column_name ($table->columns) {
+            my $column_info = $table->column_info($column_name);
+
+            # sessions table uses a string, as dictated by Session plugin
+            if ($table_name ne 'Sessions' and
+                $column_name eq 'id' and
+                join("\0", $table->primary_columns) eq 'id')
+            {
+                $column_info->{data_type} = 'integer';
+            } else {
+                $column_info->{is_nullable} = 1;
+            }
+        }
+    }
+}
+
 1;

veekun/trunk/lib/Vee/Schema/Sessions.pm

@@ -13 +13 @@
 __PACKAGE__->load_components('Core');
 __PACKAGE__->table('sessions');
-__PACKAGE__->add_columns(qw/ id userid expires data /);
+# All these columns need to be NULLable for deployment, as Catalyst's session
+# handling is dumb and insists on shoving useless undef values into this table.
+__PACKAGE__->add_columns(
+    'id',
+    userid  => { is_nullable => 1 },
+    expires => { is_nullable => 1 },
+    data    => { is_nullable => 1 },
+);
 __PACKAGE__->set_primary_key('id');
 

veekun/trunk/lib/Vee/Schema/Shoutbox.pm

@@ -13 +13 @@
 __PACKAGE__->load_components('Core');
 __PACKAGE__->table('shoutbox');
-__PACKAGE__->add_columns(qw/ id name userid ip time message /);
+__PACKAGE__->add_columns(
+    qw/ id name /,
+    userid => { is_nullable => 1 },
+    qw/ ip time message /
+);
 __PACKAGE__->set_primary_key('id');