Jalle19 / tvheadend-status-manager

migrations/PropelMigration_1455269307.php

Indentation +37 added lines, -37 removed lines

@@ -7,37 +7,37 @@ 
  */
 class PropelMigration_1455269307
 {
-    public $comment = '';
+	public $comment = '';
 
-    public function preUp($manager)
-    {
-        // add the pre-migration code here
-    }
+	public function preUp($manager)
+	{
+		// add the pre-migration code here
+	}
 
-    public function postUp($manager)
-    {
-        // add the post-migration code here
-    }
+	public function postUp($manager)
+	{
+		// add the post-migration code here
+	}
 
-    public function preDown($manager)
-    {
-        // add the pre-migration code here
-    }
+	public function preDown($manager)
+	{
+		// add the pre-migration code here
+	}
 
-    public function postDown($manager)
-    {
-        // add the post-migration code here
-    }
+	public function postDown($manager)
+	{
+		// add the post-migration code here
+	}
 
-    /**
-     * Get the SQL statements for the Up migration
-     *
-     * @return array list of the SQL strings to execute for the Up migration
-     *               the keys being the datasources
-     */
-    public function getUpSQL()
-    {
-        return array (
+	/**
+	 * Get the SQL statements for the Up migration
+	 *
+	 * @return array list of the SQL strings to execute for the Up migration
+	 *               the keys being the datasources
+	 */
+	public function getUpSQL()
+	{
+		return array (
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -46,17 +46,17 @@ 
 PRAGMA foreign_keys = ON;
 ',
 );
-    }
+	}
 
-    /**
-     * Get the SQL statements for the Down migration
-     *
-     * @return array list of the SQL strings to execute for the Down migration
-     *               the keys being the datasources
-     */
-    public function getDownSQL()
-    {
-        return array (
+	/**
+	 * Get the SQL statements for the Down migration
+	 *
+	 * @return array list of the SQL strings to execute for the Down migration
+	 *               the keys being the datasources
+	 */
+	public function getDownSQL()
+	{
+		return array (
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -86,6 +86,6 @@ 
 PRAGMA foreign_keys = ON;
 ',
 );
-    }
+	}
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function getUpSQL()
     {
-        return array (
+        return array(
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -56,7 +56,7 @@ 
      */
     public function getDownSQL()
     {
-        return array (
+        return array(
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 

migrations/PropelMigration_1455269455.php

Indentation +43 added lines, -43 removed lines

@@ -7,37 +7,37 @@ 
  */
 class PropelMigration_1455269455
 {
-    public $comment = '';
-
-    public function preUp($manager)
-    {
-        // add the pre-migration code here
-    }
-
-    public function postUp($manager)
-    {
-        // add the post-migration code here
-    }
-
-    public function preDown($manager)
-    {
-        // add the pre-migration code here
-    }
-
-    public function postDown($manager)
-    {
-        // add the post-migration code here
-    }
-
-    /**
-     * Get the SQL statements for the Up migration
-     *
-     * @return array list of the SQL strings to execute for the Up migration
-     *               the keys being the datasources
-     */
-    public function getUpSQL()
-    {
-        return array (
+	public $comment = '';
+
+	public function preUp($manager)
+	{
+		// add the pre-migration code here
+	}
+
+	public function postUp($manager)
+	{
+		// add the post-migration code here
+	}
+
+	public function preDown($manager)
+	{
+		// add the pre-migration code here
+	}
+
+	public function postDown($manager)
+	{
+		// add the post-migration code here
+	}
+
+	/**
+	 * Get the SQL statements for the Up migration
+	 *
+	 * @return array list of the SQL strings to execute for the Up migration
+	 *               the keys being the datasources
+	 */
+	public function getUpSQL()
+	{
+		return array (
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -69,17 +69,17 @@ 
 PRAGMA foreign_keys = ON;
 ',
 );
-    }
-
-    /**
-     * Get the SQL statements for the Down migration
-     *
-     * @return array list of the SQL strings to execute for the Down migration
-     *               the keys being the datasources
-     */
-    public function getDownSQL()
-    {
-        return array (
+	}
+
+	/**
+	 * Get the SQL statements for the Down migration
+	 *
+	 * @return array list of the SQL strings to execute for the Down migration
+	 *               the keys being the datasources
+	 */
+	public function getDownSQL()
+	{
+		return array (
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -110,6 +110,6 @@ 
 PRAGMA foreign_keys = ON;
 ',
 );
-    }
+	}
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function getUpSQL()
     {
-        return array (
+        return array(
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -79,7 +79,7 @@ 
      */
     public function getDownSQL()
     {
-        return array (
+        return array(
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 

migrations/PropelMigration_1455269809.php

Indentation +43 added lines, -43 removed lines

@@ -7,37 +7,37 @@ 
  */
 class PropelMigration_1455269809
 {
-    public $comment = '';
-
-    public function preUp($manager)
-    {
-        // add the pre-migration code here
-    }
-
-    public function postUp($manager)
-    {
-        // add the post-migration code here
-    }
-
-    public function preDown($manager)
-    {
-        // add the pre-migration code here
-    }
-
-    public function postDown($manager)
-    {
-        // add the post-migration code here
-    }
-
-    /**
-     * Get the SQL statements for the Up migration
-     *
-     * @return array list of the SQL strings to execute for the Up migration
-     *               the keys being the datasources
-     */
-    public function getUpSQL()
-    {
-        return array (
+	public $comment = '';
+
+	public function preUp($manager)
+	{
+		// add the pre-migration code here
+	}
+
+	public function postUp($manager)
+	{
+		// add the post-migration code here
+	}
+
+	public function preDown($manager)
+	{
+		// add the pre-migration code here
+	}
+
+	public function postDown($manager)
+	{
+		// add the post-migration code here
+	}
+
+	/**
+	 * Get the SQL statements for the Up migration
+	 *
+	 * @return array list of the SQL strings to execute for the Up migration
+	 *               the keys being the datasources
+	 */
+	public function getUpSQL()
+	{
+		return array (
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -69,17 +69,17 @@ 
 PRAGMA foreign_keys = ON;
 ',
 );
-    }
-
-    /**
-     * Get the SQL statements for the Down migration
-     *
-     * @return array list of the SQL strings to execute for the Down migration
-     *               the keys being the datasources
-     */
-    public function getDownSQL()
-    {
-        return array (
+	}
+
+	/**
+	 * Get the SQL statements for the Down migration
+	 *
+	 * @return array list of the SQL strings to execute for the Down migration
+	 *               the keys being the datasources
+	 */
+	public function getDownSQL()
+	{
+		return array (
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -111,6 +111,6 @@ 
 PRAGMA foreign_keys = ON;
 ',
 );
-    }
+	}
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function getUpSQL()
     {
-        return array (
+        return array(
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 
@@ -79,7 +79,7 @@ 
      */
     public function getDownSQL()
     {
-        return array (
+        return array(
   'tvheadend_status_manager' => '
 PRAGMA foreign_keys = OFF;
 

src/cli/Database/InputQuery.php

Indentation +3 added lines, -3 removed lines

@@ -27,9 +27,9 @@
 	public function filterBySubscriptionStatus($instanceName, SubscriptionStatus $status)
 	{
 		return $this->filterByInstanceName($instanceName)
-		            ->filterByNetwork(Subscription::parseNetwork($status))
-		            ->filterByMux(Subscription::parseMux($status))
-		            ->addDescendingOrderByColumn('started');
+					->filterByNetwork(Subscription::parseNetwork($status))
+					->filterByMux(Subscription::parseMux($status))
+					->addDescendingOrderByColumn('started');
 	}
 
 }

src/cli/Database/Map/InputTableMap.php

Indentation +414 added lines, -414 removed lines

@@ -28,429 +28,429 @@
  */
 class InputTableMap extends TableMap
 {
-    use InstancePoolTrait;
-    use TableMapTrait;
-
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Jalle19.StatusManager.Database.Map.InputTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'tvheadend_status_manager';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'input';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Input';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Input';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 7;
-
-    /**
-     * 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 = 7;
-
-    /**
-     * the column name for the uuid field
-     */
-    const COL_UUID = 'input.uuid';
-
-    /**
-     * the column name for the instance_name field
-     */
-    const COL_INSTANCE_NAME = 'input.instance_name';
-
-    /**
-     * the column name for the started field
-     */
-    const COL_STARTED = 'input.started';
-
-    /**
-     * the column name for the input field
-     */
-    const COL_INPUT = 'input.input';
-
-    /**
-     * the column name for the network field
-     */
-    const COL_NETWORK = 'input.network';
-
-    /**
-     * the column name for the mux field
-     */
-    const COL_MUX = 'input.mux';
-
-    /**
-     * the column name for the weight field
-     */
-    const COL_WEIGHT = 'input.weight';
-
-    /**
-     * 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('Uuid', 'InstanceName', 'Started', 'Input', 'Network', 'Mux', 'Weight', ),
-        self::TYPE_CAMELNAME     => array('uuid', 'instanceName', 'started', 'input', 'network', 'mux', 'weight', ),
-        self::TYPE_COLNAME       => array(InputTableMap::COL_UUID, InputTableMap::COL_INSTANCE_NAME, InputTableMap::COL_STARTED, InputTableMap::COL_INPUT, InputTableMap::COL_NETWORK, InputTableMap::COL_MUX, InputTableMap::COL_WEIGHT, ),
-        self::TYPE_FIELDNAME     => array('uuid', 'instance_name', 'started', 'input', 'network', 'mux', 'weight', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
-    );
-
-    /**
-     * 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('Uuid' => 0, 'InstanceName' => 1, 'Started' => 2, 'Input' => 3, 'Network' => 4, 'Mux' => 5, 'Weight' => 6, ),
-        self::TYPE_CAMELNAME     => array('uuid' => 0, 'instanceName' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6, ),
-        self::TYPE_COLNAME       => array(InputTableMap::COL_UUID => 0, InputTableMap::COL_INSTANCE_NAME => 1, InputTableMap::COL_STARTED => 2, InputTableMap::COL_INPUT => 3, InputTableMap::COL_NETWORK => 4, InputTableMap::COL_MUX => 5, InputTableMap::COL_WEIGHT => 6, ),
-        self::TYPE_FIELDNAME     => array('uuid' => 0, 'instance_name' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
-    );
-
-    /**
-     * 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('input');
-        $this->setPhpName('Input');
-        $this->setIdentifierQuoting(false);
-        $this->setClassName('\\Jalle19\\StatusManager\\Database\\Input');
-        $this->setPackage('Jalle19.StatusManager.Database');
-        $this->setUseIdGenerator(false);
-        // columns
-        $this->addPrimaryKey('uuid', 'Uuid', 'VARCHAR', true, 255, null);
-        $this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
-        $this->addColumn('started', 'Started', 'TIMESTAMP', true, null, null);
-        $this->addColumn('input', 'Input', 'VARCHAR', true, 255, null);
-        $this->addColumn('network', 'Network', 'VARCHAR', true, 255, null);
-        $this->addColumn('mux', 'Mux', 'VARCHAR', true, 255, null);
-        $this->addColumn('weight', 'Weight', 'INTEGER', true, null, 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.InputTableMap';
+
+	/**
+	 * The default database name for this class
+	 */
+	const DATABASE_NAME = 'tvheadend_status_manager';
+
+	/**
+	 * The table name for this class
+	 */
+	const TABLE_NAME = 'input';
+
+	/**
+	 * The related Propel class for this table
+	 */
+	const OM_CLASS = '\\Jalle19\\StatusManager\\Database\\Input';
+
+	/**
+	 * A class that can be returned by this tableMap
+	 */
+	const CLASS_DEFAULT = 'Jalle19.StatusManager.Database.Input';
+
+	/**
+	 * The total number of columns
+	 */
+	const NUM_COLUMNS = 7;
+
+	/**
+	 * 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 = 7;
+
+	/**
+	 * the column name for the uuid field
+	 */
+	const COL_UUID = 'input.uuid';
+
+	/**
+	 * the column name for the instance_name field
+	 */
+	const COL_INSTANCE_NAME = 'input.instance_name';
+
+	/**
+	 * the column name for the started field
+	 */
+	const COL_STARTED = 'input.started';
+
+	/**
+	 * the column name for the input field
+	 */
+	const COL_INPUT = 'input.input';
+
+	/**
+	 * the column name for the network field
+	 */
+	const COL_NETWORK = 'input.network';
+
+	/**
+	 * the column name for the mux field
+	 */
+	const COL_MUX = 'input.mux';
+
+	/**
+	 * the column name for the weight field
+	 */
+	const COL_WEIGHT = 'input.weight';
+
+	/**
+	 * 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('Uuid', 'InstanceName', 'Started', 'Input', 'Network', 'Mux', 'Weight', ),
+		self::TYPE_CAMELNAME     => array('uuid', 'instanceName', 'started', 'input', 'network', 'mux', 'weight', ),
+		self::TYPE_COLNAME       => array(InputTableMap::COL_UUID, InputTableMap::COL_INSTANCE_NAME, InputTableMap::COL_STARTED, InputTableMap::COL_INPUT, InputTableMap::COL_NETWORK, InputTableMap::COL_MUX, InputTableMap::COL_WEIGHT, ),
+		self::TYPE_FIELDNAME     => array('uuid', 'instance_name', 'started', 'input', 'network', 'mux', 'weight', ),
+		self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+	);
+
+	/**
+	 * 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('Uuid' => 0, 'InstanceName' => 1, 'Started' => 2, 'Input' => 3, 'Network' => 4, 'Mux' => 5, 'Weight' => 6, ),
+		self::TYPE_CAMELNAME     => array('uuid' => 0, 'instanceName' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6, ),
+		self::TYPE_COLNAME       => array(InputTableMap::COL_UUID => 0, InputTableMap::COL_INSTANCE_NAME => 1, InputTableMap::COL_STARTED => 2, InputTableMap::COL_INPUT => 3, InputTableMap::COL_NETWORK => 4, InputTableMap::COL_MUX => 5, InputTableMap::COL_WEIGHT => 6, ),
+		self::TYPE_FIELDNAME     => array('uuid' => 0, 'instance_name' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6, ),
+		self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+	);
+
+	/**
+	 * 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('input');
+		$this->setPhpName('Input');
+		$this->setIdentifierQuoting(false);
+		$this->setClassName('\\Jalle19\\StatusManager\\Database\\Input');
+		$this->setPackage('Jalle19.StatusManager.Database');
+		$this->setUseIdGenerator(false);
+		// columns
+		$this->addPrimaryKey('uuid', 'Uuid', 'VARCHAR', true, 255, null);
+		$this->addForeignKey('instance_name', 'InstanceName', 'VARCHAR', 'instance', 'name', true, 255, null);
+		$this->addColumn('started', 'Started', 'TIMESTAMP', true, null, null);
+		$this->addColumn('input', 'Input', 'VARCHAR', true, 255, null);
+		$this->addColumn('network', 'Network', 'VARCHAR', true, 255, null);
+		$this->addColumn('mux', 'Mux', 'VARCHAR', true, 255, null);
+		$this->addColumn('weight', 'Weight', 'INTEGER', true, null, 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 => ':input_uuid',
-    1 => ':uuid',
+	0 => ':input_uuid',
+	1 => ':uuid',
   ),
 ), 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('Uuid', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', 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('Uuid', 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 ? InputTableMap::CLASS_DEFAULT : InputTableMap::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('Uuid', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+			return null;
+		}
+
+		return null === $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', TableMap::TYPE_PHPNAME, $indexType)] || is_scalar($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', TableMap::TYPE_PHPNAME, $indexType)]) || is_callable([$row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', TableMap::TYPE_PHPNAME, $indexType)], '__toString']) ? (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', TableMap::TYPE_PHPNAME, $indexType)] : $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Uuid', 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('Uuid', 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 ? InputTableMap::CLASS_DEFAULT : InputTableMap::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           (Input object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = InputTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = InputTableMap::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 + InputTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = InputTableMap::OM_CLASS;
-            /** @var Input $obj */
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            InputTableMap::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 = InputTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = InputTableMap::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 Input $obj */
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                InputTableMap::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(InputTableMap::COL_UUID);
-            $criteria->addSelectColumn(InputTableMap::COL_INSTANCE_NAME);
-            $criteria->addSelectColumn(InputTableMap::COL_STARTED);
-            $criteria->addSelectColumn(InputTableMap::COL_INPUT);
-            $criteria->addSelectColumn(InputTableMap::COL_NETWORK);
-            $criteria->addSelectColumn(InputTableMap::COL_MUX);
-            $criteria->addSelectColumn(InputTableMap::COL_WEIGHT);
-        } else {
-            $criteria->addSelectColumn($alias . '.uuid');
-            $criteria->addSelectColumn($alias . '.instance_name');
-            $criteria->addSelectColumn($alias . '.started');
-            $criteria->addSelectColumn($alias . '.input');
-            $criteria->addSelectColumn($alias . '.network');
-            $criteria->addSelectColumn($alias . '.mux');
-            $criteria->addSelectColumn($alias . '.weight');
-        }
-    }
-
-    /**
-     * 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(InputTableMap::DATABASE_NAME)->getTable(InputTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-        $dbMap = Propel::getServiceContainer()->getDatabaseMap(InputTableMap::DATABASE_NAME);
-        if (!$dbMap->hasTable(InputTableMap::TABLE_NAME)) {
-            $dbMap->addTableObject(new InputTableMap());
-        }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a Input or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or Input 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(InputTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Jalle19\StatusManager\Database\Input) { // 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(InputTableMap::DATABASE_NAME);
-            $criteria->add(InputTableMap::COL_UUID, (array) $values, Criteria::IN);
-        }
-
-        $query = InputQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) {
-            InputTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) {
-                InputTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the input 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 InputQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a Input or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or Input 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(InputTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from Input object
-        }
-
-
-        // Set the correct dbName
-        $query = InputQuery::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           (Input object, last column rank)
+	 */
+	public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+	{
+		$key = InputTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+		if (null !== ($obj = InputTableMap::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 + InputTableMap::NUM_HYDRATE_COLUMNS;
+		} else {
+			$cls = InputTableMap::OM_CLASS;
+			/** @var Input $obj */
+			$obj = new $cls();
+			$col = $obj->hydrate($row, $offset, false, $indexType);
+			InputTableMap::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 = InputTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+			if (null !== ($obj = InputTableMap::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 Input $obj */
+				$obj = new $cls();
+				$obj->hydrate($row);
+				$results[] = $obj;
+				InputTableMap::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(InputTableMap::COL_UUID);
+			$criteria->addSelectColumn(InputTableMap::COL_INSTANCE_NAME);
+			$criteria->addSelectColumn(InputTableMap::COL_STARTED);
+			$criteria->addSelectColumn(InputTableMap::COL_INPUT);
+			$criteria->addSelectColumn(InputTableMap::COL_NETWORK);
+			$criteria->addSelectColumn(InputTableMap::COL_MUX);
+			$criteria->addSelectColumn(InputTableMap::COL_WEIGHT);
+		} else {
+			$criteria->addSelectColumn($alias . '.uuid');
+			$criteria->addSelectColumn($alias . '.instance_name');
+			$criteria->addSelectColumn($alias . '.started');
+			$criteria->addSelectColumn($alias . '.input');
+			$criteria->addSelectColumn($alias . '.network');
+			$criteria->addSelectColumn($alias . '.mux');
+			$criteria->addSelectColumn($alias . '.weight');
+		}
+	}
+
+	/**
+	 * 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(InputTableMap::DATABASE_NAME)->getTable(InputTableMap::TABLE_NAME);
+	}
+
+	/**
+	 * Add a TableMap instance to the database for this tableMap class.
+	 */
+	public static function buildTableMap()
+	{
+		$dbMap = Propel::getServiceContainer()->getDatabaseMap(InputTableMap::DATABASE_NAME);
+		if (!$dbMap->hasTable(InputTableMap::TABLE_NAME)) {
+			$dbMap->addTableObject(new InputTableMap());
+		}
+	}
+
+	/**
+	 * Performs a DELETE on the database, given a Input or Criteria object OR a primary key value.
+	 *
+	 * @param mixed               $values Criteria or Input 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(InputTableMap::DATABASE_NAME);
+		}
+
+		if ($values instanceof Criteria) {
+			// rename for clarity
+			$criteria = $values;
+		} elseif ($values instanceof \Jalle19\StatusManager\Database\Input) { // 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(InputTableMap::DATABASE_NAME);
+			$criteria->add(InputTableMap::COL_UUID, (array) $values, Criteria::IN);
+		}
+
+		$query = InputQuery::create()->mergeWith($criteria);
+
+		if ($values instanceof Criteria) {
+			InputTableMap::clearInstancePool();
+		} elseif (!is_object($values)) { // it's a primary key, or an array of pks
+			foreach ((array) $values as $singleval) {
+				InputTableMap::removeInstanceFromPool($singleval);
+			}
+		}
+
+		return $query->delete($con);
+	}
+
+	/**
+	 * Deletes all rows from the input 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 InputQuery::create()->doDeleteAll($con);
+	}
+
+	/**
+	 * Performs an INSERT on the database, given a Input or Criteria object.
+	 *
+	 * @param mixed               $criteria Criteria or Input 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(InputTableMap::DATABASE_NAME);
+		}
+
+		if ($criteria instanceof Criteria) {
+			$criteria = clone $criteria; // rename for clarity
+		} else {
+			$criteria = $criteria->buildCriteria(); // build Criteria from Input object
+		}
+
+
+		// Set the correct dbName
+		$query = InputQuery::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);
+		});
+	}
 
 } // InputTableMap
 // This is the static code needed to register the TableMap for this table with the main Propel class.

Spacing +17 added lines, -17 removed lines

@@ -117,12 +117,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('Uuid', 'InstanceName', 'Started', 'Input', 'Network', 'Mux', 'Weight', ),
-        self::TYPE_CAMELNAME     => array('uuid', 'instanceName', 'started', 'input', 'network', 'mux', 'weight', ),
-        self::TYPE_COLNAME       => array(InputTableMap::COL_UUID, InputTableMap::COL_INSTANCE_NAME, InputTableMap::COL_STARTED, InputTableMap::COL_INPUT, InputTableMap::COL_NETWORK, InputTableMap::COL_MUX, InputTableMap::COL_WEIGHT, ),
-        self::TYPE_FIELDNAME     => array('uuid', 'instance_name', 'started', 'input', 'network', 'mux', 'weight', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+    protected static $fieldNames = array(
+        self::TYPE_PHPNAME       => array('Uuid', 'InstanceName', 'Started', 'Input', 'Network', 'Mux', 'Weight',),
+        self::TYPE_CAMELNAME     => array('uuid', 'instanceName', 'started', 'input', 'network', 'mux', 'weight',),
+        self::TYPE_COLNAME       => array(InputTableMap::COL_UUID, InputTableMap::COL_INSTANCE_NAME, InputTableMap::COL_STARTED, InputTableMap::COL_INPUT, InputTableMap::COL_NETWORK, InputTableMap::COL_MUX, InputTableMap::COL_WEIGHT,),
+        self::TYPE_FIELDNAME     => array('uuid', 'instance_name', 'started', 'input', 'network', 'mux', 'weight',),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6,)
     );
 
     /**
@@ -131,12 +131,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('Uuid' => 0, 'InstanceName' => 1, 'Started' => 2, 'Input' => 3, 'Network' => 4, 'Mux' => 5, 'Weight' => 6, ),
-        self::TYPE_CAMELNAME     => array('uuid' => 0, 'instanceName' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6, ),
-        self::TYPE_COLNAME       => array(InputTableMap::COL_UUID => 0, InputTableMap::COL_INSTANCE_NAME => 1, InputTableMap::COL_STARTED => 2, InputTableMap::COL_INPUT => 3, InputTableMap::COL_NETWORK => 4, InputTableMap::COL_MUX => 5, InputTableMap::COL_WEIGHT => 6, ),
-        self::TYPE_FIELDNAME     => array('uuid' => 0, 'instance_name' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+    protected static $fieldKeys = array(
+        self::TYPE_PHPNAME       => array('Uuid' => 0, 'InstanceName' => 1, 'Started' => 2, 'Input' => 3, 'Network' => 4, 'Mux' => 5, 'Weight' => 6,),
+        self::TYPE_CAMELNAME     => array('uuid' => 0, 'instanceName' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6,),
+        self::TYPE_COLNAME       => array(InputTableMap::COL_UUID => 0, InputTableMap::COL_INSTANCE_NAME => 1, InputTableMap::COL_STARTED => 2, InputTableMap::COL_INPUT => 3, InputTableMap::COL_NETWORK => 4, InputTableMap::COL_MUX => 5, InputTableMap::COL_WEIGHT => 6,),
+        self::TYPE_FIELDNAME     => array('uuid' => 0, 'instance_name' => 1, 'started' => 2, 'input' => 3, 'network' => 4, 'mux' => 5, 'weight' => 6,),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6,)
     );
 
     /**
@@ -170,16 +170,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 => ':input_uuid',
     1 => ':uuid',
   ),
@@ -447,7 +447,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/Database/Map/InstanceTableMap.php

Indentation +375 added lines, -375 removed lines

@@ -28,402 +28,402 @@
  */
 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('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::ONE_TO_MANY, array (
+		$this->addRelation('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
-    0 => ':instance_name',
-    1 => ':name',
+	0 => ':instance_name',
+	1 => ':name',
   ),
 ), null, null, 'Inputs', 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 +23 added lines, -23 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,37 +134,37 @@ 
      */
     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('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::ONE_TO_MANY, array (
+        $this->addRelation('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::ONE_TO_MANY, array(
   0 =>
-  array (
+  array(
     0 => ':instance_name',
     1 => ':name',
   ),
 ), null, null, 'Inputs', 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',
   ),
@@ -420,7 +420,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/Database/Map/SubscriptionTableMap.php

Indentation +448 added lines, -448 removed lines

@@ -28,471 +28,471 @@
  */
 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 = 10;
-
-    /**
-     * 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 = 10;
-
-    /**
-     * 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 input_uuid field
-     */
-    const COL_INPUT_UUID = 'subscription.input_uuid';
-
-    /**
-     * 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', 'InputUuid', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'inputUuid', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service', ),
-        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_INPUT_UUID, 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', 'input_uuid', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
-    );
-
-    /**
-     * 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, 'InputUuid' => 2, 'UserId' => 3, 'ChannelId' => 4, 'SubscriptionId' => 5, 'Started' => 6, 'Stopped' => 7, 'Title' => 8, 'Service' => 9, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'inputUuid' => 2, 'userId' => 3, 'channelId' => 4, 'subscriptionId' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9, ),
-        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_INPUT_UUID => 2, SubscriptionTableMap::COL_USER_ID => 3, SubscriptionTableMap::COL_CHANNEL_ID => 4, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 5, SubscriptionTableMap::COL_STARTED => 6, SubscriptionTableMap::COL_STOPPED => 7, SubscriptionTableMap::COL_TITLE => 8, SubscriptionTableMap::COL_SERVICE => 9, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'input_uuid' => 2, 'user_id' => 3, 'channel_id' => 4, 'subscription_id' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
-    );
-
-    /**
-     * 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('input_uuid', 'InputUuid', 'VARCHAR', 'input', 'uuid', false, 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 = 10;
+
+	/**
+	 * 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 = 10;
+
+	/**
+	 * 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 input_uuid field
+	 */
+	const COL_INPUT_UUID = 'subscription.input_uuid';
+
+	/**
+	 * 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', 'InputUuid', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service', ),
+		self::TYPE_CAMELNAME     => array('id', 'instanceName', 'inputUuid', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service', ),
+		self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_INPUT_UUID, 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', 'input_uuid', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service', ),
+		self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
+	);
+
+	/**
+	 * 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, 'InputUuid' => 2, 'UserId' => 3, 'ChannelId' => 4, 'SubscriptionId' => 5, 'Started' => 6, 'Stopped' => 7, 'Title' => 8, 'Service' => 9, ),
+		self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'inputUuid' => 2, 'userId' => 3, 'channelId' => 4, 'subscriptionId' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9, ),
+		self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_INPUT_UUID => 2, SubscriptionTableMap::COL_USER_ID => 3, SubscriptionTableMap::COL_CHANNEL_ID => 4, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 5, SubscriptionTableMap::COL_STARTED => 6, SubscriptionTableMap::COL_STOPPED => 7, SubscriptionTableMap::COL_TITLE => 8, SubscriptionTableMap::COL_SERVICE => 9, ),
+		self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'input_uuid' => 2, 'user_id' => 3, 'channel_id' => 4, 'subscription_id' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9, ),
+		self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
+	);
+
+	/**
+	 * 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('input_uuid', 'InputUuid', 'VARCHAR', 'input', 'uuid', false, 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('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::MANY_TO_ONE, array (
+		$this->addRelation('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::MANY_TO_ONE, array (
   0 =>
   array (
-    0 => ':input_uuid',
-    1 => ':uuid',
+	0 => ':input_uuid',
+	1 => ':uuid',
   ),
 ), 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_INPUT_UUID);
-            $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 . '.input_uuid');
-            $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_INPUT_UUID);
+			$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 . '.input_uuid');
+			$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 +23 added lines, -23 removed lines

@@ -132,12 +132,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', 'InputUuid', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service', ),
-        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'inputUuid', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service', ),
-        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_INPUT_UUID, 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', 'input_uuid', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
+    protected static $fieldNames = array(
+        self::TYPE_PHPNAME       => array('Id', 'InstanceName', 'InputUuid', 'UserId', 'ChannelId', 'SubscriptionId', 'Started', 'Stopped', 'Title', 'Service',),
+        self::TYPE_CAMELNAME     => array('id', 'instanceName', 'inputUuid', 'userId', 'channelId', 'subscriptionId', 'started', 'stopped', 'title', 'service',),
+        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID, SubscriptionTableMap::COL_INSTANCE_NAME, SubscriptionTableMap::COL_INPUT_UUID, 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', 'input_uuid', 'user_id', 'channel_id', 'subscription_id', 'started', 'stopped', 'title', 'service',),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9,)
     );
 
     /**
@@ -146,12 +146,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, 'InputUuid' => 2, 'UserId' => 3, 'ChannelId' => 4, 'SubscriptionId' => 5, 'Started' => 6, 'Stopped' => 7, 'Title' => 8, 'Service' => 9, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'inputUuid' => 2, 'userId' => 3, 'channelId' => 4, 'subscriptionId' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9, ),
-        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_INPUT_UUID => 2, SubscriptionTableMap::COL_USER_ID => 3, SubscriptionTableMap::COL_CHANNEL_ID => 4, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 5, SubscriptionTableMap::COL_STARTED => 6, SubscriptionTableMap::COL_STOPPED => 7, SubscriptionTableMap::COL_TITLE => 8, SubscriptionTableMap::COL_SERVICE => 9, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'input_uuid' => 2, 'user_id' => 3, 'channel_id' => 4, 'subscription_id' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
+    protected static $fieldKeys = array(
+        self::TYPE_PHPNAME       => array('Id' => 0, 'InstanceName' => 1, 'InputUuid' => 2, 'UserId' => 3, 'ChannelId' => 4, 'SubscriptionId' => 5, 'Started' => 6, 'Stopped' => 7, 'Title' => 8, 'Service' => 9,),
+        self::TYPE_CAMELNAME     => array('id' => 0, 'instanceName' => 1, 'inputUuid' => 2, 'userId' => 3, 'channelId' => 4, 'subscriptionId' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9,),
+        self::TYPE_COLNAME       => array(SubscriptionTableMap::COL_ID => 0, SubscriptionTableMap::COL_INSTANCE_NAME => 1, SubscriptionTableMap::COL_INPUT_UUID => 2, SubscriptionTableMap::COL_USER_ID => 3, SubscriptionTableMap::COL_CHANNEL_ID => 4, SubscriptionTableMap::COL_SUBSCRIPTION_ID => 5, SubscriptionTableMap::COL_STARTED => 6, SubscriptionTableMap::COL_STOPPED => 7, SubscriptionTableMap::COL_TITLE => 8, SubscriptionTableMap::COL_SERVICE => 9,),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'instance_name' => 1, 'input_uuid' => 2, 'user_id' => 3, 'channel_id' => 4, 'subscription_id' => 5, 'started' => 6, 'stopped' => 7, 'title' => 8, 'service' => 9,),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9,)
     );
 
     /**
@@ -188,30 +188,30 @@ 
      */
     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('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::MANY_TO_ONE, array (
+        $this->addRelation('Input', '\\Jalle19\\StatusManager\\Database\\Input', RelationMap::MANY_TO_ONE, array(
   0 =>
-  array (
+  array(
     0 => ':input_uuid',
     1 => ':uuid',
   ),
 ), 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',
   ),
@@ -479,8 +479,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 . ')');
         }
 
 
@@ -489,7 +489,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/StatusManager.php

Spacing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
 				$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
 
 			// Persist inputs
-			foreach($instanceStatus->getInputs() as $input)
+			foreach ($instanceStatus->getInputs() as $input)
 				$this->_persistenceManager->onInputSeen($instanceName, $input);
 
 			// Persist running subscriptions

Braces +19 added lines, -16 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,20 +148,24 @@ 
 			]);
 
 			// Persist connections
-			foreach ($instanceStatus->getConnections() as $connection)
-				$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
+			foreach ($instanceStatus->getConnections() as $connection) {
+							$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
+			}
 
 			// Persist inputs
-			foreach($instanceStatus->getInputs() as $input)
-				$this->_persistenceManager->onInputSeen($instanceName, $input);
+			foreach($instanceStatus->getInputs() as $input) {
+							$this->_persistenceManager->onInputSeen($instanceName, $input);
+			}
 
 			// 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
@@ -208,8 +213,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.
@@ -223,8 +227,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)
@@ -235,9 +238,9 @@ 
 					$this->_logger->info('Retrying instance {instanceName} during next cycle', [
 						'instanceName' => $instanceName,
 					]);
+				} else {
+									$instanceState->incrementRetryCount();
 				}
-				else
-					$instanceState->incrementRetryCount();
 			}
 		}