Jalle19 / tvheadend-status-manager

src/cli/Jalle19/StatusManager/Configuration.php

Braces +6 added lines, -4 removed lines

@@ -92,8 +92,9 @@ 
 	 */
 	public function setUpdateInterval($updateInterval)
 	{
-		if ($updateInterval <= 0)
-			throw new \RuntimeException('Invalid update interval specified');
+		if ($updateInterval <= 0) {
+					throw new \RuntimeException('Invalid update interval specified');
+		}
 
 		$this->_updateInterval = $updateInterval;
 	}
@@ -133,8 +134,9 @@ 
 	 */
 	public function setListenPort($listenPort)
 	{
-		if ($listenPort < 1 || $listenPort > 65535)
-			throw new \RuntimeException('Invalid port specified');
+		if ($listenPort < 1 || $listenPort > 65535) {
+					throw new \RuntimeException('Invalid port specified');
+		}
 
 		$this->_listenPort = $listenPort;
 	}

src/cli/Jalle19/StatusManager/Console/Commands/TvheadendStatusManagerCommand.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 		if ($configuration === false)
 			throw new InvalidConfigurationException('Failed to parse the specified configuration file');
 
-		$instances    = [];
+		$instances = [];
 
 		// Parse sections
 		foreach ($configuration as $section => $values)

Braces +20 added lines, -14 removed lines

@@ -124,23 +124,26 @@ 
 	private function parseConfiguration(InputInterface $input)
 	{
 		// Check that the configuration file exists
-		if (!file_exists($input->getArgument('configFile')))
-			throw new InvalidConfigurationException('The specified configuration file does not exist');
+		if (!file_exists($input->getArgument('configFile'))) {
+					throw new InvalidConfigurationException('The specified configuration file does not exist');
+		}
 
 		// Check that the database exists and is writable
 		$databasePath = $input->getArgument('databaseFile');
 
-		if (!file_exists($databasePath))
-			throw new InvalidConfigurationException('The specified database path does not exist');
-		else if (!is_writable($databasePath))
-			throw new InvalidConfigurationException('The specified database path is not writable');
+		if (!file_exists($databasePath)) {
+					throw new InvalidConfigurationException('The specified database path does not exist');
+		} else if (!is_writable($databasePath)) {
+					throw new InvalidConfigurationException('The specified database path is not writable');
+		}
 
 		// Parse the configuration file
 		$configuration = parse_ini_file($input->getArgument('configFile'), true);
 
 		// Check that the file was parsed
-		if ($configuration === false)
-			throw new InvalidConfigurationException('Failed to parse the specified configuration file');
+		if ($configuration === false) {
+					throw new InvalidConfigurationException('Failed to parse the specified configuration file');
+		}
 
 		$instances    = [];
 
@@ -157,8 +160,9 @@ 
 					$instance = new Instance($name, $address, $port);
 
 					// Optionally set credentials
-					if (isset($values['username']) && isset($values['password']))
-						$instance->setCredentials($values['username'], $values['password']);
+					if (isset($values['username']) && isset($values['password'])) {
+											$instance->setCredentials($values['username'], $values['password']);
+					}
 
 					$instances[] = $instance;
 					break;
@@ -166,8 +170,9 @@ 
 		}
 
 		// Validate the configuration. We need at least one instance.
-		if (empty($instances))
-			throw new InvalidConfigurationException('No instances defined, you need to specify at least one instance');
+		if (empty($instances)) {
+					throw new InvalidConfigurationException('No instances defined, you need to specify at least one instance');
+		}
 
 		// Create the configuration object
 		$config = new Configuration($databasePath, $instances);
@@ -196,8 +201,9 @@ 
 	 */
 	private static function getSectionType($section)
 	{
-		if (substr($section, 0, 8) === 'instance')
-			return Configuration::SECTION_TYPE_INSTANCE;
+		if (substr($section, 0, 8) === 'instance') {
+					return Configuration::SECTION_TYPE_INSTANCE;
+		}
 
 		throw new InvalidConfigurationException('Unknown section "' . $section . '"');
 	}

src/cli/Jalle19/StatusManager/Database/Map/ChannelTableMap.php

Indentation +386 added lines, -386 removed lines

@@ -28,401 +28,401 @@
  */
 class ChannelTableMap extends TableMap
 {
-    use InstancePoolTrait;
-    use TableMapTrait;
-
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.ChannelTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'tvheadend_status_manager';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'channel';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Channel';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Channel';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 3;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 3;
-
-    /**
-     * the column name for the id field
-     */
-    const COL_ID = 'channel.id';
-
-    /**
-     * the column name for the instance_name field
-     */
-    const COL_INSTANCE_NAME = 'channel.instance_name';
-
-    /**
-     * the column name for the name field
-     */
-    const COL_NAME = 'channel.name';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'Name', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'name', ),
-        self::TYPE_COLNAME       => array(ChannelTableMap::COL_ID, ChannelTableMap::COL_INSTANCE_NAME, ChannelTableMap::COL_NAME, ),
-        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'name', ),
-        self::TYPE_NUM           => array(0, 1, 2, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'name' => 2, ),
-        self::TYPE_COLNAME       => array(ChannelTableMap::COL_ID => 0, ChannelTableMap::COL_INSTANCE_NAME => 1, ChannelTableMap::COL_NAME => 2, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'name' => 2, ),
-        self::TYPE_NUM           => array(0, 1, 2, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('channel');
-        $this->setPhpName('Channel');
-        $this->setIdentifierQuoting(false);
-        $this->setClassName('\\Jalle19\\StatusManager\\Database\\Channel');
-        $this->setPackage('Jalle19.StatusManager.Database');
-        $this->setUseIdGenerator(true);
-        // columns
-        $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
-        $this->addColumn('name', 'Name', 'VARCHAR', true, 255, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
+	use InstancePoolTrait;
+	use TableMapTrait;
+
+	/**
+	 * The (dot-path) name of this class
+	 */
+	const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.ChannelTableMap';
+
+	/**
+	 * The default database name for this class
+	 */
+	const DATABASE_NAME = 'tvheadend_status_manager';
+
+	/**
+	 * The table name for this class
+	 */
+	const TABLE_NAME = 'channel';
+
+	/**
+	 * The related Propel class for this table
+	 */
+	const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Channel';
+
+	/**
+	 * A class that can be returned by this tableMap
+	 */
+	const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Channel';
+
+	/**
+	 * The total number of columns
+	 */
+	const NUM_COLUMNS = 3;
+
+	/**
+	 * The number of lazy-loaded columns
+	 */
+	const NUM_LAZY_LOAD_COLUMNS = 0;
+
+	/**
+	 * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+	 */
+	const NUM_HYDRATE_COLUMNS = 3;
+
+	/**
+	 * the column name for the id field
+	 */
+	const COL_ID = 'channel.id';
+
+	/**
+	 * the column name for the instance_name field
+	 */
+	const COL_INSTANCE_NAME = 'channel.instance_name';
+
+	/**
+	 * the column name for the name field
+	 */
+	const COL_NAME = 'channel.name';
+
+	/**
+	 * The default string format for model objects of the related table
+	 */
+	const DEFAULT_STRING_FORMAT = 'YAML';
+
+	/**
+	 * holds an array of fieldnames
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+	 */
+	protected static $fieldNames = array (
+		self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'Name', ),
+		self::TYPE_CAMELNAME     => array('id', 'instanceName', 'name', ),
+		self::TYPE_COLNAME       => array(ChannelTableMap::COL_ID, ChannelTableMap::COL_INSTANCE_NAME, ChannelTableMap::COL_NAME, ),
+		self::TYPE_FIELDNAME     => array('id', 'instance_name', 'name', ),
+		self::TYPE_NUM           => array(0, 1, 2, )
+	);
+
+	/**
+	 * holds an array of keys for quick access to the fieldnames array
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+	 */
+	protected static $fieldKeys = array (
+		self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2, ),
+		self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'name' => 2, ),
+		self::TYPE_COLNAME       => array(ChannelTableMap::COL_ID => 0, ChannelTableMap::COL_INSTANCE_NAME => 1, ChannelTableMap::COL_NAME => 2, ),
+		self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'name' => 2, ),
+		self::TYPE_NUM           => array(0, 1, 2, )
+	);
+
+	/**
+	 * Initialize the table attributes and columns
+	 * Relations are not initialized by this method since they are lazy loaded
+	 *
+	 * @return void
+	 * @throws PropelException
+	 */
+	public function initialize()
+	{
+		// attributes
+		$this->setName('channel');
+		$this->setPhpName('Channel');
+		$this->setIdentifierQuoting(false);
+		$this->setClassName('\\Jalle19\\StatusManager\\Database\\Channel');
+		$this->setPackage('Jalle19.StatusManager.Database');
+		$this->setUseIdGenerator(true);
+		// columns
+		$this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
+		$this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
+		$this->addColumn('name', 'Name', 'VARCHAR', true, 255, null);
+	} // initialize()
+
+	/**
+	 * Build the RelationMap objects for this table relationships
+	 */
+	public function buildRelations()
+	{
+		$this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, null, false);
-        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
+		$this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
-    0 => ':channel_id',
-    1 => ':id',
+	0 => ':channel_id',
+	1 => ':id',
   ),
 ), null, null, 'Subscriptions', false);
-    } // buildRelations()
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return string The primary key hash of the row
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        return (int) $row[
-            $indexType == TableMap::TYPE_NUM
-                ? 0 + $offset
-                : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-        ];
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? ChannelTableMap::CLASS_DEFAULT : ChannelTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+	} // buildRelations()
+
+	/**
+	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+	 *
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return string The primary key hash of the row
+	 */
+	public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		// If the PK cannot be derived from the row, return NULL.
+		if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+			return null;
+		}
+
+		return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+	}
+
+	/**
+	 * Retrieves the primary key from the DB resultset row
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, an array of the primary key columns will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return mixed The primary key of the row
+	 */
+	public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		return (int) $row[
+			$indexType == TableMap::TYPE_NUM
+				? 0 + $offset
+				: self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+		];
+	}
+
+	/**
+	 * The class that the tableMap will make instances of.
+	 *
+	 * If $withPrefix is true, the returned path
+	 * uses a dot-path notation which is translated into a path
+	 * relative to a location on the PHP include_path.
+	 * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+	 *
+	 * @param boolean $withPrefix Whether or not to return the path with the class name
+	 * @return string path.to.ClassName
+	 */
+	public static function getOMClass($withPrefix = true)
+	{
+		return $withPrefix ? ChannelTableMap::CLASS_DEFAULT : ChannelTableMap::OM_CLASS;
+	}
+
+	/**
+	 * Populates an object of the default type or an object that inherit from the default.
+	 *
+	 * @param array  $row       row returned by DataFetcher->fetch().
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     * @return array           (Channel object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = ChannelTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = ChannelTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + ChannelTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = ChannelTableMap::OM_CLASS;
-            /** @var Channel $obj */
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            ChannelTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = ChannelTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = ChannelTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                /** @var Channel $obj */
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                ChannelTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(ChannelTableMap::COL_ID);
-            $criteria->addSelectColumn(ChannelTableMap::COL_INSTANCE_NAME);
-            $criteria->addSelectColumn(ChannelTableMap::COL_NAME);
-        } else {
-            $criteria->addSelectColumn($alias . '.id');
-            $criteria->addSelectColumn($alias . '.instance_name');
-            $criteria->addSelectColumn($alias . '.name');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(ChannelTableMap::DATABASE_NAME)->getTable(ChannelTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-        $dbMap = Propel::getServiceContainer()->getDatabaseMap(ChannelTableMap::DATABASE_NAME);
-        if (!$dbMap->hasTable(ChannelTableMap::TABLE_NAME)) {
-            $dbMap->addTableObject(new ChannelTableMap());
-        }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a Channel or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or Channel object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con the connection to use
-     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                         if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(ChannelTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Jalle19\StatusManager\Database\Channel) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(ChannelTableMap::DATABASE_NAME);
-            $criteria->add(ChannelTableMap::COL_ID, (array) $values, Criteria::IN);
-        }
-
-        $query = ChannelQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) {
-            ChannelTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) {
-                ChannelTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the channel table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return ChannelQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a Channel or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or Channel object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(ChannelTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from Channel object
-        }
-
-        if ($criteria->containsKey(ChannelTableMap::COL_ID) && $criteria->keyContainsValue(ChannelTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.ChannelTableMap::COL_ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = ChannelQuery::create()->mergeWith($criteria);
-
-        // use transaction because $criteria could contain info
-        // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
-            return $query->doInsert($con);
-        });
-    }
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+	 *
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 * @return array           (Channel object, last column rank)
+	 */
+	public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		$key = ChannelTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+		if (null !== ($obj = ChannelTableMap::getInstanceFromPool($key))) {
+			// We no longer rehydrate the object, since this can cause data loss.
+			// See http://www.propelorm.org/ticket/509
+			// $obj->hydrate($row, $offset, true); // rehydrate
+			$col = $offset + ChannelTableMap::NUM_HYDRATE_COLUMNS;
+		} else {
+			$cls = ChannelTableMap::OM_CLASS;
+			/** @var Channel $obj */
+			$obj = new $cls();
+			$col = $obj->hydrate($row, $offset, false, $indexType);
+			ChannelTableMap::addInstanceToPool($obj, $key);
+		}
+
+		return array($obj, $col);
+	}
+
+	/**
+	 * The returned array will contain objects of the default type or
+	 * objects that inherit from the default.
+	 *
+	 * @param DataFetcherInterface $dataFetcher
+	 * @return array
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function populateObjects(DataFetcherInterface $dataFetcher)
+	{
+		$results = array();
+
+		// set the class once to avoid overhead in the loop
+		$cls = static::getOMClass(false);
+		// populate the object(s)
+		while ($row = $dataFetcher->fetch()) {
+			$key = ChannelTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+			if (null !== ($obj = ChannelTableMap::getInstanceFromPool($key))) {
+				// We no longer rehydrate the object, since this can cause data loss.
+				// See http://www.propelorm.org/ticket/509
+				// $obj->hydrate($row, 0, true); // rehydrate
+				$results[] = $obj;
+			} else {
+				/** @var Channel $obj */
+				$obj = new $cls();
+				$obj->hydrate($row);
+				$results[] = $obj;
+				ChannelTableMap::addInstanceToPool($obj, $key);
+			} // if key exists
+		}
+
+		return $results;
+	}
+	/**
+	 * Add all the columns needed to create a new object.
+	 *
+	 * Note: any columns that were marked with lazyLoad="true" in the
+	 * XML schema will not be added to the select list and only loaded
+	 * on demand.
+	 *
+	 * @param Criteria $criteria object containing the columns to add.
+	 * @param string   $alias    optional table alias
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function addSelectColumns(Criteria $criteria, $alias = null)
+	{
+		if (null === $alias) {
+			$criteria->addSelectColumn(ChannelTableMap::COL_ID);
+			$criteria->addSelectColumn(ChannelTableMap::COL_INSTANCE_NAME);
+			$criteria->addSelectColumn(ChannelTableMap::COL_NAME);
+		} else {
+			$criteria->addSelectColumn($alias . '.id');
+			$criteria->addSelectColumn($alias . '.instance_name');
+			$criteria->addSelectColumn($alias . '.name');
+		}
+	}
+
+	/**
+	 * Returns the TableMap related to this object.
+	 * This method is not needed for general use but a specific application could have a need.
+	 * @return TableMap
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function getTableMap()
+	{
+		return Propel::getServiceContainer()->getDatabaseMap(ChannelTableMap::DATABASE_NAME)->getTable(ChannelTableMap::TABLE_NAME);
+	}
+
+	/**
+	 * Add a TableMap instance to the database for this tableMap class.
+	 */
+	public static function buildTableMap()
+	{
+		$dbMap = Propel::getServiceContainer()->getDatabaseMap(ChannelTableMap::DATABASE_NAME);
+		if (!$dbMap->hasTable(ChannelTableMap::TABLE_NAME)) {
+			$dbMap->addTableObject(new ChannelTableMap());
+		}
+	}
+
+	/**
+	 * Performs a DELETE on the database, given a Channel or Criteria object OR a primary key value.
+	 *
+	 * @param mixed               $values Criteria or Channel object or primary key or array of primary keys
+	 *              which is used to create the DELETE statement
+	 * @param  ConnectionInterface $con the connection to use
+	 * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+	 *                         if supported by native driver or if emulated using Propel.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	 public static function doDelete($values, ConnectionInterface $con = null)
+	 {
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(ChannelTableMap::DATABASE_NAME);
+		}
+
+		if ($values instanceof Criteria) {
+			// rename for clarity
+			$criteria = $values;
+		} elseif ($values instanceof \Jalle19\StatusManager\Database\Channel) { // it's a model object
+			// create criteria based on pk values
+			$criteria = $values->buildPkeyCriteria();
+		} else { // it's a primary key, or an array of pks
+			$criteria = new Criteria(ChannelTableMap::DATABASE_NAME);
+			$criteria->add(ChannelTableMap::COL_ID, (array) $values, Criteria::IN);
+		}
+
+		$query = ChannelQuery::create()->mergeWith($criteria);
+
+		if ($values instanceof Criteria) {
+			ChannelTableMap::clearInstancePool();
+		} elseif (!is_object($values)) { // it's a primary key, or an array of pks
+			foreach ((array) $values as $singleval) {
+				ChannelTableMap::removeInstanceFromPool($singleval);
+			}
+		}
+
+		return $query->delete($con);
+	}
+
+	/**
+	 * Deletes all rows from the channel table.
+	 *
+	 * @param ConnectionInterface $con the connection to use
+	 * @return int The number of affected rows (if supported by underlying database driver).
+	 */
+	public static function doDeleteAll(ConnectionInterface $con = null)
+	{
+		return ChannelQuery::create()->doDeleteAll($con);
+	}
+
+	/**
+	 * Performs an INSERT on the database, given a Channel or Criteria object.
+	 *
+	 * @param mixed               $criteria Criteria or Channel object containing data that is used to create the INSERT statement.
+	 * @param ConnectionInterface $con the ConnectionInterface connection to use
+	 * @return mixed           The new primary key.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function doInsert($criteria, ConnectionInterface $con = null)
+	{
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(ChannelTableMap::DATABASE_NAME);
+		}
+
+		if ($criteria instanceof Criteria) {
+			$criteria = clone $criteria; // rename for clarity
+		} else {
+			$criteria = $criteria->buildCriteria(); // build Criteria from Channel object
+		}
+
+		if ($criteria->containsKey(ChannelTableMap::COL_ID) && $criteria->keyContainsValue(ChannelTableMap::COL_ID) ) {
+			throw new PropelException('Cannot insert a value for auto-increment primary key ('.ChannelTableMap::COL_ID.')');
+		}
+
+
+		// Set the correct dbName
+		$query = ChannelQuery::create()->mergeWith($criteria);
+
+		// use transaction because $criteria could contain info
+		// for more than one table (I guess, conceivably)
+		return $con->transaction(function () use ($con, $query) {
+			return $query->doInsert($con);
+		});
+	}
 
 } // ChannelTableMap
 // This is the static code needed to register the TableMap for this table with the main Propel class.

Spacing +19 added lines, -19 removed lines

@@ -97,12 +97,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'Name', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'name', ),
-        self::TYPE_COLNAME       => array(ChannelTableMap::COL_ID, ChannelTableMap::COL_INSTANCE_NAME, ChannelTableMap::COL_NAME, ),
-        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'name', ),
-        self::TYPE_NUM           => array(0, 1, 2, )
+    protected static $fieldNames = array(
+        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'Name',),
+        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'name',),
+        self::TYPE_COLNAME       => array(ChannelTableMap::COL_ID, ChannelTableMap::COL_INSTANCE_NAME, ChannelTableMap::COL_NAME,),
+        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'name',),
+        self::TYPE_NUM           => array(0, 1, 2,)
     );
 
     /**
@@ -111,12 +111,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'name' => 2, ),
-        self::TYPE_COLNAME       => array(ChannelTableMap::COL_ID => 0, ChannelTableMap::COL_INSTANCE_NAME => 1, ChannelTableMap::COL_NAME => 2, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'name' => 2, ),
-        self::TYPE_NUM           => array(0, 1, 2, )
+    protected static $fieldKeys = array(
+        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2,),
+        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'name' => 2,),
+        self::TYPE_COLNAME       => array(ChannelTableMap::COL_ID => 0, ChannelTableMap::COL_INSTANCE_NAME => 1, ChannelTableMap::COL_NAME => 2,),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'name' => 2,),
+        self::TYPE_NUM           => array(0, 1, 2,)
     );
 
     /**
@@ -146,16 +146,16 @@ 
      */
     public function buildRelations()
     {
-        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
+        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
 ), null, null, null, false);
-        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
+        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array(
   0 =>
-  array (
+  array(
     0 => ':channel_id',
     1 => ':id',
   ),
@@ -409,8 +409,8 @@ 
             $criteria = $criteria->buildCriteria(); // build Criteria from Channel object
         }
 
-        if ($criteria->containsKey(ChannelTableMap::COL_ID) && $criteria->keyContainsValue(ChannelTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.ChannelTableMap::COL_ID.')');
+        if ($criteria->containsKey(ChannelTableMap::COL_ID) && $criteria->keyContainsValue(ChannelTableMap::COL_ID)) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . ChannelTableMap::COL_ID . ')');
         }
 
 
@@ -419,7 +419,7 @@ 
 
         // use transaction because $criteria could contain info
         // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
+        return $con->transaction(function() use ($con, $query) {
             return $query->doInsert($con);
         });
     }

src/cli/Jalle19/StatusManager/Database/Map/ConnectionTableMap.php

Indentation +410 added lines, -410 removed lines

@@ -28,425 +28,425 @@
  */
 class ConnectionTableMap extends TableMap
 {
-    use InstancePoolTrait;
-    use TableMapTrait;
-
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.ConnectionTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'tvheadend_status_manager';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'connection';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Connection';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Connection';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 6;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 6;
-
-    /**
-     * the column name for the id field
-     */
-    const COL_ID = 'connection.id';
-
-    /**
-     * the column name for the instance_name field
-     */
-    const COL_INSTANCE_NAME = 'connection.instance_name';
-
-    /**
-     * the column name for the user_id field
-     */
-    const COL_USER_ID = 'connection.user_id';
-
-    /**
-     * the column name for the peer field
-     */
-    const COL_PEER = 'connection.peer';
-
-    /**
-     * the column name for the started field
-     */
-    const COL_STARTED = 'connection.started';
-
-    /**
-     * the column name for the type field
-     */
-    const COL_TYPE = 'connection.type';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'UserId', 'Peer', 'Started', 'Type', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'userId', 'peer', 'started', 'type', ),
-        self::TYPE_COLNAME       => array(ConnectionTableMap::COL_ID, ConnectionTableMap::COL_INSTANCE_NAME, ConnectionTableMap::COL_USER_ID, ConnectionTableMap::COL_PEER, ConnectionTableMap::COL_STARTED, ConnectionTableMap::COL_TYPE, ),
-        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'user_id', 'peer', 'started', 'type', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'Peer' => 3, 'Started' => 4, 'Type' => 5, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'peer' => 3, 'started' => 4, 'type' => 5, ),
-        self::TYPE_COLNAME       => array(ConnectionTableMap::COL_ID => 0, ConnectionTableMap::COL_INSTANCE_NAME => 1, ConnectionTableMap::COL_USER_ID => 2, ConnectionTableMap::COL_PEER => 3, ConnectionTableMap::COL_STARTED => 4, ConnectionTableMap::COL_TYPE => 5, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'peer' => 3, 'started' => 4, 'type' => 5, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('connection');
-        $this->setPhpName('Connection');
-        $this->setIdentifierQuoting(false);
-        $this->setClassName('\\Jalle19\\StatusManager\\Database\\Connection');
-        $this->setPackage('Jalle19.StatusManager.Database');
-        $this->setUseIdGenerator(true);
-        // columns
-        $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
-        $this->addForeignKey('user_id', 'UserId', 'INTEGER', 'user', 'id', false, null, null);
-        $this->addColumn('peer', 'Peer', 'VARCHAR', true, 255, null);
-        $this->addColumn('started', 'Started', 'TIMESTAMP', true, null, null);
-        $this->addColumn('type', 'Type', 'VARCHAR', true, 255, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
+	use InstancePoolTrait;
+	use TableMapTrait;
+
+	/**
+	 * The (dot-path) name of this class
+	 */
+	const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.ConnectionTableMap';
+
+	/**
+	 * The default database name for this class
+	 */
+	const DATABASE_NAME = 'tvheadend_status_manager';
+
+	/**
+	 * The table name for this class
+	 */
+	const TABLE_NAME = 'connection';
+
+	/**
+	 * The related Propel class for this table
+	 */
+	const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Connection';
+
+	/**
+	 * A class that can be returned by this tableMap
+	 */
+	const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Connection';
+
+	/**
+	 * The total number of columns
+	 */
+	const NUM_COLUMNS = 6;
+
+	/**
+	 * The number of lazy-loaded columns
+	 */
+	const NUM_LAZY_LOAD_COLUMNS = 0;
+
+	/**
+	 * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+	 */
+	const NUM_HYDRATE_COLUMNS = 6;
+
+	/**
+	 * the column name for the id field
+	 */
+	const COL_ID = 'connection.id';
+
+	/**
+	 * the column name for the instance_name field
+	 */
+	const COL_INSTANCE_NAME = 'connection.instance_name';
+
+	/**
+	 * the column name for the user_id field
+	 */
+	const COL_USER_ID = 'connection.user_id';
+
+	/**
+	 * the column name for the peer field
+	 */
+	const COL_PEER = 'connection.peer';
+
+	/**
+	 * the column name for the started field
+	 */
+	const COL_STARTED = 'connection.started';
+
+	/**
+	 * the column name for the type field
+	 */
+	const COL_TYPE = 'connection.type';
+
+	/**
+	 * The default string format for model objects of the related table
+	 */
+	const DEFAULT_STRING_FORMAT = 'YAML';
+
+	/**
+	 * holds an array of fieldnames
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+	 */
+	protected static $fieldNames = array (
+		self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'UserId', 'Peer', 'Started', 'Type', ),
+		self::TYPE_CAMELNAME     => array('id', 'instanceName', 'userId', 'peer', 'started', 'type', ),
+		self::TYPE_COLNAME       => array(ConnectionTableMap::COL_ID, ConnectionTableMap::COL_INSTANCE_NAME, ConnectionTableMap::COL_USER_ID, ConnectionTableMap::COL_PEER, ConnectionTableMap::COL_STARTED, ConnectionTableMap::COL_TYPE, ),
+		self::TYPE_FIELDNAME     => array('id', 'instance_name', 'user_id', 'peer', 'started', 'type', ),
+		self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+	);
+
+	/**
+	 * holds an array of keys for quick access to the fieldnames array
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+	 */
+	protected static $fieldKeys = array (
+		self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'Peer' => 3, 'Started' => 4, 'Type' => 5, ),
+		self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'peer' => 3, 'started' => 4, 'type' => 5, ),
+		self::TYPE_COLNAME       => array(ConnectionTableMap::COL_ID => 0, ConnectionTableMap::COL_INSTANCE_NAME => 1, ConnectionTableMap::COL_USER_ID => 2, ConnectionTableMap::COL_PEER => 3, ConnectionTableMap::COL_STARTED => 4, ConnectionTableMap::COL_TYPE => 5, ),
+		self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'peer' => 3, 'started' => 4, 'type' => 5, ),
+		self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+	);
+
+	/**
+	 * Initialize the table attributes and columns
+	 * Relations are not initialized by this method since they are lazy loaded
+	 *
+	 * @return void
+	 * @throws PropelException
+	 */
+	public function initialize()
+	{
+		// attributes
+		$this->setName('connection');
+		$this->setPhpName('Connection');
+		$this->setIdentifierQuoting(false);
+		$this->setClassName('\\Jalle19\\StatusManager\\Database\\Connection');
+		$this->setPackage('Jalle19.StatusManager.Database');
+		$this->setUseIdGenerator(true);
+		// columns
+		$this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
+		$this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
+		$this->addForeignKey('user_id', 'UserId', 'INTEGER', 'user', 'id', false, null, null);
+		$this->addColumn('peer', 'Peer', 'VARCHAR', true, 255, null);
+		$this->addColumn('started', 'Started', 'TIMESTAMP', true, null, null);
+		$this->addColumn('type', 'Type', 'VARCHAR', true, 255, null);
+	} // initialize()
+
+	/**
+	 * Build the RelationMap objects for this table relationships
+	 */
+	public function buildRelations()
+	{
+		$this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, null, false);
-        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array (
+		$this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array (
   0 =>
   array (
-    0 => ':user_id',
-    1 => ':id',
+	0 => ':user_id',
+	1 => ':id',
   ),
 ), null, null, null, false);
-    } // buildRelations()
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return string The primary key hash of the row
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        return (int) $row[
-            $indexType == TableMap::TYPE_NUM
-                ? 0 + $offset
-                : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-        ];
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? ConnectionTableMap::CLASS_DEFAULT : ConnectionTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+	} // buildRelations()
+
+	/**
+	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+	 *
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return string The primary key hash of the row
+	 */
+	public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		// If the PK cannot be derived from the row, return NULL.
+		if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+			return null;
+		}
+
+		return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+	}
+
+	/**
+	 * Retrieves the primary key from the DB resultset row
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, an array of the primary key columns will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return mixed The primary key of the row
+	 */
+	public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		return (int) $row[
+			$indexType == TableMap::TYPE_NUM
+				? 0 + $offset
+				: self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+		];
+	}
+
+	/**
+	 * The class that the tableMap will make instances of.
+	 *
+	 * If $withPrefix is true, the returned path
+	 * uses a dot-path notation which is translated into a path
+	 * relative to a location on the PHP include_path.
+	 * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+	 *
+	 * @param boolean $withPrefix Whether or not to return the path with the class name
+	 * @return string path.to.ClassName
+	 */
+	public static function getOMClass($withPrefix = true)
+	{
+		return $withPrefix ? ConnectionTableMap::CLASS_DEFAULT : ConnectionTableMap::OM_CLASS;
+	}
+
+	/**
+	 * Populates an object of the default type or an object that inherit from the default.
+	 *
+	 * @param array  $row       row returned by DataFetcher->fetch().
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     * @return array           (Connection object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = ConnectionTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = ConnectionTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + ConnectionTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = ConnectionTableMap::OM_CLASS;
-            /** @var Connection $obj */
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            ConnectionTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = ConnectionTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = ConnectionTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                /** @var Connection $obj */
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                ConnectionTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(ConnectionTableMap::COL_ID);
-            $criteria->addSelectColumn(ConnectionTableMap::COL_INSTANCE_NAME);
-            $criteria->addSelectColumn(ConnectionTableMap::COL_USER_ID);
-            $criteria->addSelectColumn(ConnectionTableMap::COL_PEER);
-            $criteria->addSelectColumn(ConnectionTableMap::COL_STARTED);
-            $criteria->addSelectColumn(ConnectionTableMap::COL_TYPE);
-        } else {
-            $criteria->addSelectColumn($alias . '.id');
-            $criteria->addSelectColumn($alias . '.instance_name');
-            $criteria->addSelectColumn($alias . '.user_id');
-            $criteria->addSelectColumn($alias . '.peer');
-            $criteria->addSelectColumn($alias . '.started');
-            $criteria->addSelectColumn($alias . '.type');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(ConnectionTableMap::DATABASE_NAME)->getTable(ConnectionTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-        $dbMap = Propel::getServiceContainer()->getDatabaseMap(ConnectionTableMap::DATABASE_NAME);
-        if (!$dbMap->hasTable(ConnectionTableMap::TABLE_NAME)) {
-            $dbMap->addTableObject(new ConnectionTableMap());
-        }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a Connection or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or Connection object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con the connection to use
-     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                         if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(ConnectionTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Jalle19\StatusManager\Database\Connection) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(ConnectionTableMap::DATABASE_NAME);
-            $criteria->add(ConnectionTableMap::COL_ID, (array) $values, Criteria::IN);
-        }
-
-        $query = ConnectionQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) {
-            ConnectionTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) {
-                ConnectionTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the connection table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return ConnectionQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a Connection or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or Connection object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(ConnectionTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from Connection object
-        }
-
-        if ($criteria->containsKey(ConnectionTableMap::COL_ID) && $criteria->keyContainsValue(ConnectionTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.ConnectionTableMap::COL_ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = ConnectionQuery::create()->mergeWith($criteria);
-
-        // use transaction because $criteria could contain info
-        // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
-            return $query->doInsert($con);
-        });
-    }
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+	 *
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 * @return array           (Connection object, last column rank)
+	 */
+	public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		$key = ConnectionTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+		if (null !== ($obj = ConnectionTableMap::getInstanceFromPool($key))) {
+			// We no longer rehydrate the object, since this can cause data loss.
+			// See http://www.propelorm.org/ticket/509
+			// $obj->hydrate($row, $offset, true); // rehydrate
+			$col = $offset + ConnectionTableMap::NUM_HYDRATE_COLUMNS;
+		} else {
+			$cls = ConnectionTableMap::OM_CLASS;
+			/** @var Connection $obj */
+			$obj = new $cls();
+			$col = $obj->hydrate($row, $offset, false, $indexType);
+			ConnectionTableMap::addInstanceToPool($obj, $key);
+		}
+
+		return array($obj, $col);
+	}
+
+	/**
+	 * The returned array will contain objects of the default type or
+	 * objects that inherit from the default.
+	 *
+	 * @param DataFetcherInterface $dataFetcher
+	 * @return array
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function populateObjects(DataFetcherInterface $dataFetcher)
+	{
+		$results = array();
+
+		// set the class once to avoid overhead in the loop
+		$cls = static::getOMClass(false);
+		// populate the object(s)
+		while ($row = $dataFetcher->fetch()) {
+			$key = ConnectionTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+			if (null !== ($obj = ConnectionTableMap::getInstanceFromPool($key))) {
+				// We no longer rehydrate the object, since this can cause data loss.
+				// See http://www.propelorm.org/ticket/509
+				// $obj->hydrate($row, 0, true); // rehydrate
+				$results[] = $obj;
+			} else {
+				/** @var Connection $obj */
+				$obj = new $cls();
+				$obj->hydrate($row);
+				$results[] = $obj;
+				ConnectionTableMap::addInstanceToPool($obj, $key);
+			} // if key exists
+		}
+
+		return $results;
+	}
+	/**
+	 * Add all the columns needed to create a new object.
+	 *
+	 * Note: any columns that were marked with lazyLoad="true" in the
+	 * XML schema will not be added to the select list and only loaded
+	 * on demand.
+	 *
+	 * @param Criteria $criteria object containing the columns to add.
+	 * @param string   $alias    optional table alias
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function addSelectColumns(Criteria $criteria, $alias = null)
+	{
+		if (null === $alias) {
+			$criteria->addSelectColumn(ConnectionTableMap::COL_ID);
+			$criteria->addSelectColumn(ConnectionTableMap::COL_INSTANCE_NAME);
+			$criteria->addSelectColumn(ConnectionTableMap::COL_USER_ID);
+			$criteria->addSelectColumn(ConnectionTableMap::COL_PEER);
+			$criteria->addSelectColumn(ConnectionTableMap::COL_STARTED);
+			$criteria->addSelectColumn(ConnectionTableMap::COL_TYPE);
+		} else {
+			$criteria->addSelectColumn($alias . '.id');
+			$criteria->addSelectColumn($alias . '.instance_name');
+			$criteria->addSelectColumn($alias . '.user_id');
+			$criteria->addSelectColumn($alias . '.peer');
+			$criteria->addSelectColumn($alias . '.started');
+			$criteria->addSelectColumn($alias . '.type');
+		}
+	}
+
+	/**
+	 * Returns the TableMap related to this object.
+	 * This method is not needed for general use but a specific application could have a need.
+	 * @return TableMap
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function getTableMap()
+	{
+		return Propel::getServiceContainer()->getDatabaseMap(ConnectionTableMap::DATABASE_NAME)->getTable(ConnectionTableMap::TABLE_NAME);
+	}
+
+	/**
+	 * Add a TableMap instance to the database for this tableMap class.
+	 */
+	public static function buildTableMap()
+	{
+		$dbMap = Propel::getServiceContainer()->getDatabaseMap(ConnectionTableMap::DATABASE_NAME);
+		if (!$dbMap->hasTable(ConnectionTableMap::TABLE_NAME)) {
+			$dbMap->addTableObject(new ConnectionTableMap());
+		}
+	}
+
+	/**
+	 * Performs a DELETE on the database, given a Connection or Criteria object OR a primary key value.
+	 *
+	 * @param mixed               $values Criteria or Connection object or primary key or array of primary keys
+	 *              which is used to create the DELETE statement
+	 * @param  ConnectionInterface $con the connection to use
+	 * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+	 *                         if supported by native driver or if emulated using Propel.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	 public static function doDelete($values, ConnectionInterface $con = null)
+	 {
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(ConnectionTableMap::DATABASE_NAME);
+		}
+
+		if ($values instanceof Criteria) {
+			// rename for clarity
+			$criteria = $values;
+		} elseif ($values instanceof \Jalle19\StatusManager\Database\Connection) { // it's a model object
+			// create criteria based on pk values
+			$criteria = $values->buildPkeyCriteria();
+		} else { // it's a primary key, or an array of pks
+			$criteria = new Criteria(ConnectionTableMap::DATABASE_NAME);
+			$criteria->add(ConnectionTableMap::COL_ID, (array) $values, Criteria::IN);
+		}
+
+		$query = ConnectionQuery::create()->mergeWith($criteria);
+
+		if ($values instanceof Criteria) {
+			ConnectionTableMap::clearInstancePool();
+		} elseif (!is_object($values)) { // it's a primary key, or an array of pks
+			foreach ((array) $values as $singleval) {
+				ConnectionTableMap::removeInstanceFromPool($singleval);
+			}
+		}
+
+		return $query->delete($con);
+	}
+
+	/**
+	 * Deletes all rows from the connection table.
+	 *
+	 * @param ConnectionInterface $con the connection to use
+	 * @return int The number of affected rows (if supported by underlying database driver).
+	 */
+	public static function doDeleteAll(ConnectionInterface $con = null)
+	{
+		return ConnectionQuery::create()->doDeleteAll($con);
+	}
+
+	/**
+	 * Performs an INSERT on the database, given a Connection or Criteria object.
+	 *
+	 * @param mixed               $criteria Criteria or Connection object containing data that is used to create the INSERT statement.
+	 * @param ConnectionInterface $con the ConnectionInterface connection to use
+	 * @return mixed           The new primary key.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function doInsert($criteria, ConnectionInterface $con = null)
+	{
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(ConnectionTableMap::DATABASE_NAME);
+		}
+
+		if ($criteria instanceof Criteria) {
+			$criteria = clone $criteria; // rename for clarity
+		} else {
+			$criteria = $criteria->buildCriteria(); // build Criteria from Connection object
+		}
+
+		if ($criteria->containsKey(ConnectionTableMap::COL_ID) && $criteria->keyContainsValue(ConnectionTableMap::COL_ID) ) {
+			throw new PropelException('Cannot insert a value for auto-increment primary key ('.ConnectionTableMap::COL_ID.')');
+		}
+
+
+		// Set the correct dbName
+		$query = ConnectionQuery::create()->mergeWith($criteria);
+
+		// use transaction because $criteria could contain info
+		// for more than one table (I guess, conceivably)
+		return $con->transaction(function () use ($con, $query) {
+			return $query->doInsert($con);
+		});
+	}
 
 } // ConnectionTableMap
 // This is the static code needed to register the TableMap for this table with the main Propel class.

Spacing +19 added lines, -19 removed lines

@@ -112,12 +112,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'UserId', 'Peer', 'Started', 'Type', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'userId', 'peer', 'started', 'type', ),
-        self::TYPE_COLNAME       => array(ConnectionTableMap::COL_ID, ConnectionTableMap::COL_INSTANCE_NAME, ConnectionTableMap::COL_USER_ID, ConnectionTableMap::COL_PEER, ConnectionTableMap::COL_STARTED, ConnectionTableMap::COL_TYPE, ),
-        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'user_id', 'peer', 'started', 'type', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+    protected static $fieldNames = array(
+        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'UserId', 'Peer', 'Started', 'Type',),
+        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'userId', 'peer', 'started', 'type',),
+        self::TYPE_COLNAME       => array(ConnectionTableMap::COL_ID, ConnectionTableMap::COL_INSTANCE_NAME, ConnectionTableMap::COL_USER_ID, ConnectionTableMap::COL_PEER, ConnectionTableMap::COL_STARTED, ConnectionTableMap::COL_TYPE,),
+        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'user_id', 'peer', 'started', 'type',),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5,)
     );
 
     /**
@@ -126,12 +126,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'Peer' => 3, 'Started' => 4, 'Type' => 5, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'peer' => 3, 'started' => 4, 'type' => 5, ),
-        self::TYPE_COLNAME       => array(ConnectionTableMap::COL_ID => 0, ConnectionTableMap::COL_INSTANCE_NAME => 1, ConnectionTableMap::COL_USER_ID => 2, ConnectionTableMap::COL_PEER => 3, ConnectionTableMap::COL_STARTED => 4, ConnectionTableMap::COL_TYPE => 5, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'peer' => 3, 'started' => 4, 'type' => 5, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+    protected static $fieldKeys = array(
+        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'Peer' => 3, 'Started' => 4, 'Type' => 5,),
+        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'peer' => 3, 'started' => 4, 'type' => 5,),
+        self::TYPE_COLNAME       => array(ConnectionTableMap::COL_ID => 0, ConnectionTableMap::COL_INSTANCE_NAME => 1, ConnectionTableMap::COL_USER_ID => 2, ConnectionTableMap::COL_PEER => 3, ConnectionTableMap::COL_STARTED => 4, ConnectionTableMap::COL_TYPE => 5,),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'peer' => 3, 'started' => 4, 'type' => 5,),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5,)
     );
 
     /**
@@ -164,16 +164,16 @@ 
      */
     public function buildRelations()
     {
-        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
+        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
 ), null, null, null, false);
-        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array (
+        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array(
   0 =>
-  array (
+  array(
     0 => ':user_id',
     1 => ':id',
   ),
@@ -433,8 +433,8 @@ 
             $criteria = $criteria->buildCriteria(); // build Criteria from Connection object
         }
 
-        if ($criteria->containsKey(ConnectionTableMap::COL_ID) && $criteria->keyContainsValue(ConnectionTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.ConnectionTableMap::COL_ID.')');
+        if ($criteria->containsKey(ConnectionTableMap::COL_ID) && $criteria->keyContainsValue(ConnectionTableMap::COL_ID)) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . ConnectionTableMap::COL_ID . ')');
         }
 
 
@@ -443,7 +443,7 @@ 
 
         // use transaction because $criteria could contain info
         // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
+        return $con->transaction(function() use ($con, $query) {
             return $query->doInsert($con);
         });
     }

src/cli/Jalle19/StatusManager/Database/Map/InstanceTableMap.php

Indentation +372 added lines, -372 removed lines

@@ -28,395 +28,395 @@
  */
 class InstanceTableMap extends TableMap
 {
-    use InstancePoolTrait;
-    use TableMapTrait;
-
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.InstanceTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'tvheadend_status_manager';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'instance';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Instance';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Instance';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 1;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 1;
-
-    /**
-     * the column name for the name field
-     */
-    const COL_NAME = 'instance.name';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Name', ),
-        self::TYPE_CAMELNAME     => array('name', ),
-        self::TYPE_COLNAME       => array(InstanceTableMap::COL_NAME, ),
-        self::TYPE_FIELDNAME     => array('name', ),
-        self::TYPE_NUM           => array(0, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Name' => 0, ),
-        self::TYPE_CAMELNAME     => array('name' => 0, ),
-        self::TYPE_COLNAME       => array(InstanceTableMap::COL_NAME => 0, ),
-        self::TYPE_FIELDNAME     => array('name' => 0, ),
-        self::TYPE_NUM           => array(0, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('instance');
-        $this->setPhpName('Instance');
-        $this->setIdentifierQuoting(false);
-        $this->setClassName('\\Jalle19\\StatusManager\\Database\\Instance');
-        $this->setPackage('Jalle19.StatusManager.Database');
-        $this->setUseIdGenerator(false);
-        // columns
-        $this->addPrimaryKey('name', 'Name', 'VARCHAR', true, 255, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::ONE_TO_MANY, array (
+	use InstancePoolTrait;
+	use TableMapTrait;
+
+	/**
+	 * The (dot-path) name of this class
+	 */
+	const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.InstanceTableMap';
+
+	/**
+	 * The default database name for this class
+	 */
+	const DATABASE_NAME = 'tvheadend_status_manager';
+
+	/**
+	 * The table name for this class
+	 */
+	const TABLE_NAME = 'instance';
+
+	/**
+	 * The related Propel class for this table
+	 */
+	const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Instance';
+
+	/**
+	 * A class that can be returned by this tableMap
+	 */
+	const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Instance';
+
+	/**
+	 * The total number of columns
+	 */
+	const NUM_COLUMNS = 1;
+
+	/**
+	 * The number of lazy-loaded columns
+	 */
+	const NUM_LAZY_LOAD_COLUMNS = 0;
+
+	/**
+	 * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+	 */
+	const NUM_HYDRATE_COLUMNS = 1;
+
+	/**
+	 * the column name for the name field
+	 */
+	const COL_NAME = 'instance.name';
+
+	/**
+	 * The default string format for model objects of the related table
+	 */
+	const DEFAULT_STRING_FORMAT = 'YAML';
+
+	/**
+	 * holds an array of fieldnames
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+	 */
+	protected static $fieldNames = array (
+		self::TYPE_PHPNAME       => array('Name', ),
+		self::TYPE_CAMELNAME     => array('name', ),
+		self::TYPE_COLNAME       => array(InstanceTableMap::COL_NAME, ),
+		self::TYPE_FIELDNAME     => array('name', ),
+		self::TYPE_NUM           => array(0, )
+	);
+
+	/**
+	 * holds an array of keys for quick access to the fieldnames array
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+	 */
+	protected static $fieldKeys = array (
+		self::TYPE_PHPNAME       => array('Name' => 0, ),
+		self::TYPE_CAMELNAME     => array('name' => 0, ),
+		self::TYPE_COLNAME       => array(InstanceTableMap::COL_NAME => 0, ),
+		self::TYPE_FIELDNAME     => array('name' => 0, ),
+		self::TYPE_NUM           => array(0, )
+	);
+
+	/**
+	 * Initialize the table attributes and columns
+	 * Relations are not initialized by this method since they are lazy loaded
+	 *
+	 * @return void
+	 * @throws PropelException
+	 */
+	public function initialize()
+	{
+		// attributes
+		$this->setName('instance');
+		$this->setPhpName('Instance');
+		$this->setIdentifierQuoting(false);
+		$this->setClassName('\\Jalle19\\StatusManager\\Database\\Instance');
+		$this->setPackage('Jalle19.StatusManager.Database');
+		$this->setUseIdGenerator(false);
+		// columns
+		$this->addPrimaryKey('name', 'Name', 'VARCHAR', true, 255, null);
+	} // initialize()
+
+	/**
+	 * Build the RelationMap objects for this table relationships
+	 */
+	public function buildRelations()
+	{
+		$this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, 'Users', false);
-        $this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array (
+		$this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, 'Connections', false);
-        $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::ONE_TO_MANY, array (
+		$this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, 'Channels', false);
-        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
+		$this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, 'Subscriptions', false);
-    } // buildRelations()
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return string The primary key hash of the row
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)];
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        return (string) $row[
-            $indexType == TableMap::TYPE_NUM
-                ? 0 + $offset
-                : self::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)
-        ];
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? InstanceTableMap::CLASS_DEFAULT : InstanceTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+	} // buildRelations()
+
+	/**
+	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+	 *
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return string The primary key hash of the row
+	 */
+	public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		// If the PK cannot be derived from the row, return NULL.
+		if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+			return null;
+		}
+
+		return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)];
+	}
+
+	/**
+	 * Retrieves the primary key from the DB resultset row
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, an array of the primary key columns will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return mixed The primary key of the row
+	 */
+	public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		return (string) $row[
+			$indexType == TableMap::TYPE_NUM
+				? 0 + $offset
+				: self::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)
+		];
+	}
+
+	/**
+	 * The class that the tableMap will make instances of.
+	 *
+	 * If $withPrefix is true, the returned path
+	 * uses a dot-path notation which is translated into a path
+	 * relative to a location on the PHP include_path.
+	 * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+	 *
+	 * @param boolean $withPrefix Whether or not to return the path with the class name
+	 * @return string path.to.ClassName
+	 */
+	public static function getOMClass($withPrefix = true)
+	{
+		return $withPrefix ? InstanceTableMap::CLASS_DEFAULT : InstanceTableMap::OM_CLASS;
+	}
+
+	/**
+	 * Populates an object of the default type or an object that inherit from the default.
+	 *
+	 * @param array  $row       row returned by DataFetcher->fetch().
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     * @return array           (Instance object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = InstanceTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = InstanceTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + InstanceTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = InstanceTableMap::OM_CLASS;
-            /** @var Instance $obj */
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            InstanceTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = InstanceTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = InstanceTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                /** @var Instance $obj */
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                InstanceTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(InstanceTableMap::COL_NAME);
-        } else {
-            $criteria->addSelectColumn($alias . '.name');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(InstanceTableMap::DATABASE_NAME)->getTable(InstanceTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-        $dbMap = Propel::getServiceContainer()->getDatabaseMap(InstanceTableMap::DATABASE_NAME);
-        if (!$dbMap->hasTable(InstanceTableMap::TABLE_NAME)) {
-            $dbMap->addTableObject(new InstanceTableMap());
-        }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a Instance or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or Instance object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con the connection to use
-     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                         if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(InstanceTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Jalle19\StatusManager\Database\Instance) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(InstanceTableMap::DATABASE_NAME);
-            $criteria->add(InstanceTableMap::COL_NAME, (array) $values, Criteria::IN);
-        }
-
-        $query = InstanceQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) {
-            InstanceTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) {
-                InstanceTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the instance table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return InstanceQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a Instance or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or Instance object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(InstanceTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from Instance object
-        }
-
-
-        // Set the correct dbName
-        $query = InstanceQuery::create()->mergeWith($criteria);
-
-        // use transaction because $criteria could contain info
-        // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
-            return $query->doInsert($con);
-        });
-    }
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+	 *
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 * @return array           (Instance object, last column rank)
+	 */
+	public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		$key = InstanceTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+		if (null !== ($obj = InstanceTableMap::getInstanceFromPool($key))) {
+			// We no longer rehydrate the object, since this can cause data loss.
+			// See http://www.propelorm.org/ticket/509
+			// $obj->hydrate($row, $offset, true); // rehydrate
+			$col = $offset + InstanceTableMap::NUM_HYDRATE_COLUMNS;
+		} else {
+			$cls = InstanceTableMap::OM_CLASS;
+			/** @var Instance $obj */
+			$obj = new $cls();
+			$col = $obj->hydrate($row, $offset, false, $indexType);
+			InstanceTableMap::addInstanceToPool($obj, $key);
+		}
+
+		return array($obj, $col);
+	}
+
+	/**
+	 * The returned array will contain objects of the default type or
+	 * objects that inherit from the default.
+	 *
+	 * @param DataFetcherInterface $dataFetcher
+	 * @return array
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function populateObjects(DataFetcherInterface $dataFetcher)
+	{
+		$results = array();
+
+		// set the class once to avoid overhead in the loop
+		$cls = static::getOMClass(false);
+		// populate the object(s)
+		while ($row = $dataFetcher->fetch()) {
+			$key = InstanceTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+			if (null !== ($obj = InstanceTableMap::getInstanceFromPool($key))) {
+				// We no longer rehydrate the object, since this can cause data loss.
+				// See http://www.propelorm.org/ticket/509
+				// $obj->hydrate($row, 0, true); // rehydrate
+				$results[] = $obj;
+			} else {
+				/** @var Instance $obj */
+				$obj = new $cls();
+				$obj->hydrate($row);
+				$results[] = $obj;
+				InstanceTableMap::addInstanceToPool($obj, $key);
+			} // if key exists
+		}
+
+		return $results;
+	}
+	/**
+	 * Add all the columns needed to create a new object.
+	 *
+	 * Note: any columns that were marked with lazyLoad="true" in the
+	 * XML schema will not be added to the select list and only loaded
+	 * on demand.
+	 *
+	 * @param Criteria $criteria object containing the columns to add.
+	 * @param string   $alias    optional table alias
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function addSelectColumns(Criteria $criteria, $alias = null)
+	{
+		if (null === $alias) {
+			$criteria->addSelectColumn(InstanceTableMap::COL_NAME);
+		} else {
+			$criteria->addSelectColumn($alias . '.name');
+		}
+	}
+
+	/**
+	 * Returns the TableMap related to this object.
+	 * This method is not needed for general use but a specific application could have a need.
+	 * @return TableMap
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function getTableMap()
+	{
+		return Propel::getServiceContainer()->getDatabaseMap(InstanceTableMap::DATABASE_NAME)->getTable(InstanceTableMap::TABLE_NAME);
+	}
+
+	/**
+	 * Add a TableMap instance to the database for this tableMap class.
+	 */
+	public static function buildTableMap()
+	{
+		$dbMap = Propel::getServiceContainer()->getDatabaseMap(InstanceTableMap::DATABASE_NAME);
+		if (!$dbMap->hasTable(InstanceTableMap::TABLE_NAME)) {
+			$dbMap->addTableObject(new InstanceTableMap());
+		}
+	}
+
+	/**
+	 * Performs a DELETE on the database, given a Instance or Criteria object OR a primary key value.
+	 *
+	 * @param mixed               $values Criteria or Instance object or primary key or array of primary keys
+	 *              which is used to create the DELETE statement
+	 * @param  ConnectionInterface $con the connection to use
+	 * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+	 *                         if supported by native driver or if emulated using Propel.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	 public static function doDelete($values, ConnectionInterface $con = null)
+	 {
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(InstanceTableMap::DATABASE_NAME);
+		}
+
+		if ($values instanceof Criteria) {
+			// rename for clarity
+			$criteria = $values;
+		} elseif ($values instanceof \Jalle19\StatusManager\Database\Instance) { // it's a model object
+			// create criteria based on pk values
+			$criteria = $values->buildPkeyCriteria();
+		} else { // it's a primary key, or an array of pks
+			$criteria = new Criteria(InstanceTableMap::DATABASE_NAME);
+			$criteria->add(InstanceTableMap::COL_NAME, (array) $values, Criteria::IN);
+		}
+
+		$query = InstanceQuery::create()->mergeWith($criteria);
+
+		if ($values instanceof Criteria) {
+			InstanceTableMap::clearInstancePool();
+		} elseif (!is_object($values)) { // it's a primary key, or an array of pks
+			foreach ((array) $values as $singleval) {
+				InstanceTableMap::removeInstanceFromPool($singleval);
+			}
+		}
+
+		return $query->delete($con);
+	}
+
+	/**
+	 * Deletes all rows from the instance table.
+	 *
+	 * @param ConnectionInterface $con the connection to use
+	 * @return int The number of affected rows (if supported by underlying database driver).
+	 */
+	public static function doDeleteAll(ConnectionInterface $con = null)
+	{
+		return InstanceQuery::create()->doDeleteAll($con);
+	}
+
+	/**
+	 * Performs an INSERT on the database, given a Instance or Criteria object.
+	 *
+	 * @param mixed               $criteria Criteria or Instance object containing data that is used to create the INSERT statement.
+	 * @param ConnectionInterface $con the ConnectionInterface connection to use
+	 * @return mixed           The new primary key.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function doInsert($criteria, ConnectionInterface $con = null)
+	{
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(InstanceTableMap::DATABASE_NAME);
+		}
+
+		if ($criteria instanceof Criteria) {
+			$criteria = clone $criteria; // rename for clarity
+		} else {
+			$criteria = $criteria->buildCriteria(); // build Criteria from Instance object
+		}
+
+
+		// Set the correct dbName
+		$query = InstanceQuery::create()->mergeWith($criteria);
+
+		// use transaction because $criteria could contain info
+		// for more than one table (I guess, conceivably)
+		return $con->transaction(function () use ($con, $query) {
+			return $query->doInsert($con);
+		});
+	}
 
 } // InstanceTableMap
 // This is the static code needed to register the TableMap for this table with the main Propel class.

Spacing +21 added lines, -21 removed lines

@@ -87,12 +87,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Name', ),
-        self::TYPE_CAMELNAME     => array('name', ),
-        self::TYPE_COLNAME       => array(InstanceTableMap::COL_NAME, ),
-        self::TYPE_FIELDNAME     => array('name', ),
-        self::TYPE_NUM           => array(0, )
+    protected static $fieldNames = array(
+        self::TYPE_PHPNAME       => array('Name',),
+        self::TYPE_CAMELNAME     => array('name',),
+        self::TYPE_COLNAME       => array(InstanceTableMap::COL_NAME,),
+        self::TYPE_FIELDNAME     => array('name',),
+        self::TYPE_NUM           => array(0,)
     );
 
     /**
@@ -101,12 +101,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Name' => 0, ),
-        self::TYPE_CAMELNAME     => array('name' => 0, ),
-        self::TYPE_COLNAME       => array(InstanceTableMap::COL_NAME => 0, ),
-        self::TYPE_FIELDNAME     => array('name' => 0, ),
-        self::TYPE_NUM           => array(0, )
+    protected static $fieldKeys = array(
+        self::TYPE_PHPNAME       => array('Name' => 0,),
+        self::TYPE_CAMELNAME     => array('name' => 0,),
+        self::TYPE_COLNAME       => array(InstanceTableMap::COL_NAME => 0,),
+        self::TYPE_FIELDNAME     => array('name' => 0,),
+        self::TYPE_NUM           => array(0,)
     );
 
     /**
@@ -134,30 +134,30 @@ 
      */
     public function buildRelations()
     {
-        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::ONE_TO_MANY, array (
+        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::ONE_TO_MANY, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
 ), null, null, 'Users', false);
-        $this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array (
+        $this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
 ), null, null, 'Connections', false);
-        $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::ONE_TO_MANY, array (
+        $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::ONE_TO_MANY, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
 ), null, null, 'Channels', false);
-        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
+        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
@@ -413,7 +413,7 @@ 
 
         // use transaction because $criteria could contain info
         // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
+        return $con->transaction(function() use ($con, $query) {
             return $query->doInsert($con);
         });
     }

src/cli/Jalle19/StatusManager/Database/Map/SubscriptionTableMap.php

Indentation +437 added lines, -437 removed lines

@@ -28,456 +28,456 @@
  */
 class SubscriptionTableMap extends TableMap
 {
-    use InstancePoolTrait;
-    use TableMapTrait;
-
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.SubscriptionTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'tvheadend_status_manager';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'subscription';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Subscription';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Subscription';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 9;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 9;
-
-    /**
-     * the column name for the id field
-     */
-    const COL_ID = 'subscription.id';
-
-    /**
-     * the column name for the instance_name field
-     */
-    const COL_INSTANCE_NAME = 'subscription.instance_name';
-
-    /**
-     * the column name for the user_id field
-     */
-    const COL_USER_ID = 'subscription.user_id';
-
-    /**
-     * the column name for the channel_id field
-     */
-    const COL_CHANNEL_ID = 'subscription.channel_id';
-
-    /**
-     * the column name for the subscription_id field
-     */
-    const COL_SUBSCRIPTION_ID = 'subscription.subscription_id';
-
-    /**
-     * the column name for the started field
-     */
-    const COL_STARTED = 'subscription.started';
-
-    /**
-     * the column name for the stopped field
-     */
-    const COL_STOPPED = 'subscription.stopped';
-
-    /**
-     * the column name for the title field
-     */
-    const COL_TITLE = 'subscription.title';
-
-    /**
-     * the column name for the service field
-     */
-    const COL_SERVICE = 'subscription.service';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service', ),
-        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_USER_ID, SubscriptionTableMap::COL_CHANNEL_ID, SubscriptionTableMap::COL_SUBSCRIPTION_ID, SubscriptionTableMap::COL_STARTED, SubscriptionTableMap::COL_STOPPED, SubscriptionTableMap::COL_TITLE, SubscriptionTableMap::COL_SERVICE, ),
-        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'ChannelId' => 3, 'SubscriptionId' => 4, 'Started' => 5, 'Stopped' => 6, 'Title' => 7, 'Service' => 8, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'channelId' => 3, 'subscriptionId' => 4, 'started' => 5, 'stopped' => 6, 'title' => 7, 'service' => 8, ),
-        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_USER_ID => 2, SubscriptionTableMap::COL_CHANNEL_ID => 3, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 4, SubscriptionTableMap::COL_STARTED => 5, SubscriptionTableMap::COL_STOPPED => 6, SubscriptionTableMap::COL_TITLE => 7, SubscriptionTableMap::COL_SERVICE => 8, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'channel_id' => 3, 'subscription_id' => 4, 'started' => 5, 'stopped' => 6, 'title' => 7, 'service' => 8, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('subscription');
-        $this->setPhpName('Subscription');
-        $this->setIdentifierQuoting(false);
-        $this->setClassName('\\Jalle19\\StatusManager\\Database\\Subscription');
-        $this->setPackage('Jalle19.StatusManager.Database');
-        $this->setUseIdGenerator(true);
-        // columns
-        $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
-        $this->addForeignKey('user_id', 'UserId', 'INTEGER', 'user', 'id', false, null, null);
-        $this->addForeignKey('channel_id', 'ChannelId', 'INTEGER', 'channel', 'id', true, null, null);
-        $this->addColumn('subscription_id', 'SubscriptionId', 'INTEGER', true, null, null);
-        $this->addColumn('started', 'Started', 'TIMESTAMP', true, null, null);
-        $this->addColumn('stopped', 'Stopped', 'TIMESTAMP', false, null, null);
-        $this->addColumn('title', 'Title', 'VARCHAR', true, 255, null);
-        $this->addColumn('service', 'Service', 'VARCHAR', true, 255, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
+	use InstancePoolTrait;
+	use TableMapTrait;
+
+	/**
+	 * The (dot-path) name of this class
+	 */
+	const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.SubscriptionTableMap';
+
+	/**
+	 * The default database name for this class
+	 */
+	const DATABASE_NAME = 'tvheadend_status_manager';
+
+	/**
+	 * The table name for this class
+	 */
+	const TABLE_NAME = 'subscription';
+
+	/**
+	 * The related Propel class for this table
+	 */
+	const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Subscription';
+
+	/**
+	 * A class that can be returned by this tableMap
+	 */
+	const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Subscription';
+
+	/**
+	 * The total number of columns
+	 */
+	const NUM_COLUMNS = 9;
+
+	/**
+	 * The number of lazy-loaded columns
+	 */
+	const NUM_LAZY_LOAD_COLUMNS = 0;
+
+	/**
+	 * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+	 */
+	const NUM_HYDRATE_COLUMNS = 9;
+
+	/**
+	 * the column name for the id field
+	 */
+	const COL_ID = 'subscription.id';
+
+	/**
+	 * the column name for the instance_name field
+	 */
+	const COL_INSTANCE_NAME = 'subscription.instance_name';
+
+	/**
+	 * the column name for the user_id field
+	 */
+	const COL_USER_ID = 'subscription.user_id';
+
+	/**
+	 * the column name for the channel_id field
+	 */
+	const COL_CHANNEL_ID = 'subscription.channel_id';
+
+	/**
+	 * the column name for the subscription_id field
+	 */
+	const COL_SUBSCRIPTION_ID = 'subscription.subscription_id';
+
+	/**
+	 * the column name for the started field
+	 */
+	const COL_STARTED = 'subscription.started';
+
+	/**
+	 * the column name for the stopped field
+	 */
+	const COL_STOPPED = 'subscription.stopped';
+
+	/**
+	 * the column name for the title field
+	 */
+	const COL_TITLE = 'subscription.title';
+
+	/**
+	 * the column name for the service field
+	 */
+	const COL_SERVICE = 'subscription.service';
+
+	/**
+	 * The default string format for model objects of the related table
+	 */
+	const DEFAULT_STRING_FORMAT = 'YAML';
+
+	/**
+	 * holds an array of fieldnames
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+	 */
+	protected static $fieldNames = array (
+		self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service', ),
+		self::TYPE_CAMELNAME     => array('id', 'instanceName', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service', ),
+		self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_USER_ID, SubscriptionTableMap::COL_CHANNEL_ID, SubscriptionTableMap::COL_SUBSCRIPTION_ID, SubscriptionTableMap::COL_STARTED, SubscriptionTableMap::COL_STOPPED, SubscriptionTableMap::COL_TITLE, SubscriptionTableMap::COL_SERVICE, ),
+		self::TYPE_FIELDNAME     => array('id', 'instance_name', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service', ),
+		self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
+	);
+
+	/**
+	 * holds an array of keys for quick access to the fieldnames array
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+	 */
+	protected static $fieldKeys = array (
+		self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'ChannelId' => 3, 'SubscriptionId' => 4, 'Started' => 5, 'Stopped' => 6, 'Title' => 7, 'Service' => 8, ),
+		self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'channelId' => 3, 'subscriptionId' => 4, 'started' => 5, 'stopped' => 6, 'title' => 7, 'service' => 8, ),
+		self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_USER_ID => 2, SubscriptionTableMap::COL_CHANNEL_ID => 3, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 4, SubscriptionTableMap::COL_STARTED => 5, SubscriptionTableMap::COL_STOPPED => 6, SubscriptionTableMap::COL_TITLE => 7, SubscriptionTableMap::COL_SERVICE => 8, ),
+		self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'channel_id' => 3, 'subscription_id' => 4, 'started' => 5, 'stopped' => 6, 'title' => 7, 'service' => 8, ),
+		self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
+	);
+
+	/**
+	 * Initialize the table attributes and columns
+	 * Relations are not initialized by this method since they are lazy loaded
+	 *
+	 * @return void
+	 * @throws PropelException
+	 */
+	public function initialize()
+	{
+		// attributes
+		$this->setName('subscription');
+		$this->setPhpName('Subscription');
+		$this->setIdentifierQuoting(false);
+		$this->setClassName('\\Jalle19\\StatusManager\\Database\\Subscription');
+		$this->setPackage('Jalle19.StatusManager.Database');
+		$this->setUseIdGenerator(true);
+		// columns
+		$this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
+		$this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
+		$this->addForeignKey('user_id', 'UserId', 'INTEGER', 'user', 'id', false, null, null);
+		$this->addForeignKey('channel_id', 'ChannelId', 'INTEGER', 'channel', 'id', true, null, null);
+		$this->addColumn('subscription_id', 'SubscriptionId', 'INTEGER', true, null, null);
+		$this->addColumn('started', 'Started', 'TIMESTAMP', true, null, null);
+		$this->addColumn('stopped', 'Stopped', 'TIMESTAMP', false, null, null);
+		$this->addColumn('title', 'Title', 'VARCHAR', true, 255, null);
+		$this->addColumn('service', 'Service', 'VARCHAR', true, 255, null);
+	} // initialize()
+
+	/**
+	 * Build the RelationMap objects for this table relationships
+	 */
+	public function buildRelations()
+	{
+		$this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, null, false);
-        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array (
+		$this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array (
   0 =>
   array (
-    0 => ':user_id',
-    1 => ':id',
+	0 => ':user_id',
+	1 => ':id',
   ),
 ), null, null, null, false);
-        $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::MANY_TO_ONE, array (
+		$this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::MANY_TO_ONE, array (
   0 =>
   array (
-    0 => ':channel_id',
-    1 => ':id',
+	0 => ':channel_id',
+	1 => ':id',
   ),
 ), null, null, null, false);
-    } // buildRelations()
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return string The primary key hash of the row
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        return (int) $row[
-            $indexType == TableMap::TYPE_NUM
-                ? 0 + $offset
-                : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-        ];
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? SubscriptionTableMap::CLASS_DEFAULT : SubscriptionTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+	} // buildRelations()
+
+	/**
+	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+	 *
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return string The primary key hash of the row
+	 */
+	public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		// If the PK cannot be derived from the row, return NULL.
+		if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+			return null;
+		}
+
+		return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+	}
+
+	/**
+	 * Retrieves the primary key from the DB resultset row
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, an array of the primary key columns will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return mixed The primary key of the row
+	 */
+	public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		return (int) $row[
+			$indexType == TableMap::TYPE_NUM
+				? 0 + $offset
+				: self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+		];
+	}
+
+	/**
+	 * The class that the tableMap will make instances of.
+	 *
+	 * If $withPrefix is true, the returned path
+	 * uses a dot-path notation which is translated into a path
+	 * relative to a location on the PHP include_path.
+	 * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+	 *
+	 * @param boolean $withPrefix Whether or not to return the path with the class name
+	 * @return string path.to.ClassName
+	 */
+	public static function getOMClass($withPrefix = true)
+	{
+		return $withPrefix ? SubscriptionTableMap::CLASS_DEFAULT : SubscriptionTableMap::OM_CLASS;
+	}
+
+	/**
+	 * Populates an object of the default type or an object that inherit from the default.
+	 *
+	 * @param array  $row       row returned by DataFetcher->fetch().
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     * @return array           (Subscription object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = SubscriptionTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = SubscriptionTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + SubscriptionTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = SubscriptionTableMap::OM_CLASS;
-            /** @var Subscription $obj */
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            SubscriptionTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = SubscriptionTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = SubscriptionTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                /** @var Subscription $obj */
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                SubscriptionTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_ID);
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_INSTANCE_NAME);
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_USER_ID);
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_CHANNEL_ID);
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_SUBSCRIPTION_ID);
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_STARTED);
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_STOPPED);
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_TITLE);
-            $criteria->addSelectColumn(SubscriptionTableMap::COL_SERVICE);
-        } else {
-            $criteria->addSelectColumn($alias . '.id');
-            $criteria->addSelectColumn($alias . '.instance_name');
-            $criteria->addSelectColumn($alias . '.user_id');
-            $criteria->addSelectColumn($alias . '.channel_id');
-            $criteria->addSelectColumn($alias . '.subscription_id');
-            $criteria->addSelectColumn($alias . '.started');
-            $criteria->addSelectColumn($alias . '.stopped');
-            $criteria->addSelectColumn($alias . '.title');
-            $criteria->addSelectColumn($alias . '.service');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(SubscriptionTableMap::DATABASE_NAME)->getTable(SubscriptionTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-        $dbMap = Propel::getServiceContainer()->getDatabaseMap(SubscriptionTableMap::DATABASE_NAME);
-        if (!$dbMap->hasTable(SubscriptionTableMap::TABLE_NAME)) {
-            $dbMap->addTableObject(new SubscriptionTableMap());
-        }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a Subscription or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or Subscription object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con the connection to use
-     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                         if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(SubscriptionTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Jalle19\StatusManager\Database\Subscription) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(SubscriptionTableMap::DATABASE_NAME);
-            $criteria->add(SubscriptionTableMap::COL_ID, (array) $values, Criteria::IN);
-        }
-
-        $query = SubscriptionQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) {
-            SubscriptionTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) {
-                SubscriptionTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the subscription table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return SubscriptionQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a Subscription or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or Subscription object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(SubscriptionTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from Subscription object
-        }
-
-        if ($criteria->containsKey(SubscriptionTableMap::COL_ID) && $criteria->keyContainsValue(SubscriptionTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.SubscriptionTableMap::COL_ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = SubscriptionQuery::create()->mergeWith($criteria);
-
-        // use transaction because $criteria could contain info
-        // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
-            return $query->doInsert($con);
-        });
-    }
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+	 *
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 * @return array           (Subscription object, last column rank)
+	 */
+	public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		$key = SubscriptionTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+		if (null !== ($obj = SubscriptionTableMap::getInstanceFromPool($key))) {
+			// We no longer rehydrate the object, since this can cause data loss.
+			// See http://www.propelorm.org/ticket/509
+			// $obj->hydrate($row, $offset, true); // rehydrate
+			$col = $offset + SubscriptionTableMap::NUM_HYDRATE_COLUMNS;
+		} else {
+			$cls = SubscriptionTableMap::OM_CLASS;
+			/** @var Subscription $obj */
+			$obj = new $cls();
+			$col = $obj->hydrate($row, $offset, false, $indexType);
+			SubscriptionTableMap::addInstanceToPool($obj, $key);
+		}
+
+		return array($obj, $col);
+	}
+
+	/**
+	 * The returned array will contain objects of the default type or
+	 * objects that inherit from the default.
+	 *
+	 * @param DataFetcherInterface $dataFetcher
+	 * @return array
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function populateObjects(DataFetcherInterface $dataFetcher)
+	{
+		$results = array();
+
+		// set the class once to avoid overhead in the loop
+		$cls = static::getOMClass(false);
+		// populate the object(s)
+		while ($row = $dataFetcher->fetch()) {
+			$key = SubscriptionTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+			if (null !== ($obj = SubscriptionTableMap::getInstanceFromPool($key))) {
+				// We no longer rehydrate the object, since this can cause data loss.
+				// See http://www.propelorm.org/ticket/509
+				// $obj->hydrate($row, 0, true); // rehydrate
+				$results[] = $obj;
+			} else {
+				/** @var Subscription $obj */
+				$obj = new $cls();
+				$obj->hydrate($row);
+				$results[] = $obj;
+				SubscriptionTableMap::addInstanceToPool($obj, $key);
+			} // if key exists
+		}
+
+		return $results;
+	}
+	/**
+	 * Add all the columns needed to create a new object.
+	 *
+	 * Note: any columns that were marked with lazyLoad="true" in the
+	 * XML schema will not be added to the select list and only loaded
+	 * on demand.
+	 *
+	 * @param Criteria $criteria object containing the columns to add.
+	 * @param string   $alias    optional table alias
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function addSelectColumns(Criteria $criteria, $alias = null)
+	{
+		if (null === $alias) {
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_ID);
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_INSTANCE_NAME);
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_USER_ID);
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_CHANNEL_ID);
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_SUBSCRIPTION_ID);
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_STARTED);
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_STOPPED);
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_TITLE);
+			$criteria->addSelectColumn(SubscriptionTableMap::COL_SERVICE);
+		} else {
+			$criteria->addSelectColumn($alias . '.id');
+			$criteria->addSelectColumn($alias . '.instance_name');
+			$criteria->addSelectColumn($alias . '.user_id');
+			$criteria->addSelectColumn($alias . '.channel_id');
+			$criteria->addSelectColumn($alias . '.subscription_id');
+			$criteria->addSelectColumn($alias . '.started');
+			$criteria->addSelectColumn($alias . '.stopped');
+			$criteria->addSelectColumn($alias . '.title');
+			$criteria->addSelectColumn($alias . '.service');
+		}
+	}
+
+	/**
+	 * Returns the TableMap related to this object.
+	 * This method is not needed for general use but a specific application could have a need.
+	 * @return TableMap
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function getTableMap()
+	{
+		return Propel::getServiceContainer()->getDatabaseMap(SubscriptionTableMap::DATABASE_NAME)->getTable(SubscriptionTableMap::TABLE_NAME);
+	}
+
+	/**
+	 * Add a TableMap instance to the database for this tableMap class.
+	 */
+	public static function buildTableMap()
+	{
+		$dbMap = Propel::getServiceContainer()->getDatabaseMap(SubscriptionTableMap::DATABASE_NAME);
+		if (!$dbMap->hasTable(SubscriptionTableMap::TABLE_NAME)) {
+			$dbMap->addTableObject(new SubscriptionTableMap());
+		}
+	}
+
+	/**
+	 * Performs a DELETE on the database, given a Subscription or Criteria object OR a primary key value.
+	 *
+	 * @param mixed               $values Criteria or Subscription object or primary key or array of primary keys
+	 *              which is used to create the DELETE statement
+	 * @param  ConnectionInterface $con the connection to use
+	 * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+	 *                         if supported by native driver or if emulated using Propel.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	 public static function doDelete($values, ConnectionInterface $con = null)
+	 {
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(SubscriptionTableMap::DATABASE_NAME);
+		}
+
+		if ($values instanceof Criteria) {
+			// rename for clarity
+			$criteria = $values;
+		} elseif ($values instanceof \Jalle19\StatusManager\Database\Subscription) { // it's a model object
+			// create criteria based on pk values
+			$criteria = $values->buildPkeyCriteria();
+		} else { // it's a primary key, or an array of pks
+			$criteria = new Criteria(SubscriptionTableMap::DATABASE_NAME);
+			$criteria->add(SubscriptionTableMap::COL_ID, (array) $values, Criteria::IN);
+		}
+
+		$query = SubscriptionQuery::create()->mergeWith($criteria);
+
+		if ($values instanceof Criteria) {
+			SubscriptionTableMap::clearInstancePool();
+		} elseif (!is_object($values)) { // it's a primary key, or an array of pks
+			foreach ((array) $values as $singleval) {
+				SubscriptionTableMap::removeInstanceFromPool($singleval);
+			}
+		}
+
+		return $query->delete($con);
+	}
+
+	/**
+	 * Deletes all rows from the subscription table.
+	 *
+	 * @param ConnectionInterface $con the connection to use
+	 * @return int The number of affected rows (if supported by underlying database driver).
+	 */
+	public static function doDeleteAll(ConnectionInterface $con = null)
+	{
+		return SubscriptionQuery::create()->doDeleteAll($con);
+	}
+
+	/**
+	 * Performs an INSERT on the database, given a Subscription or Criteria object.
+	 *
+	 * @param mixed               $criteria Criteria or Subscription object containing data that is used to create the INSERT statement.
+	 * @param ConnectionInterface $con the ConnectionInterface connection to use
+	 * @return mixed           The new primary key.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function doInsert($criteria, ConnectionInterface $con = null)
+	{
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(SubscriptionTableMap::DATABASE_NAME);
+		}
+
+		if ($criteria instanceof Criteria) {
+			$criteria = clone $criteria; // rename for clarity
+		} else {
+			$criteria = $criteria->buildCriteria(); // build Criteria from Subscription object
+		}
+
+		if ($criteria->containsKey(SubscriptionTableMap::COL_ID) && $criteria->keyContainsValue(SubscriptionTableMap::COL_ID) ) {
+			throw new PropelException('Cannot insert a value for auto-increment primary key ('.SubscriptionTableMap::COL_ID.')');
+		}
+
+
+		// Set the correct dbName
+		$query = SubscriptionQuery::create()->mergeWith($criteria);
+
+		// use transaction because $criteria could contain info
+		// for more than one table (I guess, conceivably)
+		return $con->transaction(function () use ($con, $query) {
+			return $query->doInsert($con);
+		});
+	}
 
 } // SubscriptionTableMap
 // This is the static code needed to register the TableMap for this table with the main Propel class.

Spacing +21 added lines, -21 removed lines

@@ -127,12 +127,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service', ),
-        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_USER_ID, SubscriptionTableMap::COL_CHANNEL_ID, SubscriptionTableMap::COL_SUBSCRIPTION_ID, SubscriptionTableMap::COL_STARTED, SubscriptionTableMap::COL_STOPPED, SubscriptionTableMap::COL_TITLE, SubscriptionTableMap::COL_SERVICE, ),
-        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
+    protected static $fieldNames = array(
+        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service',),
+        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service',),
+        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_USER_ID, SubscriptionTableMap::COL_CHANNEL_ID, SubscriptionTableMap::COL_SUBSCRIPTION_ID, SubscriptionTableMap::COL_STARTED, SubscriptionTableMap::COL_STOPPED, SubscriptionTableMap::COL_TITLE, SubscriptionTableMap::COL_SERVICE,),
+        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service',),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8,)
     );
 
     /**
@@ -141,12 +141,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'ChannelId' => 3, 'SubscriptionId' => 4, 'Started' => 5, 'Stopped' => 6, 'Title' => 7, 'Service' => 8, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'channelId' => 3, 'subscriptionId' => 4, 'started' => 5, 'stopped' => 6, 'title' => 7, 'service' => 8, ),
-        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_USER_ID => 2, SubscriptionTableMap::COL_CHANNEL_ID => 3, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 4, SubscriptionTableMap::COL_STARTED => 5, SubscriptionTableMap::COL_STOPPED => 6, SubscriptionTableMap::COL_TITLE => 7, SubscriptionTableMap::COL_SERVICE => 8, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'channel_id' => 3, 'subscription_id' => 4, 'started' => 5, 'stopped' => 6, 'title' => 7, 'service' => 8, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
+    protected static $fieldKeys = array(
+        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'UserId' => 2, 'ChannelId' => 3, 'SubscriptionId' => 4, 'Started' => 5, 'Stopped' => 6, 'Title' => 7, 'Service' => 8,),
+        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'userId' => 2, 'channelId' => 3, 'subscriptionId' => 4, 'started' => 5, 'stopped' => 6, 'title' => 7, 'service' => 8,),
+        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_USER_ID => 2, SubscriptionTableMap::COL_CHANNEL_ID => 3, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 4, SubscriptionTableMap::COL_STARTED => 5, SubscriptionTableMap::COL_STOPPED => 6, SubscriptionTableMap::COL_TITLE => 7, SubscriptionTableMap::COL_SERVICE => 8,),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'user_id' => 2, 'channel_id' => 3, 'subscription_id' => 4, 'started' => 5, 'stopped' => 6, 'title' => 7, 'service' => 8,),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8,)
     );
 
     /**
@@ -182,23 +182,23 @@ 
      */
     public function buildRelations()
     {
-        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
+        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
 ), null, null, null, false);
-        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array (
+        $this->addRelation('User', '\\Jalle19\\StatusManager\\Database\\User', RelationMap::MANY_TO_ONE, array(
   0 =>
-  array (
+  array(
     0 => ':user_id',
     1 => ':id',
   ),
 ), null, null, null, false);
-        $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::MANY_TO_ONE, array (
+        $this->addRelation('Channel', '\\Jalle19\\StatusManager\\Database\\Channel', RelationMap::MANY_TO_ONE, array(
   0 =>
-  array (
+  array(
     0 => ':channel_id',
     1 => ':id',
   ),
@@ -464,8 +464,8 @@ 
             $criteria = $criteria->buildCriteria(); // build Criteria from Subscription object
         }
 
-        if ($criteria->containsKey(SubscriptionTableMap::COL_ID) && $criteria->keyContainsValue(SubscriptionTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.SubscriptionTableMap::COL_ID.')');
+        if ($criteria->containsKey(SubscriptionTableMap::COL_ID) && $criteria->keyContainsValue(SubscriptionTableMap::COL_ID)) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . SubscriptionTableMap::COL_ID . ')');
         }
 
 
@@ -474,7 +474,7 @@ 
 
         // use transaction because $criteria could contain info
         // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
+        return $con->transaction(function() use ($con, $query) {
             return $query->doInsert($con);
         });
     }

src/cli/Jalle19/StatusManager/Database/Map/UserTableMap.php

Indentation +389 added lines, -389 removed lines

@@ -28,408 +28,408 @@
  */
 class UserTableMap extends TableMap
 {
-    use InstancePoolTrait;
-    use TableMapTrait;
-
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.UserTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'tvheadend_status_manager';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'user';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\User';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.User';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 3;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 3;
-
-    /**
-     * the column name for the id field
-     */
-    const COL_ID = 'user.id';
-
-    /**
-     * the column name for the instance_name field
-     */
-    const COL_INSTANCE_NAME = 'user.instance_name';
-
-    /**
-     * the column name for the name field
-     */
-    const COL_NAME = 'user.name';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'Name', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'name', ),
-        self::TYPE_COLNAME       => array(UserTableMap::COL_ID, UserTableMap::COL_INSTANCE_NAME, UserTableMap::COL_NAME, ),
-        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'name', ),
-        self::TYPE_NUM           => array(0, 1, 2, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'name' => 2, ),
-        self::TYPE_COLNAME       => array(UserTableMap::COL_ID => 0, UserTableMap::COL_INSTANCE_NAME => 1, UserTableMap::COL_NAME => 2, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'name' => 2, ),
-        self::TYPE_NUM           => array(0, 1, 2, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('user');
-        $this->setPhpName('User');
-        $this->setIdentifierQuoting(false);
-        $this->setClassName('\\Jalle19\\StatusManager\\Database\\User');
-        $this->setPackage('Jalle19.StatusManager.Database');
-        $this->setUseIdGenerator(true);
-        // columns
-        $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
-        $this->addColumn('name', 'Name', 'VARCHAR', true, 255, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
+	use InstancePoolTrait;
+	use TableMapTrait;
+
+	/**
+	 * The (dot-path) name of this class
+	 */
+	const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.UserTableMap';
+
+	/**
+	 * The default database name for this class
+	 */
+	const DATABASE_NAME = 'tvheadend_status_manager';
+
+	/**
+	 * The table name for this class
+	 */
+	const TABLE_NAME = 'user';
+
+	/**
+	 * The related Propel class for this table
+	 */
+	const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\User';
+
+	/**
+	 * A class that can be returned by this tableMap
+	 */
+	const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.User';
+
+	/**
+	 * The total number of columns
+	 */
+	const NUM_COLUMNS = 3;
+
+	/**
+	 * The number of lazy-loaded columns
+	 */
+	const NUM_LAZY_LOAD_COLUMNS = 0;
+
+	/**
+	 * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+	 */
+	const NUM_HYDRATE_COLUMNS = 3;
+
+	/**
+	 * the column name for the id field
+	 */
+	const COL_ID = 'user.id';
+
+	/**
+	 * the column name for the instance_name field
+	 */
+	const COL_INSTANCE_NAME = 'user.instance_name';
+
+	/**
+	 * the column name for the name field
+	 */
+	const COL_NAME = 'user.name';
+
+	/**
+	 * The default string format for model objects of the related table
+	 */
+	const DEFAULT_STRING_FORMAT = 'YAML';
+
+	/**
+	 * holds an array of fieldnames
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+	 */
+	protected static $fieldNames = array (
+		self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'Name', ),
+		self::TYPE_CAMELNAME     => array('id', 'instanceName', 'name', ),
+		self::TYPE_COLNAME       => array(UserTableMap::COL_ID, UserTableMap::COL_INSTANCE_NAME, UserTableMap::COL_NAME, ),
+		self::TYPE_FIELDNAME     => array('id', 'instance_name', 'name', ),
+		self::TYPE_NUM           => array(0, 1, 2, )
+	);
+
+	/**
+	 * holds an array of keys for quick access to the fieldnames array
+	 *
+	 * first dimension keys are the type constants
+	 * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+	 */
+	protected static $fieldKeys = array (
+		self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2, ),
+		self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'name' => 2, ),
+		self::TYPE_COLNAME       => array(UserTableMap::COL_ID => 0, UserTableMap::COL_INSTANCE_NAME => 1, UserTableMap::COL_NAME => 2, ),
+		self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'name' => 2, ),
+		self::TYPE_NUM           => array(0, 1, 2, )
+	);
+
+	/**
+	 * Initialize the table attributes and columns
+	 * Relations are not initialized by this method since they are lazy loaded
+	 *
+	 * @return void
+	 * @throws PropelException
+	 */
+	public function initialize()
+	{
+		// attributes
+		$this->setName('user');
+		$this->setPhpName('User');
+		$this->setIdentifierQuoting(false);
+		$this->setClassName('\\Jalle19\\StatusManager\\Database\\User');
+		$this->setPackage('Jalle19.StatusManager.Database');
+		$this->setUseIdGenerator(true);
+		// columns
+		$this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
+		$this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
+		$this->addColumn('name', 'Name', 'VARCHAR', true, 255, null);
+	} // initialize()
+
+	/**
+	 * Build the RelationMap objects for this table relationships
+	 */
+	public function buildRelations()
+	{
+		$this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, null, false);
-        $this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array (
+		$this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
-    0 => ':user_id',
-    1 => ':id',
+	0 => ':user_id',
+	1 => ':id',
   ),
 ), null, null, 'Connections', false);
-        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
+		$this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
-    0 => ':user_id',
-    1 => ':id',
+	0 => ':user_id',
+	1 => ':id',
   ),
 ), null, null, 'Subscriptions', false);
-    } // buildRelations()
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return string The primary key hash of the row
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        return (int) $row[
-            $indexType == TableMap::TYPE_NUM
-                ? 0 + $offset
-                : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-        ];
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? UserTableMap::CLASS_DEFAULT : UserTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+	} // buildRelations()
+
+	/**
+	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+	 *
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return string The primary key hash of the row
+	 */
+	public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		// If the PK cannot be derived from the row, return NULL.
+		if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+			return null;
+		}
+
+		return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+	}
+
+	/**
+	 * Retrieves the primary key from the DB resultset row
+	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+	 * a multi-column primary key, an array of the primary key columns will be returned.
+	 *
+	 * @param array  $row       resultset row.
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+	 *
+	 * @return mixed The primary key of the row
+	 */
+	public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		return (int) $row[
+			$indexType == TableMap::TYPE_NUM
+				? 0 + $offset
+				: self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+		];
+	}
+
+	/**
+	 * The class that the tableMap will make instances of.
+	 *
+	 * If $withPrefix is true, the returned path
+	 * uses a dot-path notation which is translated into a path
+	 * relative to a location on the PHP include_path.
+	 * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+	 *
+	 * @param boolean $withPrefix Whether or not to return the path with the class name
+	 * @return string path.to.ClassName
+	 */
+	public static function getOMClass($withPrefix = true)
+	{
+		return $withPrefix ? UserTableMap::CLASS_DEFAULT : UserTableMap::OM_CLASS;
+	}
+
+	/**
+	 * Populates an object of the default type or an object that inherit from the default.
+	 *
+	 * @param array  $row       row returned by DataFetcher->fetch().
+	 * @param int    $offset    The 0-based offset for reading from the resultset row.
+	 * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     * @return array           (User object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = UserTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = UserTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + UserTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = UserTableMap::OM_CLASS;
-            /** @var User $obj */
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            UserTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = UserTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = UserTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                /** @var User $obj */
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                UserTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(UserTableMap::COL_ID);
-            $criteria->addSelectColumn(UserTableMap::COL_INSTANCE_NAME);
-            $criteria->addSelectColumn(UserTableMap::COL_NAME);
-        } else {
-            $criteria->addSelectColumn($alias . '.id');
-            $criteria->addSelectColumn($alias . '.instance_name');
-            $criteria->addSelectColumn($alias . '.name');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(UserTableMap::DATABASE_NAME)->getTable(UserTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-        $dbMap = Propel::getServiceContainer()->getDatabaseMap(UserTableMap::DATABASE_NAME);
-        if (!$dbMap->hasTable(UserTableMap::TABLE_NAME)) {
-            $dbMap->addTableObject(new UserTableMap());
-        }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a User or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or User object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con the connection to use
-     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                         if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Jalle19\StatusManager\Database\User) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(UserTableMap::DATABASE_NAME);
-            $criteria->add(UserTableMap::COL_ID, (array) $values, Criteria::IN);
-        }
-
-        $query = UserQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) {
-            UserTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) {
-                UserTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the user table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return UserQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a User or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or User object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *                         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from User object
-        }
-
-        if ($criteria->containsKey(UserTableMap::COL_ID) && $criteria->keyContainsValue(UserTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.UserTableMap::COL_ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = UserQuery::create()->mergeWith($criteria);
-
-        // use transaction because $criteria could contain info
-        // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
-            return $query->doInsert($con);
-        });
-    }
+	 *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+	 *
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 * @return array           (User object, last column rank)
+	 */
+	public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		$key = UserTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+		if (null !== ($obj = UserTableMap::getInstanceFromPool($key))) {
+			// We no longer rehydrate the object, since this can cause data loss.
+			// See http://www.propelorm.org/ticket/509
+			// $obj->hydrate($row, $offset, true); // rehydrate
+			$col = $offset + UserTableMap::NUM_HYDRATE_COLUMNS;
+		} else {
+			$cls = UserTableMap::OM_CLASS;
+			/** @var User $obj */
+			$obj = new $cls();
+			$col = $obj->hydrate($row, $offset, false, $indexType);
+			UserTableMap::addInstanceToPool($obj, $key);
+		}
+
+		return array($obj, $col);
+	}
+
+	/**
+	 * The returned array will contain objects of the default type or
+	 * objects that inherit from the default.
+	 *
+	 * @param DataFetcherInterface $dataFetcher
+	 * @return array
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function populateObjects(DataFetcherInterface $dataFetcher)
+	{
+		$results = array();
+
+		// set the class once to avoid overhead in the loop
+		$cls = static::getOMClass(false);
+		// populate the object(s)
+		while ($row = $dataFetcher->fetch()) {
+			$key = UserTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+			if (null !== ($obj = UserTableMap::getInstanceFromPool($key))) {
+				// We no longer rehydrate the object, since this can cause data loss.
+				// See http://www.propelorm.org/ticket/509
+				// $obj->hydrate($row, 0, true); // rehydrate
+				$results[] = $obj;
+			} else {
+				/** @var User $obj */
+				$obj = new $cls();
+				$obj->hydrate($row);
+				$results[] = $obj;
+				UserTableMap::addInstanceToPool($obj, $key);
+			} // if key exists
+		}
+
+		return $results;
+	}
+	/**
+	 * Add all the columns needed to create a new object.
+	 *
+	 * Note: any columns that were marked with lazyLoad="true" in the
+	 * XML schema will not be added to the select list and only loaded
+	 * on demand.
+	 *
+	 * @param Criteria $criteria object containing the columns to add.
+	 * @param string   $alias    optional table alias
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function addSelectColumns(Criteria $criteria, $alias = null)
+	{
+		if (null === $alias) {
+			$criteria->addSelectColumn(UserTableMap::COL_ID);
+			$criteria->addSelectColumn(UserTableMap::COL_INSTANCE_NAME);
+			$criteria->addSelectColumn(UserTableMap::COL_NAME);
+		} else {
+			$criteria->addSelectColumn($alias . '.id');
+			$criteria->addSelectColumn($alias . '.instance_name');
+			$criteria->addSelectColumn($alias . '.name');
+		}
+	}
+
+	/**
+	 * Returns the TableMap related to this object.
+	 * This method is not needed for general use but a specific application could have a need.
+	 * @return TableMap
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function getTableMap()
+	{
+		return Propel::getServiceContainer()->getDatabaseMap(UserTableMap::DATABASE_NAME)->getTable(UserTableMap::TABLE_NAME);
+	}
+
+	/**
+	 * Add a TableMap instance to the database for this tableMap class.
+	 */
+	public static function buildTableMap()
+	{
+		$dbMap = Propel::getServiceContainer()->getDatabaseMap(UserTableMap::DATABASE_NAME);
+		if (!$dbMap->hasTable(UserTableMap::TABLE_NAME)) {
+			$dbMap->addTableObject(new UserTableMap());
+		}
+	}
+
+	/**
+	 * Performs a DELETE on the database, given a User or Criteria object OR a primary key value.
+	 *
+	 * @param mixed               $values Criteria or User object or primary key or array of primary keys
+	 *              which is used to create the DELETE statement
+	 * @param  ConnectionInterface $con the connection to use
+	 * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+	 *                         if supported by native driver or if emulated using Propel.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	 public static function doDelete($values, ConnectionInterface $con = null)
+	 {
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
+		}
+
+		if ($values instanceof Criteria) {
+			// rename for clarity
+			$criteria = $values;
+		} elseif ($values instanceof \Jalle19\StatusManager\Database\User) { // it's a model object
+			// create criteria based on pk values
+			$criteria = $values->buildPkeyCriteria();
+		} else { // it's a primary key, or an array of pks
+			$criteria = new Criteria(UserTableMap::DATABASE_NAME);
+			$criteria->add(UserTableMap::COL_ID, (array) $values, Criteria::IN);
+		}
+
+		$query = UserQuery::create()->mergeWith($criteria);
+
+		if ($values instanceof Criteria) {
+			UserTableMap::clearInstancePool();
+		} elseif (!is_object($values)) { // it's a primary key, or an array of pks
+			foreach ((array) $values as $singleval) {
+				UserTableMap::removeInstanceFromPool($singleval);
+			}
+		}
+
+		return $query->delete($con);
+	}
+
+	/**
+	 * Deletes all rows from the user table.
+	 *
+	 * @param ConnectionInterface $con the connection to use
+	 * @return int The number of affected rows (if supported by underlying database driver).
+	 */
+	public static function doDeleteAll(ConnectionInterface $con = null)
+	{
+		return UserQuery::create()->doDeleteAll($con);
+	}
+
+	/**
+	 * Performs an INSERT on the database, given a User or Criteria object.
+	 *
+	 * @param mixed               $criteria Criteria or User object containing data that is used to create the INSERT statement.
+	 * @param ConnectionInterface $con the ConnectionInterface connection to use
+	 * @return mixed           The new primary key.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *                         rethrown wrapped into a PropelException.
+	 */
+	public static function doInsert($criteria, ConnectionInterface $con = null)
+	{
+		if (null === $con) {
+			$con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
+		}
+
+		if ($criteria instanceof Criteria) {
+			$criteria = clone $criteria; // rename for clarity
+		} else {
+			$criteria = $criteria->buildCriteria(); // build Criteria from User object
+		}
+
+		if ($criteria->containsKey(UserTableMap::COL_ID) && $criteria->keyContainsValue(UserTableMap::COL_ID) ) {
+			throw new PropelException('Cannot insert a value for auto-increment primary key ('.UserTableMap::COL_ID.')');
+		}
+
+
+		// Set the correct dbName
+		$query = UserQuery::create()->mergeWith($criteria);
+
+		// use transaction because $criteria could contain info
+		// for more than one table (I guess, conceivably)
+		return $con->transaction(function () use ($con, $query) {
+			return $query->doInsert($con);
+		});
+	}
 
 } // UserTableMap
 // This is the static code needed to register the TableMap for this table with the main Propel class.

Spacing +21 added lines, -21 removed lines

@@ -97,12 +97,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'Name', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'name', ),
-        self::TYPE_COLNAME       => array(UserTableMap::COL_ID, UserTableMap::COL_INSTANCE_NAME, UserTableMap::COL_NAME, ),
-        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'name', ),
-        self::TYPE_NUM           => array(0, 1, 2, )
+    protected static $fieldNames = array(
+        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'Name',),
+        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'name',),
+        self::TYPE_COLNAME       => array(UserTableMap::COL_ID, UserTableMap::COL_INSTANCE_NAME, UserTableMap::COL_NAME,),
+        self::TYPE_FIELDNAME     => array('id', 'instance_name', 'name',),
+        self::TYPE_NUM           => array(0, 1, 2,)
     );
 
     /**
@@ -111,12 +111,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'name' => 2, ),
-        self::TYPE_COLNAME       => array(UserTableMap::COL_ID => 0, UserTableMap::COL_INSTANCE_NAME => 1, UserTableMap::COL_NAME => 2, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'name' => 2, ),
-        self::TYPE_NUM           => array(0, 1, 2, )
+    protected static $fieldKeys = array(
+        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'Name' => 2,),
+        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'name' => 2,),
+        self::TYPE_COLNAME       => array(UserTableMap::COL_ID => 0, UserTableMap::COL_INSTANCE_NAME => 1, UserTableMap::COL_NAME => 2,),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'name' => 2,),
+        self::TYPE_NUM           => array(0, 1, 2,)
     );
 
     /**
@@ -146,23 +146,23 @@ 
      */
     public function buildRelations()
     {
-        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array (
+        $this->addRelation('Instance', '\\Jalle19\\StatusManager\\Database\\Instance', RelationMap::MANY_TO_ONE, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
 ), null, null, null, false);
-        $this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array (
+        $this->addRelation('Connection', '\\Jalle19\\StatusManager\\Database\\Connection', RelationMap::ONE_TO_MANY, array(
   0 =>
-  array (
+  array(
     0 => ':user_id',
     1 => ':id',
   ),
 ), null, null, 'Connections', false);
-        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array (
+        $this->addRelation('Subscription', '\\Jalle19\\StatusManager\\Database\\Subscription', RelationMap::ONE_TO_MANY, array(
   0 =>
-  array (
+  array(
     0 => ':user_id',
     1 => ':id',
   ),
@@ -416,8 +416,8 @@ 
             $criteria = $criteria->buildCriteria(); // build Criteria from User object
         }
 
-        if ($criteria->containsKey(UserTableMap::COL_ID) && $criteria->keyContainsValue(UserTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.UserTableMap::COL_ID.')');
+        if ($criteria->containsKey(UserTableMap::COL_ID) && $criteria->keyContainsValue(UserTableMap::COL_ID)) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . UserTableMap::COL_ID . ')');
         }
 
 
@@ -426,7 +426,7 @@ 
 
         // use transaction because $criteria could contain info
         // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
+        return $con->transaction(function() use ($con, $query) {
             return $query->doInsert($con);
         });
     }

src/cli/Jalle19/StatusManager/PersistenceManager.php

Indentation +12 added lines, -12 removed lines

@@ -91,13 +91,13 @@ 
 			$this->onUserSeen($instanceName, $connectionStatus->user);
 
 			$user = UserQuery::create()->filterByInstanceName($instanceName)->filterByName($connectionStatus->user)
-			                 ->findOne();
+							 ->findOne();
 		}
 
 		$connection = new Connection();
 		$connection->setInstanceName($instanceName)->setPeer($connectionStatus->peer)
-		           ->setUser($user)
-		           ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
+				   ->setUser($user)
+				   ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
 
 		$this->_logger->info('Stored new connection (instance: {instanceName}, peer: {peer})', [
 			'instanceName' => $instanceName,
@@ -185,8 +185,8 @@ 
 
 		$subscription = new Subscription();
 		$subscription->setInstance($instance)->setUser($user)->setChannel($channel)
-		             ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
-		             ->setService($status->service);
+					 ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
+					 ->setService($status->service);
 		$subscription->save();
 
 		$this->_logger->info('Stored new subscription (instance: {instanceName}, user: {userName}, channel: {channelName})',
@@ -210,8 +210,8 @@ 
 
 		// Find the latest matching subscription
 		$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName)
-		                                 ->filterBySubscriptionId($stateChange->getSubscriptionId())
-		                                 ->addDescendingOrderByColumn('started')->findOne();
+										 ->filterBySubscriptionId($stateChange->getSubscriptionId())
+										 ->addDescendingOrderByColumn('started')->findOne();
 
 		if ($subscription === null)
 		{
@@ -259,7 +259,7 @@ 
 	private function hasConnection($instanceName, ConnectionStatus $connectionStatus)
 	{
 		return ConnectionQuery::create()->filterByInstanceName($instanceName)->filterByPeer($connectionStatus->peer)
-		                      ->filterByStarted($connectionStatus->started)->findOne() !== null;
+							  ->filterByStarted($connectionStatus->started)->findOne() !== null;
 	}
 
 
@@ -284,7 +284,7 @@ 
 	private function hasChannel($instanceName, $channelName)
 	{
 		return ChannelQuery::create()->filterByInstanceName($instanceName)->filterByName($channelName)
-		                   ->findOne() !== null;
+						   ->findOne() !== null;
 	}
 
 
@@ -307,9 +307,9 @@ 
 		$userId = $user !== null ? $user->getId() : null;
 
 		return SubscriptionQuery::create()->filterByInstance($instance)->filterByUserId($userId)
-		                        ->filterByChannel($channel)
-		                        ->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
-		                        ->findOne() !== null;
+								->filterByChannel($channel)
+								->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
+								->findOne() !== null;
 	}
 
 }

Braces +21 added lines, -14 removed lines

@@ -50,8 +50,9 @@ 
 	 */
 	public function onInstanceSeen(Tvheadend $instance)
 	{
-		if ($this->hasInstance($instance))
-			return;
+		if ($this->hasInstance($instance)) {
+					return;
+		}
 
 		$instanceModel = new Database\Instance();
 		$instanceModel->setPrimaryKey($instance->getHostname());
@@ -80,8 +81,9 @@ 
 	 */
 	public function onConnectionSeen($instanceName, ConnectionStatus $connectionStatus)
 	{
-		if ($this->hasConnection($instanceName, $connectionStatus))
-			return;
+		if ($this->hasConnection($instanceName, $connectionStatus)) {
+					return;
+		}
 
 		$user = null;
 
@@ -114,8 +116,9 @@ 
 	 */
 	public function onUserSeen($instanceName, $userName)
 	{
-		if ($this->hasUser($instanceName, $userName))
-			return;
+		if ($this->hasUser($instanceName, $userName)) {
+					return;
+		}
 
 		$user = new User();
 		$user->setInstanceName($instanceName)->setName($userName);
@@ -136,8 +139,9 @@ 
 	 */
 	public function onChannelSeen($instanceName, $channelName)
 	{
-		if ($this->hasChannel($instanceName, $channelName))
-			return;
+		if ($this->hasChannel($instanceName, $channelName)) {
+					return;
+		}
 
 		$channel = new Channel();
 		$channel->setInstanceName($instanceName)->setName($channelName);
@@ -159,8 +163,9 @@ 
 	public function onSubscriptionSeen($instanceName, SubscriptionStatus $status)
 	{
 		// Ignore EPG grabber subscriptions
-		if ($status->getType() === SubscriptionStatus::TYPE_EPGGRAB)
-			return;
+		if ($status->getType() === SubscriptionStatus::TYPE_EPGGRAB) {
+					return;
+		}
 
 		// Determine the username to store for the subscription
 		$username = $status->username;
@@ -180,8 +185,9 @@ 
 		$this->onChannelSeen($instanceName, $status->channel);
 		$channel = ChannelQuery::create()->filterByInstance($instance)->filterByName($status->channel)->findOne();
 
-		if ($this->hasSubscription($instance, $user, $channel, $status))
-			return;
+		if ($this->hasSubscription($instance, $user, $channel, $status)) {
+					return;
+		}
 
 		$subscription = new Subscription();
 		$subscription->setInstance($instance)->setUser($user)->setChannel($channel)
@@ -205,8 +211,9 @@ 
 	public function onSubscriptionStateChange($instanceName, StateChange $stateChange)
 	{
 		// We only need to persist subscription stops
-		if ($stateChange->getState() === StateChange::STATE_SUBSCRIPTION_STARTED)
-			return;
+		if ($stateChange->getState() === StateChange::STATE_SUBSCRIPTION_STARTED) {
+					return;
+		}
 
 		// Find the latest matching subscription
 		$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName)

Doc Comments +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 
 
 	/**
-	 * @param                  $instanceName
+	 * @param                  string $instanceName
 	 * @param ConnectionStatus $connectionStatus
 	 *
 	 * @return bool whether the connection exists in the database

src/cli/Jalle19/StatusManager/StatusManager.php

Braces +16 added lines, -14 removed lines

@@ -70,8 +70,9 @@ 
 		$this->_instances        = new \SplObjectStorage();
 
 		// Attach a state to each instance
-		foreach ($this->_configuration->getInstances() as $instance)
-			$this->_instances->attach($instance, new InstanceState());
+		foreach ($this->_configuration->getInstances() as $instance) {
+					$this->_instances->attach($instance, new InstanceState());
+		}
 
 		// Start the persistence manager
 		$this->_persistenceManager = new PersistenceManager($logger);
@@ -147,16 +148,19 @@ 
 			]);
 
 			// Persist connections
-			foreach ($instanceStatus->getConnections() as $connection)
-				$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
+			foreach ($instanceStatus->getConnections() as $connection) {
+							$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
+			}
 
 			// Persist running subscriptions
-			foreach ($instanceStatus->getSubscriptions() as $subscription)
-				$this->_persistenceManager->onSubscriptionSeen($instanceName, $subscription);
+			foreach ($instanceStatus->getSubscriptions() as $subscription) {
+							$this->_persistenceManager->onSubscriptionSeen($instanceName, $subscription);
+			}
 
 			// Handle subscription state changes
-			foreach ($instanceStatus->getSubscriptionStateChanges() as $subscriptionStateChange)
-				$this->_persistenceManager->onSubscriptionStateChange($instanceName, $subscriptionStateChange);
+			foreach ($instanceStatus->getSubscriptionStateChanges() as $subscriptionStateChange) {
+							$this->_persistenceManager->onSubscriptionStateChange($instanceName, $subscriptionStateChange);
+			}
 		}
 
 		// Broadcast the status messages to all connected clients
@@ -204,8 +208,7 @@ 
 
 						$instanceState->setReachability(InstanceState::REACHABLE);
 					}
-				}
-				catch (\Exception $e)
+				} catch (\Exception $e)
 				{
 					// Mark the instance as unreachable
 					$message = 'Instance {instanceName} not reachable, will wait for {cycles} cycles before retrying.
@@ -219,8 +222,7 @@ 
 
 					$instanceState->setReachability(InstanceState::UNREACHABLE);
 				}
-			}
-			else
+			} else
 			{
 				// Wait for some cycles and then mark unreachable instances as maybe reachable
 				if ($instanceState->getRetryCount() === self::UNREACHABLE_CYCLES_UNTIL_RETRY - 1)
@@ -231,9 +233,9 @@ 
 					$this->_logger->info('Retrying instance {instanceName} during next cycle', [
 						'instanceName' => $instanceName,
 					]);
+				} else {
+									$instanceState->incrementRetryCount();
 				}
-				else
-					$instanceState->incrementRetryCount();
 			}
 		}