summaryrefslogtreecommitdiff
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Database.php9
-rw-r--r--system/libraries/ORM.php4
-rw-r--r--system/libraries/Session.php9
-rw-r--r--system/libraries/drivers/Database.php4
4 files changed, 19 insertions, 7 deletions
diff --git a/system/libraries/Database.php b/system/libraries/Database.php
index 6267f63a..2039371c 100644
--- a/system/libraries/Database.php
+++ b/system/libraries/Database.php
@@ -2,7 +2,7 @@
/**
* Provides database access in a platform agnostic way, using simple query building blocks.
*
- * $Id: Database.php 4342 2009-05-08 16:56:01Z jheathco $
+ * $Id: Database.php 4438 2009-07-06 04:11:16Z kiall $
*
* @package Core
* @author Kohana Team
@@ -1144,7 +1144,12 @@ class Database_Core {
$query = $this->select('COUNT(*) AS '.$this->escape_column('records_found'))->get()->result(TRUE);
- return (int) $query->current()->records_found;
+ $query = $query->current();
+
+ if ( ! $query)
+ return 0;
+ else
+ return (int) $query->records_found;
}
/**
diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php
index c1048604..5196ba27 100644
--- a/system/libraries/ORM.php
+++ b/system/libraries/ORM.php
@@ -1295,7 +1295,9 @@ class ORM_Core {
$value = (float) $value;
break;
case 'boolean':
- $value = (bool) $value;
+ if ($value === "t") $value = true; // For PgSQL
+ else if ($value === "f") $value = false; // For PgSQL
+ else $value = (bool) $value;
break;
case 'string':
$value = (string) $value;
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 670ee6a6..51acce00 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -2,7 +2,7 @@
/**
* Session library.
*
- * $Id: Session.php 4433 2009-07-01 03:44:20Z kiall $
+ * $Id: Session.php 4493 2009-07-27 20:05:41Z ixmatus $
*
* @package Core
* @author Kohana Team
@@ -43,11 +43,16 @@ class Session_Core {
return Session::$instance;
}
+
+ /**
+ * Be sure to block the use of __clone.
+ */
+ private function __clone(){}
/**
* On first session instance creation, sets up the driver and creates session.
*/
- public function __construct()
+ protected function __construct()
{
$this->input = Input::instance();
diff --git a/system/libraries/drivers/Database.php b/system/libraries/drivers/Database.php
index 807469f6..27f6ea8e 100644
--- a/system/libraries/drivers/Database.php
+++ b/system/libraries/drivers/Database.php
@@ -120,7 +120,7 @@ abstract class Database_Driver {
$key .= ' =';
}
- $value = ($value == TRUE) ? ' 1' : ' 0';
+ $value = ($value == TRUE) ? ' TRUE' : ' FALSE';
}
else
{
@@ -310,7 +310,7 @@ abstract class Database_Driver {
$value = '\''.$this->escape_str($value).'\'';
break;
case 'boolean':
- $value = (int) $value;
+ $value = ($value == TRUE) ? 'TRUE' : 'FALSE';
break;
case 'double':
// Convert to non-locale aware float to prevent possible commas