From 0e4419ba673f1f87a60aef9cef08ac77bacc9a51 Mon Sep 17 00:00:00 2001
From: Felix Labrecque <felixl@felix-ubuntu.densi.com>
Date: Tue, 4 Dec 2012 10:48:16 -0500
Subject: [PATCH] I found the error in my latest commit. This pass the test
 suite.

---
 .../Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php        | 2 +-
 src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php       | 4 +++-
 .../Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php       | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
index 82d5e9d49d..684b385edc 100644
--- a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
+++ b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
@@ -374,6 +374,6 @@ class ModelChoiceList extends ObjectChoiceList
      */
     private function isInteger($col)
     {
-      return $col->getType() === \PDO::PARAM_INT;
+      return $col->getPdoType() === \PDO::PARAM_INT;
     }
 }
diff --git a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
index 75d2a4f731..b86ed421fd 100644
--- a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
+++ b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
@@ -31,7 +31,9 @@ class ItemQuery
 
     public function getPrimaryKeys()
     {
-        return array('id');
+        $cm = new ColumnMap('id', $this);
+        $cm->setType('INTEGER');
+        return array('id' => $cm);
     }
 
     /**
diff --git a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php
index 8c9677f33d..974e923dc9 100644
--- a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php
+++ b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php
@@ -22,6 +22,8 @@ class ReadOnlyItemQuery
 
     public function getPrimaryKeys()
     {
-        return array('id');
+        $cm = new ColumnMap('id', $this);
+        $cm->setType('INTEGER');
+        return array('id' => $cm);
     }
 }