joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Ripped out Mongo code, it's not being used and not being developed against at this time.

Browse source
This commit is contained in:
Josh Sherman 2011-11-06 20:53:48 -05:00
parent 9fa67d0717
commit dd4fb702eb
4 changed files with 68 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/Database.php
View file

@ -85,7 +85,6 @@ class Database extends Object
// Checks the driver is legit and scrubs the name
switch ($datasource['driver'])
{
case 'mongo': $class = 'Mongo'; break;
case 'pdo_mysql': $class = 'PDO_MySQL'; break;
case 'pdo_pgsql': $class = 'PDO_PostgreSQL'; break;
case 'pdo_sqlite': $class = 'PDO_SQLite'; break;

119
classes/Database/Mongo.php
View file

@ -1,119 +0,0 @@
<?php
/**
* Mongo Class File for PICKLES
*
* PHP version 5
*
* Licensed under The MIT License
* Redistribution of these files must retain the above copyright notice.
*
* @author Josh Sherman <josh@gravityblvd.com>
* @copyright Copyright 2007-2011, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES
* @link http://p.ickl.es
*/
/**
* Mongo Database Abstraction Layer
*
* This database class is still considered incomplete and very experimental.
*/
class Database_Mongo extends Database_Common
{
/**
* Driver
*
* @access protected
* @var string
*/
protected $driver = 'mongo';
/**
* Opens database connection
*
* Establishes a connection to the database based on the set configuration
* options.
*
* @return boolean true on success, throws an exception overwise
*/
public function open()
{
if ($this->connection === null)
{
// Assembles the server string
$server = 'mongodb://';
if (isset($this->username))
{
$server .= $this->username;
if (isset($this->password))
{
$server .= ':' . $this->password;
}
$server .= '@';
}
$server .= $this->hostname . ':' . $this->port . '/' . $this->database;
// Attempts to connect
try
{
$this->connection = new Mongo($server, array('persist' => 'pickles'));
// If we have database and collection, attempt to assign them
if (isset($this->database))
{
$this->connection = $this->connection->selectDB($this->database);
}
}
catch (Exception $exception)
{
throw new Exception('Unable to connect to Mongo database');
}
}
return true;
}
/**
* Closes database connection
*
* Sets the connection to null regardless of state.
*
* @return boolean always true
*/
public function close()
{
try
{
$this->connection->close();
}
catch (Exception $exception)
{
// Trapping error
}
$this->connection = null;
return true;
}
/**
* Fetch records from the database
*/
public function fetch($collection, $query = array(), $fields = array())
{
$this->open();
// Pulls the results based on the type
$results = $this->connection->$collection->find($query, $fields);
return $results;
}
}
?>

76
classes/Model.php
View file

@ -338,56 +338,48 @@ class Model extends Object
$this->table = $this->collection;
}
// If we're using an RDBMS (not Mongo) proceed with using SQL to pull the data
if ($this->db->getDriver() != 'mongo')
// Starts with a basic SELECT ... FROM
$this->sql = array(
'SELECT ' . (is_array($this->fields) ? implode(', ', $this->fields) : $this->fields),
'FROM ' . $this->table,
);
switch ($type_or_parameters)
{
// Starts with a basic SELECT ... FROM
$this->sql = array(
'SELECT ' . (is_array($this->fields) ? implode(', ', $this->fields) : $this->fields),
'FROM ' . $this->table,
);
// Updates query to use COUNT syntax
case 'count':
$this->sql[0] = 'SELECT COUNT(*) AS count';
$this->generateQuery();
break;
switch ($type_or_parameters)
{
// Updates query to use COUNT syntax
case 'count':
$this->sql[0] = 'SELECT COUNT(*) AS count';
$this->generateQuery();
break;
// Adds the rest of the query
case 'all':
case 'list':
case 'indexed':
default:
$this->generateQuery();
break;
}
// Adds the rest of the query
case 'all':
case 'list':
case 'indexed':
default:
$this->generateQuery();
break;
}
$query_database = true;
$query_database = true;
if (isset($cache_key))
{
//$cached = $this->cache->get($cache_key);
}
if (isset($cache_key))
{
//$cached = $this->cache->get($cache_key);
}
if (isset($cached) && $cached)
{
$this->records = $cached;
}
else
{
$this->records = $this->db->fetch(implode(' ', $this->sql), (count($this->input_parameters) == 0 ? null : $this->input_parameters));
if (isset($cache_key))
{
//$this->cache->set($cache_key, $this->records);
}
}
if (isset($cached) && $cached)
{
$this->records = $cached;
}
else
{
throw new Exception('Sorry, Mongo support in the PICKLES Model is not quite ready yet');
$this->records = $this->db->fetch(implode(' ', $this->sql), (count($this->input_parameters) == 0 ? null : $this->input_parameters));
if (isset($cache_key))
{
//$this->cache->set($cache_key, $this->records);
}
}
$index_records = in_array($type_or_parameters, array('list', 'indexed'));

193
jar.php
View file

@ -1608,122 +1608,6 @@ abstract class Database_Common extends Object
abstract public function close();
}
/**
* Mongo Class File for PICKLES
*
* PHP version 5
*
* Licensed under The MIT License
* Redistribution of these files must retain the above copyright notice.
*
* @author Josh Sherman <josh@gravityblvd.com>
* @copyright Copyright 2007-2011, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES
* @link http://p.ickl.es
*/
/**
* Mongo Database Abstraction Layer
*
* This database class is still considered incomplete and very experimental.
*/
class Database_Mongo extends Database_Common
{
/**
* Driver
*
* @access protected
* @var string
*/
protected $driver = 'mongo';
/**
* Opens database connection
*
* Establishes a connection to the database based on the set configuration
* options.
*
* @return boolean true on success, throws an exception overwise
*/
public function open()
{
if ($this->connection === null)
{
// Assembles the server string
$server = 'mongodb://';
if (isset($this->username))
{
$server .= $this->username;
if (isset($this->password))
{
$server .= ':' . $this->password;
}
$server .= '@';
}
$server .= $this->hostname . ':' . $this->port . '/' . $this->database;
// Attempts to connect
try
{
$this->connection = new Mongo($server, array('persist' => 'pickles'));
// If we have database and collection, attempt to assign them
if (isset($this->database))
{
$this->connection = $this->connection->selectDB($this->database);
}
}
catch (Exception $exception)
{
throw new Exception('Unable to connect to Mongo database');
}
}
return true;
}
/**
* Closes database connection
*
* Sets the connection to null regardless of state.
*
* @return boolean always true
*/
public function close()
{
try
{
$this->connection->close();
}
catch (Exception $exception)
{
// Trapping error
}
$this->connection = null;
return true;
}
/**
* Fetch records from the database
*/
public function fetch($collection, $query = array(), $fields = array())
{
$this->open();
// Pulls the results based on the type
$results = $this->connection->$collection->find($query, $fields);
return $results;
}
}
/**
* PDO Class File for PICKLES
*
@ -2172,7 +2056,6 @@ class Database extends Object
// Checks the driver is legit and scrubs the name
switch ($datasource['driver'])
{
case 'mongo': $class = 'Mongo'; break;
case 'pdo_mysql': $class = 'PDO_MySQL'; break;
case 'pdo_pgsql': $class = 'PDO_PostgreSQL'; break;
case 'pdo_sqlite': $class = 'PDO_SQLite'; break;
@ -4367,56 +4250,48 @@ class Model extends Object
$this->table = $this->collection;
}
// If we're using an RDBMS (not Mongo) proceed with using SQL to pull the data
if ($this->db->getDriver() != 'mongo')
// Starts with a basic SELECT ... FROM
$this->sql = array(
'SELECT ' . (is_array($this->fields) ? implode(', ', $this->fields) : $this->fields),
'FROM ' . $this->table,
);
switch ($type_or_parameters)
{
// Starts with a basic SELECT ... FROM
$this->sql = array(
'SELECT ' . (is_array($this->fields) ? implode(', ', $this->fields) : $this->fields),
'FROM ' . $this->table,
);
// Updates query to use COUNT syntax
case 'count':
$this->sql[0] = 'SELECT COUNT(*) AS count';
$this->generateQuery();
break;
switch ($type_or_parameters)
{
// Updates query to use COUNT syntax
case 'count':
$this->sql[0] = 'SELECT COUNT(*) AS count';
$this->generateQuery();
break;
// Adds the rest of the query
case 'all':
case 'list':
case 'indexed':
default:
$this->generateQuery();
break;
}
// Adds the rest of the query
case 'all':
case 'list':
case 'indexed':
default:
$this->generateQuery();
break;
}
$query_database = true;
$query_database = true;
if (isset($cache_key))
{
//$cached = $this->cache->get($cache_key);
}
if (isset($cache_key))
{
//$cached = $this->cache->get($cache_key);
}
if (isset($cached) && $cached)
{
$this->records = $cached;
}
else
{
$this->records = $this->db->fetch(implode(' ', $this->sql), (count($this->input_parameters) == 0 ? null : $this->input_parameters));
if (isset($cache_key))
{
//$this->cache->set($cache_key, $this->records);
}
}
if (isset($cached) && $cached)
{
$this->records = $cached;
}
else
{
throw new Exception('Sorry, Mongo support in the PICKLES Model is not quite ready yet');
$this->records = $this->db->fetch(implode(' ', $this->sql), (count($this->input_parameters) == 0 ? null : $this->input_parameters));
if (isset($cache_key))
{
//$this->cache->set($cache_key, $this->records);
}
}
$index_records = in_array($type_or_parameters, array('list', 'indexed'));