From: Brian O'Connor <briandoconnor@gmail.com>
Date: Fri, 12 Mar 2004 20:20:44 +0000 (+0000)
Subject: Fixed a possible infinite loop problem where the primary key accessor calls itself... 
X-Git-Tag: v0.06~130
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a006efcbf56963bc488ac8fdeb3b998734ea1fea;p=dbsrgits%2FSQL-Translator.git

Fixed a possible infinite loop problem where the primary key accessor calls itself in the Turnkey producer.
---

diff --git a/lib/SQL/Translator/Producer/Turnkey.pm b/lib/SQL/Translator/Producer/Turnkey.pm
index 9189aa7..9be6de5 100644
--- a/lib/SQL/Translator/Producer/Turnkey.pm
+++ b/lib/SQL/Translator/Producer/Turnkey.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Producer::Turnkey;
 
 # -------------------------------------------------------------------
-# $Id: Turnkey.pm,v 1.28 2004-03-12 19:04:34 boconnor Exp $
+# $Id: Turnkey.pm,v 1.29 2004-03-12 20:20:44 boconnor Exp $
 # -------------------------------------------------------------------
 # Copyright (C) 2002-4 SQLFairy Authors
 #
@@ -22,7 +22,7 @@ package SQL::Translator::Producer::Turnkey;
 
 use strict;
 use vars qw[ $VERSION $DEBUG ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.28 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.29 $ =~ /(\d+)\.(\d+)/;
 $DEBUG   = 1 unless defined $DEBUG;
 
 use SQL::Translator::Schema::Constants;
@@ -234,9 +234,10 @@ use Class::DBI::Pager;
 #
 # Primary key accessors
 #
+
 [% FOREACH item = array %]
-sub id { shift->[% item %] }
-sub [% name %] { shift->[% item %] }
+[% IF item != "id" %]sub id { shift->[% item %] }[% END %]
+[% IF item != name %]sub [% name %] { shift->[% item %] }[% END %]
 [% END %]
 
 [% END %]