[limb-svn] r5954 - in 3.x/trunk/limb/dbal: src/drivers/sqlite tests/cases/driver tests/cases/driver/sqlite
svn at limb-project.com
svn at limb-project.com
Thu Jun 7 02:27:43 MSD 2007
Author: pachanga
Date: 2007-06-07 02:27:43 +0400 (Thu, 07 Jun 2007)
New Revision: 5954
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5954
Modified:
3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteConnection.class.php
3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteDbInfo.class.php
3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteQueryStatement.class.php
3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteRecordSet.class.php
3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteTableInfo.class.php
3.x/trunk/limb/dbal/tests/cases/driver/DriverManipTestBase.class.php
3.x/trunk/limb/dbal/tests/cases/driver/sqlite/fixture.inc.php
Log:
-- a small step forward - sqlite insert tests do pass
-- sqlite misc minor typo fixes
Modified: 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteConnection.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteConnection.class.php 2007-06-06 16:28:38 UTC (rev 5953)
+++ 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteConnection.class.php 2007-06-06 22:27:43 UTC (rev 5954)
@@ -1,10 +1,10 @@
<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com
- * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
- * @license LGPL http://www.gnu.org/copyleft/lesser.html
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
+ * @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
lmb_require('limb/dbal/src/drivers/lmbDbConnection.interface.php');
@@ -13,14 +13,14 @@
lmb_require(dirname(__FILE__) . '/lmbSqliteInsertStatement.class.php');
lmb_require(dirname(__FILE__) . '/lmbSqliteManipulationStatement.class.php');
lmb_require(dirname(__FILE__) . '/lmbSqliteStatement.class.php');
-lmb_require(dirname(__FILE__) . '/lmbSqliteTypeInfo.class.php');
-
+lmb_require(dirname(__FILE__) . '/lmbSqliteTypeInfo.class.php');
+
/**
* class lmbSqliteConnection.
*
* @package dbal
* @version $Id$
- */
+ */
class lmbSqliteConnection implements lmbDbConnection
{
protected $connectionId;
@@ -39,9 +39,8 @@
function getConnectionId()
{
if(!isset($this->connectionId))
- {
$this->connect();
- }
+
return $this->connectionId;
}
@@ -66,7 +65,7 @@
function disconnect()
{
if($this->connectionId)
- {
+ {
sqlite_close($this->connectionId);
$this->connectionId = null;
}
Modified: 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteDbInfo.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteDbInfo.class.php 2007-06-06 16:28:38 UTC (rev 5953)
+++ 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteDbInfo.class.php 2007-06-06 22:27:43 UTC (rev 5954)
@@ -7,13 +7,13 @@
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
lmb_require('limb/dbal/src/drivers/lmbDbInfo.class.php');
-lmb_require('limb/dbal/src/drivers/mysql/lmbSqliteTableInfo.class.php');
+lmb_require('limb/dbal/src/drivers/sqlite/lmbSqliteTableInfo.class.php');
-/**
- * class lmbSqliteDbInfo.
- *
- * @package dbal
- * @version $Id$
+/**
+ * class lmbSqliteDbInfo.
+ *
+ * @package dbal
+ * @version $Id$
*/
class lmbSqliteDbInfo extends lmbDbInfo
{
Modified: 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteQueryStatement.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteQueryStatement.class.php 2007-06-06 16:28:38 UTC (rev 5953)
+++ 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteQueryStatement.class.php 2007-06-06 22:27:43 UTC (rev 5954)
@@ -12,11 +12,11 @@
lmb_require(dirname(__FILE__) . '/lmbSqliteRecord.class.php');
lmb_require(dirname(__FILE__) . '/lmbSqliteRecordSet.class.php');
-/**
- * class lmbSqliteQueryStatement.
- *
- * @package dbal
- * @version $Id$
+/**
+ * class lmbSqliteQueryStatement.
+ *
+ * @package dbal
+ * @version $Id$
*/
class lmbSqliteQueryStatement extends lmbSqliteStatement implements lmbDbQueryStatement
{
@@ -35,9 +35,7 @@
function getOneValue()
{
$queryId = $this->connection->execute($this->getSQL());
- $row = sqlite_fetch_single($queryId);
- if(is_array($row))
- return $row[0];
+ return sqlite_fetch_single($queryId);
}
function getOneColumnAsArray()
Modified: 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteRecordSet.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteRecordSet.class.php 2007-06-06 16:28:38 UTC (rev 5953)
+++ 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteRecordSet.class.php 2007-06-06 22:27:43 UTC (rev 5954)
@@ -7,13 +7,13 @@
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
lmb_require('limb/dbal/src/drivers/lmbDbBaseRecordSet.class.php');
-lmb_require('limb/dbal/src/drivers/mysql/lmbSqliteRecord.class.php');
+lmb_require('limb/dbal/src/drivers/sqlite/lmbSqliteRecord.class.php');
-/**
- * class lmbSqliteRecordSet.
- *
- * @package dbal
- * @version $Id$
+/**
+ * class lmbSqliteRecordSet.
+ *
+ * @package dbal
+ * @version $Id$
*/
class lmbSqliteRecordSet extends lmbDbBaseRecordSet
{
Modified: 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteTableInfo.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteTableInfo.class.php 2007-06-06 16:28:38 UTC (rev 5953)
+++ 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteTableInfo.class.php 2007-06-06 22:27:43 UTC (rev 5954)
@@ -7,13 +7,13 @@
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
lmb_require('limb/dbal/src/drivers/lmbDbTableInfo.class.php');
-lmb_require('limb/dbal/src/drivers/mysql/lmbSqliteColumnInfo.class.php');
+lmb_require('limb/dbal/src/drivers/sqlite/lmbSqliteColumnInfo.class.php');
-/**
- * class lmbSqliteTableInfo.
- *
- * @package dbal
- * @version $Id$
+/**
+ * class lmbSqliteTableInfo.
+ *
+ * @package dbal
+ * @version $Id$
*/
class lmbSqliteTableInfo extends lmbDbTableInfo
{
Modified: 3.x/trunk/limb/dbal/tests/cases/driver/DriverManipTestBase.class.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/driver/DriverManipTestBase.class.php 2007-06-06 16:28:38 UTC (rev 5953)
+++ 3.x/trunk/limb/dbal/tests/cases/driver/DriverManipTestBase.class.php 2007-06-06 22:27:43 UTC (rev 5954)
@@ -9,7 +9,6 @@
abstract class DriverManipTestBase extends UnitTestCase
{
-
function checkRecord($id)
{
$sql = "SELECT * FROM founding_fathers WHERE id = :id:";
Modified: 3.x/trunk/limb/dbal/tests/cases/driver/sqlite/fixture.inc.php
===================================================================
--- 3.x/trunk/limb/dbal/tests/cases/driver/sqlite/fixture.inc.php 2007-06-06 16:28:38 UTC (rev 5953)
+++ 3.x/trunk/limb/dbal/tests/cases/driver/sqlite/fixture.inc.php 2007-06-06 22:27:43 UTC (rev 5954)
@@ -1,10 +1,10 @@
<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com
- * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
- * @license LGPL http://www.gnu.org/copyleft/lesser.html
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
+ * @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
function DriverSqliteSetup($conn)
@@ -12,7 +12,7 @@
DriverSqliteExec($conn, 'DROP TABLE founding_fathers', false);
$sql = "CREATE TABLE founding_fathers (
- id INTEGER,
+ id INTEGER PRIMARY KEY,
first VARCHAR,
last VARCHAR)";
DriverSqliteExec($conn, $sql);
@@ -29,7 +29,7 @@
DriverSqliteExec($conn, 'DROP TABLE standard_types', false);
$sql = "CREATE TABLE standard_types (
- id INTEGER,
+ id INTEGER PRIMARY KEY,
type_smallint smallint,
type_integer integer,
type_boolean smallint,
More information about the limb-svn
mailing list