From 8b70136dd661a16010f0fe9358fc23a134941c2a Mon Sep 17 00:00:00 2001 From: James Date: Fri, 2 Nov 2012 17:44:06 -0400 Subject: [PATCH] CC-4661: Listener Statistics - db change commit --- .../airtime/map/CcListenerCountTableMap.php | 1 + .../models/airtime/om/BaseCcListenerCount.php | 50 ++++++++++++++++++- .../airtime/om/BaseCcListenerCountPeer.php | 31 +++++++----- .../airtime/om/BaseCcListenerCountQuery.php | 26 ++++++++++ airtime_mvc/build/schema.xml | 1 + airtime_mvc/build/sql/schema.sql | 1 + 6 files changed, 96 insertions(+), 14 deletions(-) diff --git a/airtime_mvc/application/models/airtime/map/CcListenerCountTableMap.php b/airtime_mvc/application/models/airtime/map/CcListenerCountTableMap.php index 0348ceaa5..40efa51fe 100644 --- a/airtime_mvc/application/models/airtime/map/CcListenerCountTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcListenerCountTableMap.php @@ -41,6 +41,7 @@ class CcListenerCountTableMap extends TableMap { $this->addPrimaryKey('ID', 'DbId', 'INTEGER', true, null, null); $this->addForeignKey('TIMESTAMP_ID', 'DbTimestampId', 'INTEGER', 'cc_timestamp', 'ID', true, null, null); $this->addColumn('LISTENER_COUNT', 'DbListenerCount', 'INTEGER', true, null, null); + $this->addColumn('MOUNT_NAME', 'DbMountName', 'VARCHAR', true, 255, null); // validators } // initialize() diff --git a/airtime_mvc/application/models/airtime/om/BaseCcListenerCount.php b/airtime_mvc/application/models/airtime/om/BaseCcListenerCount.php index ac145edbe..f831ccce6 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcListenerCount.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcListenerCount.php @@ -42,6 +42,12 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent */ protected $listener_count; + /** + * The value for the mount_name field. + * @var string + */ + protected $mount_name; + /** * @var CcTimestamp */ @@ -91,6 +97,16 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent return $this->listener_count; } + /** + * Get the [mount_name] column value. + * + * @return string + */ + public function getDbMountName() + { + return $this->mount_name; + } + /** * Set the value of [id] column. * @@ -155,6 +171,26 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent return $this; } // setDbListenerCount() + /** + * Set the value of [mount_name] column. + * + * @param string $v new value + * @return CcListenerCount The current object (for fluent API support) + */ + public function setDbMountName($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->mount_name !== $v) { + $this->mount_name = $v; + $this->modifiedColumns[] = CcListenerCountPeer::MOUNT_NAME; + } + + return $this; + } // setDbMountName() + /** * Indicates whether the columns in this object are only set to default values. * @@ -190,6 +226,7 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent $this->id = ($row[$startcol + 0] !== null) ? (int) $row[$startcol + 0] : null; $this->timestamp_id = ($row[$startcol + 1] !== null) ? (int) $row[$startcol + 1] : null; $this->listener_count = ($row[$startcol + 2] !== null) ? (int) $row[$startcol + 2] : null; + $this->mount_name = ($row[$startcol + 3] !== null) ? (string) $row[$startcol + 3] : null; $this->resetModified(); $this->setNew(false); @@ -198,7 +235,7 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent $this->ensureConsistency(); } - return $startcol + 3; // 3 = CcListenerCountPeer::NUM_COLUMNS - CcListenerCountPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 4; // 4 = CcListenerCountPeer::NUM_COLUMNS - CcListenerCountPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating CcListenerCount object", $e); @@ -534,6 +571,9 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent case 2: return $this->getDbListenerCount(); break; + case 3: + return $this->getDbMountName(); + break; default: return null; break; @@ -561,6 +601,7 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent $keys[0] => $this->getDbId(), $keys[1] => $this->getDbTimestampId(), $keys[2] => $this->getDbListenerCount(), + $keys[3] => $this->getDbMountName(), ); if ($includeForeignObjects) { if (null !== $this->aCcTimestamp) { @@ -606,6 +647,9 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent case 2: $this->setDbListenerCount($value); break; + case 3: + $this->setDbMountName($value); + break; } // switch() } @@ -633,6 +677,7 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent if (array_key_exists($keys[0], $arr)) $this->setDbId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setDbTimestampId($arr[$keys[1]]); if (array_key_exists($keys[2], $arr)) $this->setDbListenerCount($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setDbMountName($arr[$keys[3]]); } /** @@ -647,6 +692,7 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent if ($this->isColumnModified(CcListenerCountPeer::ID)) $criteria->add(CcListenerCountPeer::ID, $this->id); if ($this->isColumnModified(CcListenerCountPeer::TIMESTAMP_ID)) $criteria->add(CcListenerCountPeer::TIMESTAMP_ID, $this->timestamp_id); if ($this->isColumnModified(CcListenerCountPeer::LISTENER_COUNT)) $criteria->add(CcListenerCountPeer::LISTENER_COUNT, $this->listener_count); + if ($this->isColumnModified(CcListenerCountPeer::MOUNT_NAME)) $criteria->add(CcListenerCountPeer::MOUNT_NAME, $this->mount_name); return $criteria; } @@ -710,6 +756,7 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent { $copyObj->setDbTimestampId($this->timestamp_id); $copyObj->setDbListenerCount($this->listener_count); + $copyObj->setDbMountName($this->mount_name); $copyObj->setNew(true); $copyObj->setDbId(NULL); // this is a auto-increment column, so set to default value @@ -810,6 +857,7 @@ abstract class BaseCcListenerCount extends BaseObject implements Persistent $this->id = null; $this->timestamp_id = null; $this->listener_count = null; + $this->mount_name = null; $this->alreadyInSave = false; $this->alreadyInValidation = false; $this->clearAllReferences(); diff --git a/airtime_mvc/application/models/airtime/om/BaseCcListenerCountPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcListenerCountPeer.php index 4123bfed5..ce9336bcb 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcListenerCountPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcListenerCountPeer.php @@ -26,7 +26,7 @@ abstract class BaseCcListenerCountPeer { const TM_CLASS = 'CcListenerCountTableMap'; /** The total number of columns. */ - const NUM_COLUMNS = 3; + const NUM_COLUMNS = 4; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -40,6 +40,9 @@ abstract class BaseCcListenerCountPeer { /** the column name for the LISTENER_COUNT field */ const LISTENER_COUNT = 'cc_listener_count.LISTENER_COUNT'; + /** the column name for the MOUNT_NAME field */ + const MOUNT_NAME = 'cc_listener_count.MOUNT_NAME'; + /** * An identiy map to hold any loaded instances of CcListenerCount objects. * This must be public so that other peer classes can access this when hydrating from JOIN @@ -56,12 +59,12 @@ abstract class BaseCcListenerCountPeer { * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('DbId', 'DbTimestampId', 'DbListenerCount', ), - BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbTimestampId', 'dbListenerCount', ), - BasePeer::TYPE_COLNAME => array (self::ID, self::TIMESTAMP_ID, self::LISTENER_COUNT, ), - BasePeer::TYPE_RAW_COLNAME => array ('ID', 'TIMESTAMP_ID', 'LISTENER_COUNT', ), - BasePeer::TYPE_FIELDNAME => array ('id', 'timestamp_id', 'listener_count', ), - BasePeer::TYPE_NUM => array (0, 1, 2, ) + BasePeer::TYPE_PHPNAME => array ('DbId', 'DbTimestampId', 'DbListenerCount', 'DbMountName', ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbTimestampId', 'dbListenerCount', 'dbMountName', ), + BasePeer::TYPE_COLNAME => array (self::ID, self::TIMESTAMP_ID, self::LISTENER_COUNT, self::MOUNT_NAME, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID', 'TIMESTAMP_ID', 'LISTENER_COUNT', 'MOUNT_NAME', ), + BasePeer::TYPE_FIELDNAME => array ('id', 'timestamp_id', 'listener_count', 'mount_name', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) ); /** @@ -71,12 +74,12 @@ abstract class BaseCcListenerCountPeer { * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbTimestampId' => 1, 'DbListenerCount' => 2, ), - BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbTimestampId' => 1, 'dbListenerCount' => 2, ), - BasePeer::TYPE_COLNAME => array (self::ID => 0, self::TIMESTAMP_ID => 1, self::LISTENER_COUNT => 2, ), - BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'TIMESTAMP_ID' => 1, 'LISTENER_COUNT' => 2, ), - BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'timestamp_id' => 1, 'listener_count' => 2, ), - BasePeer::TYPE_NUM => array (0, 1, 2, ) + BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbTimestampId' => 1, 'DbListenerCount' => 2, 'DbMountName' => 3, ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbTimestampId' => 1, 'dbListenerCount' => 2, 'dbMountName' => 3, ), + BasePeer::TYPE_COLNAME => array (self::ID => 0, self::TIMESTAMP_ID => 1, self::LISTENER_COUNT => 2, self::MOUNT_NAME => 3, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'TIMESTAMP_ID' => 1, 'LISTENER_COUNT' => 2, 'MOUNT_NAME' => 3, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'timestamp_id' => 1, 'listener_count' => 2, 'mount_name' => 3, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) ); /** @@ -151,10 +154,12 @@ abstract class BaseCcListenerCountPeer { $criteria->addSelectColumn(CcListenerCountPeer::ID); $criteria->addSelectColumn(CcListenerCountPeer::TIMESTAMP_ID); $criteria->addSelectColumn(CcListenerCountPeer::LISTENER_COUNT); + $criteria->addSelectColumn(CcListenerCountPeer::MOUNT_NAME); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.TIMESTAMP_ID'); $criteria->addSelectColumn($alias . '.LISTENER_COUNT'); + $criteria->addSelectColumn($alias . '.MOUNT_NAME'); } } diff --git a/airtime_mvc/application/models/airtime/om/BaseCcListenerCountQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcListenerCountQuery.php index 3c59dc0ed..44f235115 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcListenerCountQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcListenerCountQuery.php @@ -9,10 +9,12 @@ * @method CcListenerCountQuery orderByDbId($order = Criteria::ASC) Order by the id column * @method CcListenerCountQuery orderByDbTimestampId($order = Criteria::ASC) Order by the timestamp_id column * @method CcListenerCountQuery orderByDbListenerCount($order = Criteria::ASC) Order by the listener_count column + * @method CcListenerCountQuery orderByDbMountName($order = Criteria::ASC) Order by the mount_name column * * @method CcListenerCountQuery groupByDbId() Group by the id column * @method CcListenerCountQuery groupByDbTimestampId() Group by the timestamp_id column * @method CcListenerCountQuery groupByDbListenerCount() Group by the listener_count column + * @method CcListenerCountQuery groupByDbMountName() Group by the mount_name column * * @method CcListenerCountQuery leftJoin($relation) Adds a LEFT JOIN clause to the query * @method CcListenerCountQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query @@ -28,10 +30,12 @@ * @method CcListenerCount findOneByDbId(int $id) Return the first CcListenerCount filtered by the id column * @method CcListenerCount findOneByDbTimestampId(int $timestamp_id) Return the first CcListenerCount filtered by the timestamp_id column * @method CcListenerCount findOneByDbListenerCount(int $listener_count) Return the first CcListenerCount filtered by the listener_count column + * @method CcListenerCount findOneByDbMountName(string $mount_name) Return the first CcListenerCount filtered by the mount_name column * * @method array findByDbId(int $id) Return CcListenerCount objects filtered by the id column * @method array findByDbTimestampId(int $timestamp_id) Return CcListenerCount objects filtered by the timestamp_id column * @method array findByDbListenerCount(int $listener_count) Return CcListenerCount objects filtered by the listener_count column + * @method array findByDbMountName(string $mount_name) Return CcListenerCount objects filtered by the mount_name column * * @package propel.generator.airtime.om */ @@ -220,6 +224,28 @@ abstract class BaseCcListenerCountQuery extends ModelCriteria return $this->addUsingAlias(CcListenerCountPeer::LISTENER_COUNT, $dbListenerCount, $comparison); } + /** + * Filter the query on the mount_name column + * + * @param string $dbMountName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CcListenerCountQuery The current query, for fluid interface + */ + public function filterByDbMountName($dbMountName = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbMountName)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbMountName)) { + $dbMountName = str_replace('*', '%', $dbMountName); + $comparison = Criteria::LIKE; + } + } + return $this->addUsingAlias(CcListenerCountPeer::MOUNT_NAME, $dbMountName, $comparison); + } + /** * Filter the query by a related CcTimestamp object * diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml index b13ed8f8a..de3f6481c 100644 --- a/airtime_mvc/build/schema.xml +++ b/airtime_mvc/build/schema.xml @@ -445,6 +445,7 @@ + diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql index efd765b43..6d3b061cf 100644 --- a/airtime_mvc/build/sql/schema.sql +++ b/airtime_mvc/build/sql/schema.sql @@ -697,6 +697,7 @@ CREATE TABLE "cc_listener_count" "id" serial NOT NULL, "timestamp_id" INTEGER NOT NULL, "listener_count" INTEGER NOT NULL, + "mount_name" VARCHAR(255) NOT NULL, PRIMARY KEY ("id") );