Add correct ->belongs_to for arbitrary orders and add token columns o…

…nly at _create_db time
avar · Mar 16, 2010 · b0c97da · b0c97da
1 parent adc95e7
commit b0c97da
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/lib/Hailo/Storage/DBD.pm b/lib/Hailo/Storage/DBD.pm
@@ -107,10 +107,6 @@ has _boundary_token_id => (
 sub _engage {
     my ($self) = @_;
 
-    for (0 .. $self->order - 1) {
-        Hailo::Storage::Schema::Result::Expr->add_tokenN_id($_);
-    }
-
     if ($self->_exists_db) {
         my $schema =  $self->schema;
 
@@ -187,8 +183,13 @@ sub stop_learning {
 
 sub _create_db {
     my ($self) = @_;
+
     chomp(my @statements = $self->_table_sql);
 
+    for (0 .. $self->order - 1) {
+        Hailo::Storage::Schema::Result::Expr->add_tokenN_id($_);
+    }
+
     for (@statements) {
         $self->dbh->do($_);
     }

diff --git a/lib/Hailo/Storage/Schema/Result/Expr.pm b/lib/Hailo/Storage/Schema/Result/Expr.pm
@@ -59,42 +59,27 @@ sub add_tokenN_id {
             size => undef,
         },
     );
+
+    __PACKAGE__->belongs_to(
+        "token${n}",
+        "Hailo::Storage::Schema::Result::Token",
+        { id => "token${n}_id" },
+        {},
+    );
 }
 
 __PACKAGE__->set_primary_key("id");
 
 =head1 RELATIONS
 
-=head2 token0
+=head2 token*
 
 Type: belongs_to
 
 Related object: L<Hailo::Storage::Schema::Result::Token>
 
 =cut
 
-__PACKAGE__->belongs_to(
-  "token0",
-  "Hailo::Storage::Schema::Result::Token",
-  { id => "token0_id" },
-  {},
-);
-
-=head2 token1
-
-Type: belongs_to
-
-Related object: L<Hailo::Storage::Schema::Result::Token>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "token1",
-  "Hailo::Storage::Schema::Result::Token",
-  { id => "token1_id" },
-  {},
-);
-
 =head2 next_tokens
 
 Type: has_many