diff --git a/core/lib/Thelia/Model/map/CategoryTableMap.php b/core/lib/Thelia/Model/map/CategoryTableMap.php
index c6af848e4..8618585f9 100644
--- a/core/lib/Thelia/Model/map/CategoryTableMap.php
+++ b/core/lib/Thelia/Model/map/CategoryTableMap.php
@@ -55,7 +55,7 @@ class CategoryTableMap extends TableMap
$this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, null);
$this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', true, null, null);
- $this->addColumn('UPDATE_AT', 'UpdateAt', 'TIMESTAMP', true, null, null);
+ $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', true, null, null);
// validators
} // initialize()
diff --git a/core/lib/Thelia/Model/om/BaseCategory.php b/core/lib/Thelia/Model/om/BaseCategory.php
index daf550da9..d840afe56 100644
--- a/core/lib/Thelia/Model/om/BaseCategory.php
+++ b/core/lib/Thelia/Model/om/BaseCategory.php
@@ -98,10 +98,10 @@ abstract class BaseCategory extends BaseObject implements Persistent
protected $created_at;
/**
- * The value for the update_at field.
+ * The value for the updated_at field.
* @var string
*/
- protected $update_at;
+ protected $updated_at;
/**
* @var AttributeCategory
@@ -245,7 +245,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
}
/**
- * Get the [optionally formatted] temporal [update_at] column value.
+ * Get the [optionally formatted] temporal [updated_at] column value.
*
*
* @param string $format The date/time format string (either date()-style or strftime()-style).
@@ -253,21 +253,21 @@ abstract class BaseCategory extends BaseObject implements Persistent
* @return mixed Formatted date/time value as string or DateTime object (if format is null), null if column is null, and 0 if column value is 0000-00-00 00:00:00
* @throws PropelException - if unable to parse/validate the date/time value.
*/
- public function getUpdateAt($format = 'Y-m-d H:i:s')
+ public function getUpdatedAt($format = 'Y-m-d H:i:s')
{
- if ($this->update_at === null) {
+ if ($this->updated_at === null) {
return null;
}
- if ($this->update_at === '0000-00-00 00:00:00') {
+ if ($this->updated_at === '0000-00-00 00:00:00') {
// while technically this is not a default value of null,
// this seems to be closest in meaning.
return null;
} else {
try {
- $dt = new DateTime($this->update_at);
+ $dt = new DateTime($this->updated_at);
} catch (Exception $x) {
- throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->update_at, true), $x);
+ throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->updated_at, true), $x);
}
}
@@ -442,27 +442,27 @@ abstract class BaseCategory extends BaseObject implements Persistent
} // setCreatedAt()
/**
- * Sets the value of [update_at] column to a normalized version of the date/time value specified.
+ * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
*
* @param mixed $v string, integer (timestamp), or DateTime value.
* Empty strings are treated as null.
* @return Category The current object (for fluent API support)
*/
- public function setUpdateAt($v)
+ public function setUpdatedAt($v)
{
$dt = PropelDateTime::newInstance($v, null, 'DateTime');
- if ($this->update_at !== null || $dt !== null) {
- $currentDateAsString = ($this->update_at !== null && $tmpDt = new DateTime($this->update_at)) ? $tmpDt->format('Y-m-d H:i:s') : null;
+ if ($this->updated_at !== null || $dt !== null) {
+ $currentDateAsString = ($this->updated_at !== null && $tmpDt = new DateTime($this->updated_at)) ? $tmpDt->format('Y-m-d H:i:s') : null;
$newDateAsString = $dt ? $dt->format('Y-m-d H:i:s') : null;
if ($currentDateAsString !== $newDateAsString) {
- $this->update_at = $newDateAsString;
- $this->modifiedColumns[] = CategoryPeer::UPDATE_AT;
+ $this->updated_at = $newDateAsString;
+ $this->modifiedColumns[] = CategoryPeer::UPDATED_AT;
}
} // if either are not null
return $this;
- } // setUpdateAt()
+ } // setUpdatedAt()
/**
* Indicates whether the columns in this object are only set to default values.
@@ -502,7 +502,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
$this->visible = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null;
$this->position = ($row[$startcol + 4] !== null) ? (int) $row[$startcol + 4] : null;
$this->created_at = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
- $this->update_at = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
+ $this->updated_at = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
$this->resetModified();
$this->setNew(false);
@@ -834,8 +834,8 @@ abstract class BaseCategory extends BaseObject implements Persistent
if ($this->isColumnModified(CategoryPeer::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = '`CREATED_AT`';
}
- if ($this->isColumnModified(CategoryPeer::UPDATE_AT)) {
- $modifiedColumns[':p' . $index++] = '`UPDATE_AT`';
+ if ($this->isColumnModified(CategoryPeer::UPDATED_AT)) {
+ $modifiedColumns[':p' . $index++] = '`UPDATED_AT`';
}
$sql = sprintf(
@@ -866,8 +866,8 @@ abstract class BaseCategory extends BaseObject implements Persistent
case '`CREATED_AT`':
$stmt->bindValue($identifier, $this->created_at, PDO::PARAM_STR);
break;
- case '`UPDATE_AT`':
- $stmt->bindValue($identifier, $this->update_at, PDO::PARAM_STR);
+ case '`UPDATED_AT`':
+ $stmt->bindValue($identifier, $this->updated_at, PDO::PARAM_STR);
break;
}
}
@@ -1076,7 +1076,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
return $this->getCreatedAt();
break;
case 6:
- return $this->getUpdateAt();
+ return $this->getUpdatedAt();
break;
default:
return null;
@@ -1113,7 +1113,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
$keys[3] => $this->getVisible(),
$keys[4] => $this->getPosition(),
$keys[5] => $this->getCreatedAt(),
- $keys[6] => $this->getUpdateAt(),
+ $keys[6] => $this->getUpdatedAt(),
);
if ($includeForeignObjects) {
if (null !== $this->aAttributeCategory) {
@@ -1193,7 +1193,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
$this->setCreatedAt($value);
break;
case 6:
- $this->setUpdateAt($value);
+ $this->setUpdatedAt($value);
break;
} // switch()
}
@@ -1225,7 +1225,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
if (array_key_exists($keys[3], $arr)) $this->setVisible($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setPosition($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
- if (array_key_exists($keys[6], $arr)) $this->setUpdateAt($arr[$keys[6]]);
+ if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
}
/**
@@ -1243,7 +1243,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
if ($this->isColumnModified(CategoryPeer::VISIBLE)) $criteria->add(CategoryPeer::VISIBLE, $this->visible);
if ($this->isColumnModified(CategoryPeer::POSITION)) $criteria->add(CategoryPeer::POSITION, $this->position);
if ($this->isColumnModified(CategoryPeer::CREATED_AT)) $criteria->add(CategoryPeer::CREATED_AT, $this->created_at);
- if ($this->isColumnModified(CategoryPeer::UPDATE_AT)) $criteria->add(CategoryPeer::UPDATE_AT, $this->update_at);
+ if ($this->isColumnModified(CategoryPeer::UPDATED_AT)) $criteria->add(CategoryPeer::UPDATED_AT, $this->updated_at);
return $criteria;
}
@@ -1312,7 +1312,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
$copyObj->setVisible($this->getVisible());
$copyObj->setPosition($this->getPosition());
$copyObj->setCreatedAt($this->getCreatedAt());
- $copyObj->setUpdateAt($this->getUpdateAt());
+ $copyObj->setUpdatedAt($this->getUpdatedAt());
if ($deepCopy && !$this->startCopy) {
// important: temporarily setNew(false) because this affects the behavior of
@@ -1798,7 +1798,7 @@ abstract class BaseCategory extends BaseObject implements Persistent
$this->visible = null;
$this->position = null;
$this->created_at = null;
- $this->update_at = null;
+ $this->updated_at = null;
$this->alreadyInSave = false;
$this->alreadyInValidation = false;
$this->clearAllReferences();
diff --git a/core/lib/Thelia/Model/om/BaseCategoryPeer.php b/core/lib/Thelia/Model/om/BaseCategoryPeer.php
index ca90178aa..aee3a59e3 100644
--- a/core/lib/Thelia/Model/om/BaseCategoryPeer.php
+++ b/core/lib/Thelia/Model/om/BaseCategoryPeer.php
@@ -70,8 +70,8 @@ abstract class BaseCategoryPeer
/** the column name for the CREATED_AT field */
const CREATED_AT = 'category.CREATED_AT';
- /** the column name for the UPDATE_AT field */
- const UPDATE_AT = 'category.UPDATE_AT';
+ /** the column name for the UPDATED_AT field */
+ const UPDATED_AT = 'category.UPDATED_AT';
/** The default string format for model objects of the related table **/
const DEFAULT_STRING_FORMAT = 'YAML';
@@ -92,11 +92,11 @@ abstract class BaseCategoryPeer
* e.g. CategoryPeer::$fieldNames[CategoryPeer::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- BasePeer::TYPE_PHPNAME => array ('Id', 'Parent', 'Link', 'Visible', 'Position', 'CreatedAt', 'UpdateAt', ),
- BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'parent', 'link', 'visible', 'position', 'createdAt', 'updateAt', ),
- BasePeer::TYPE_COLNAME => array (CategoryPeer::ID, CategoryPeer::PARENT, CategoryPeer::LINK, CategoryPeer::VISIBLE, CategoryPeer::POSITION, CategoryPeer::CREATED_AT, CategoryPeer::UPDATE_AT, ),
- BasePeer::TYPE_RAW_COLNAME => array ('ID', 'PARENT', 'LINK', 'VISIBLE', 'POSITION', 'CREATED_AT', 'UPDATE_AT', ),
- BasePeer::TYPE_FIELDNAME => array ('id', 'parent', 'link', 'visible', 'position', 'created_at', 'update_at', ),
+ BasePeer::TYPE_PHPNAME => array ('Id', 'Parent', 'Link', 'Visible', 'Position', 'CreatedAt', 'UpdatedAt', ),
+ BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'parent', 'link', 'visible', 'position', 'createdAt', 'updatedAt', ),
+ BasePeer::TYPE_COLNAME => array (CategoryPeer::ID, CategoryPeer::PARENT, CategoryPeer::LINK, CategoryPeer::VISIBLE, CategoryPeer::POSITION, CategoryPeer::CREATED_AT, CategoryPeer::UPDATED_AT, ),
+ BasePeer::TYPE_RAW_COLNAME => array ('ID', 'PARENT', 'LINK', 'VISIBLE', 'POSITION', 'CREATED_AT', 'UPDATED_AT', ),
+ BasePeer::TYPE_FIELDNAME => array ('id', 'parent', 'link', 'visible', 'position', 'created_at', 'updated_at', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
);
@@ -107,11 +107,11 @@ abstract class BaseCategoryPeer
* e.g. CategoryPeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Parent' => 1, 'Link' => 2, 'Visible' => 3, 'Position' => 4, 'CreatedAt' => 5, 'UpdateAt' => 6, ),
- BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'parent' => 1, 'link' => 2, 'visible' => 3, 'position' => 4, 'createdAt' => 5, 'updateAt' => 6, ),
- BasePeer::TYPE_COLNAME => array (CategoryPeer::ID => 0, CategoryPeer::PARENT => 1, CategoryPeer::LINK => 2, CategoryPeer::VISIBLE => 3, CategoryPeer::POSITION => 4, CategoryPeer::CREATED_AT => 5, CategoryPeer::UPDATE_AT => 6, ),
- BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'PARENT' => 1, 'LINK' => 2, 'VISIBLE' => 3, 'POSITION' => 4, 'CREATED_AT' => 5, 'UPDATE_AT' => 6, ),
- BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'parent' => 1, 'link' => 2, 'visible' => 3, 'position' => 4, 'created_at' => 5, 'update_at' => 6, ),
+ BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Parent' => 1, 'Link' => 2, 'Visible' => 3, 'Position' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
+ BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'parent' => 1, 'link' => 2, 'visible' => 3, 'position' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
+ BasePeer::TYPE_COLNAME => array (CategoryPeer::ID => 0, CategoryPeer::PARENT => 1, CategoryPeer::LINK => 2, CategoryPeer::VISIBLE => 3, CategoryPeer::POSITION => 4, CategoryPeer::CREATED_AT => 5, CategoryPeer::UPDATED_AT => 6, ),
+ BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'PARENT' => 1, 'LINK' => 2, 'VISIBLE' => 3, 'POSITION' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
+ BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'parent' => 1, 'link' => 2, 'visible' => 3, 'position' => 4, 'created_at' => 5, 'updated_at' => 6, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
);
@@ -192,7 +192,7 @@ abstract class BaseCategoryPeer
$criteria->addSelectColumn(CategoryPeer::VISIBLE);
$criteria->addSelectColumn(CategoryPeer::POSITION);
$criteria->addSelectColumn(CategoryPeer::CREATED_AT);
- $criteria->addSelectColumn(CategoryPeer::UPDATE_AT);
+ $criteria->addSelectColumn(CategoryPeer::UPDATED_AT);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.PARENT');
@@ -200,7 +200,7 @@ abstract class BaseCategoryPeer
$criteria->addSelectColumn($alias . '.VISIBLE');
$criteria->addSelectColumn($alias . '.POSITION');
$criteria->addSelectColumn($alias . '.CREATED_AT');
- $criteria->addSelectColumn($alias . '.UPDATE_AT');
+ $criteria->addSelectColumn($alias . '.UPDATED_AT');
}
}
diff --git a/core/lib/Thelia/Model/om/BaseCategoryQuery.php b/core/lib/Thelia/Model/om/BaseCategoryQuery.php
index 3dcae6511..aa55b8c55 100644
--- a/core/lib/Thelia/Model/om/BaseCategoryQuery.php
+++ b/core/lib/Thelia/Model/om/BaseCategoryQuery.php
@@ -35,7 +35,7 @@ use Thelia\Model\Rewriting;
* @method CategoryQuery orderByVisible($order = Criteria::ASC) Order by the visible column
* @method CategoryQuery orderByPosition($order = Criteria::ASC) Order by the position column
* @method CategoryQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
- * @method CategoryQuery orderByUpdateAt($order = Criteria::ASC) Order by the update_at column
+ * @method CategoryQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
* @method CategoryQuery groupById() Group by the id column
* @method CategoryQuery groupByParent() Group by the parent column
@@ -43,7 +43,7 @@ use Thelia\Model\Rewriting;
* @method CategoryQuery groupByVisible() Group by the visible column
* @method CategoryQuery groupByPosition() Group by the position column
* @method CategoryQuery groupByCreatedAt() Group by the created_at column
- * @method CategoryQuery groupByUpdateAt() Group by the update_at column
+ * @method CategoryQuery groupByUpdatedAt() Group by the updated_at column
*
* @method CategoryQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
* @method CategoryQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
@@ -90,7 +90,7 @@ use Thelia\Model\Rewriting;
* @method Category findOneByVisible(int $visible) Return the first Category filtered by the visible column
* @method Category findOneByPosition(int $position) Return the first Category filtered by the position column
* @method Category findOneByCreatedAt(string $created_at) Return the first Category filtered by the created_at column
- * @method Category findOneByUpdateAt(string $update_at) Return the first Category filtered by the update_at column
+ * @method Category findOneByUpdatedAt(string $updated_at) Return the first Category filtered by the updated_at column
*
* @method array findById(int $id) Return Category objects filtered by the id column
* @method array findByParent(int $parent) Return Category objects filtered by the parent column
@@ -98,7 +98,7 @@ use Thelia\Model\Rewriting;
* @method array findByVisible(int $visible) Return Category objects filtered by the visible column
* @method array findByPosition(int $position) Return Category objects filtered by the position column
* @method array findByCreatedAt(string $created_at) Return Category objects filtered by the created_at column
- * @method array findByUpdateAt(string $update_at) Return Category objects filtered by the update_at column
+ * @method array findByUpdatedAt(string $updated_at) Return Category objects filtered by the updated_at column
*
* @package propel.generator.Thelia.Model.om
*/
@@ -188,7 +188,7 @@ abstract class BaseCategoryQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT `ID`, `PARENT`, `LINK`, `VISIBLE`, `POSITION`, `CREATED_AT`, `UPDATE_AT` FROM `category` WHERE `ID` = :p0';
+ $sql = 'SELECT `ID`, `PARENT`, `LINK`, `VISIBLE`, `POSITION`, `CREATED_AT`, `UPDATED_AT` FROM `category` WHERE `ID` = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -516,16 +516,16 @@ abstract class BaseCategoryQuery extends ModelCriteria
}
/**
- * Filter the query on the update_at column
+ * Filter the query on the updated_at column
*
* Example usage:
*
- * $query->filterByUpdateAt('2011-03-14'); // WHERE update_at = '2011-03-14'
- * $query->filterByUpdateAt('now'); // WHERE update_at = '2011-03-14'
- * $query->filterByUpdateAt(array('max' => 'yesterday')); // WHERE update_at > '2011-03-13'
+ * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+ * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+ * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
*
*
- * @param mixed $updateAt The value to use as filter.
+ * @param mixed $updatedAt The value to use as filter.
* Values can be integers (unix timestamps), DateTime objects, or strings.
* Empty strings are treated as NULL.
* Use scalar values for equality.
@@ -535,16 +535,16 @@ abstract class BaseCategoryQuery extends ModelCriteria
*
* @return CategoryQuery The current query, for fluid interface
*/
- public function filterByUpdateAt($updateAt = null, $comparison = null)
+ public function filterByUpdatedAt($updatedAt = null, $comparison = null)
{
- if (is_array($updateAt)) {
+ if (is_array($updatedAt)) {
$useMinMax = false;
- if (isset($updateAt['min'])) {
- $this->addUsingAlias(CategoryPeer::UPDATE_AT, $updateAt['min'], Criteria::GREATER_EQUAL);
+ if (isset($updatedAt['min'])) {
+ $this->addUsingAlias(CategoryPeer::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
$useMinMax = true;
}
- if (isset($updateAt['max'])) {
- $this->addUsingAlias(CategoryPeer::UPDATE_AT, $updateAt['max'], Criteria::LESS_EQUAL);
+ if (isset($updatedAt['max'])) {
+ $this->addUsingAlias(CategoryPeer::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
$useMinMax = true;
}
if ($useMinMax) {
@@ -555,7 +555,7 @@ abstract class BaseCategoryQuery extends ModelCriteria
}
}
- return $this->addUsingAlias(CategoryPeer::UPDATE_AT, $updateAt, $comparison);
+ return $this->addUsingAlias(CategoryPeer::UPDATED_AT, $updatedAt, $comparison);
}
/**
diff --git a/local/config/build.properties b/local/config/build.properties
deleted file mode 100644
index edd26d685..000000000
--- a/local/config/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# Database driver
-propel.database = mysql
-
-# Project name
-propel.project = thelia
-
-propel.schema.validate = false
-
-propel.namespace.autoPackage = true
-
-# The directory where Propel should output generated object model classes.
-propel.php.dir = ${propel.project.dir}/../../core/lib
-
-
diff --git a/local/config/thelia.schema.xml b/local/config/thelia.schema.xml
index 62c51aa5e..2b7356748 100644
--- a/local/config/thelia.schema.xml
+++ b/local/config/thelia.schema.xml
@@ -84,7 +84,7 @@
-
+
@@ -98,7 +98,7 @@
-
+
@@ -237,7 +237,7 @@
-
+
@@ -316,7 +316,7 @@