TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia into coupon

Browse Source 
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
This commit is contained in:
gmorel
2013-09-02 17:25:25 +02:00
parent 451dc93eb3 3191a928ab
commit 33b8ceb24e
166 changed files with 2213 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class AttributeAvI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute_av', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/AttributeAvTableMap.php
View File

@@ -106,7 +106,7 @@ class AttributeAvTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/AttributeI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class AttributeI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/AttributeTableMap.php
View File

@@ -101,7 +101,7 @@ class AttributeTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class CategoryDocumentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category_document', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php
View File

@@ -111,7 +111,7 @@ class CategoryDocumentTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/CategoryI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class CategoryI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class CategoryImageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category_image', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/CategoryImageTableMap.php
View File

@@ -111,7 +111,7 @@ class CategoryImageTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/CategoryTableMap.php
View File

@@ -126,7 +126,7 @@ class CategoryTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/ConfigI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ConfigI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'config', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ConfigTableMap.php
View File

@@ -116,7 +116,7 @@ class ConfigTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ContentDocumentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content_document', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ContentDocumentTableMap.php
View File

@@ -111,7 +111,7 @@ class ContentDocumentTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/ContentI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ContentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ContentImageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content_image', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ContentImageTableMap.php
View File

@@ -111,7 +111,7 @@ class ContentImageTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/ContentTableMap.php
View File

@@ -121,7 +121,7 @@ class ContentTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/CountryI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class CountryI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'country', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/CountryTableMap.php
View File

@@ -116,7 +116,7 @@ class CountryTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

7
core/lib/Thelia/Model/Map/CouponI18nTableMap.php
View File

@@ -150,6 +150,7 @@ class CouponI18nTableMap extends TableMap
$this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null);
$this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
} // initialize()
/**
@@ -349,15 +350,9 @@ class CouponI18nTableMap extends TableMap
if (null === $alias) {
$criteria->addSelectColumn(CouponI18nTableMap::ID);
$criteria->addSelectColumn(CouponI18nTableMap::LOCALE);
$criteria->addSelectColumn(CouponI18nTableMap::TITLE);
$criteria->addSelectColumn(CouponI18nTableMap::SHORT_DESCRIPTION);
$criteria->addSelectColumn(CouponI18nTableMap::DESCRIPTION);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.LOCALE');
$criteria->addSelectColumn($alias . '.TITLE');
$criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION');
$criteria->addSelectColumn($alias . '.DESCRIPTION');
}
}

2
core/lib/Thelia/Model/Map/CouponTableMap.php
View File

@@ -156,7 +156,7 @@ class CouponTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php
View File

@@ -136,7 +136,7 @@ class CurrencyI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'currency', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('NAME', 'Name', 'VARCHAR', false, 45, null);
} // initialize()

2
core/lib/Thelia/Model/Map/CurrencyTableMap.php
View File

@@ -121,7 +121,7 @@ class CurrencyTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php
View File

@@ -141,7 +141,7 @@ class CustomerTitleI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'customer_title', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('SHORT', 'Short', 'VARCHAR', false, 10, null);
$this->addColumn('LONG', 'Long', 'VARCHAR', false, 45, null);
} // initialize()

2
core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
View File

@@ -106,7 +106,7 @@ class CustomerTitleTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class FeatureAvI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature_av', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/FeatureAvTableMap.php
View File

@@ -106,7 +106,7 @@ class FeatureAvTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/FeatureI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class FeatureI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/FeatureTableMap.php
View File

@@ -106,7 +106,7 @@ class FeatureTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class FolderDocumentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder_document', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/FolderDocumentTableMap.php
View File

@@ -111,7 +111,7 @@ class FolderDocumentTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/FolderI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class FolderI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class FolderImageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder_image', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/FolderImageTableMap.php
View File

@@ -111,7 +111,7 @@ class FolderImageTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/FolderTableMap.php
View File

@@ -126,7 +126,7 @@ class FolderTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/GroupI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class GroupI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'group', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/GroupTableMap.php
View File

@@ -101,7 +101,7 @@ class GroupTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

58
core/lib/Thelia/Model/Map/MessageI18nTableMap.php
View File

@@ -57,7 +57,7 @@ class MessageI18nTableMap extends TableMap
/**
* The total number of columns
*/
const NUM_COLUMNS = 5;
const NUM_COLUMNS = 6;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class MessageI18nTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
const NUM_HYDRATE_COLUMNS = 5;
const NUM_HYDRATE_COLUMNS = 6;
/**
* the column name for the ID field
@@ -85,14 +85,19 @@ class MessageI18nTableMap extends TableMap
const TITLE = 'message_i18n.TITLE';
/**
* the column name for the DESCRIPTION field
* the column name for the SUBJECT field
*/
const DESCRIPTION = 'message_i18n.DESCRIPTION';
const SUBJECT = 'message_i18n.SUBJECT';
/**
* the column name for the DESCRIPTION_HTML field
* the column name for the TEXT_MESSAGE field
*/
const DESCRIPTION_HTML = 'message_i18n.DESCRIPTION_HTML';
const TEXT_MESSAGE = 'message_i18n.TEXT_MESSAGE';
/**
* the column name for the HTML_MESSAGE field
*/
const HTML_MESSAGE = 'message_i18n.HTML_MESSAGE';
/**
* The default string format for model objects of the related table
@@ -106,12 +111,12 @@ class MessageI18nTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
self::TYPE_PHPNAME => array('Id', 'Locale', 'Title', 'Description', 'DescriptionHtml', ),
self::TYPE_STUDLYPHPNAME => array('id', 'locale', 'title', 'description', 'descriptionHtml', ),
self::TYPE_COLNAME => array(MessageI18nTableMap::ID, MessageI18nTableMap::LOCALE, MessageI18nTableMap::TITLE, MessageI18nTableMap::DESCRIPTION, MessageI18nTableMap::DESCRIPTION_HTML, ),
self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', 'TITLE', 'DESCRIPTION', 'DESCRIPTION_HTML', ),
self::TYPE_FIELDNAME => array('id', 'locale', 'title', 'description', 'description_html', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, )
self::TYPE_PHPNAME => array('Id', 'Locale', 'Title', 'Subject', 'TextMessage', 'HtmlMessage', ),
self::TYPE_STUDLYPHPNAME => array('id', 'locale', 'title', 'subject', 'textMessage', 'htmlMessage', ),
self::TYPE_COLNAME => array(MessageI18nTableMap::ID, MessageI18nTableMap::LOCALE, MessageI18nTableMap::TITLE, MessageI18nTableMap::SUBJECT, MessageI18nTableMap::TEXT_MESSAGE, MessageI18nTableMap::HTML_MESSAGE, ),
self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', 'TITLE', 'SUBJECT', 'TEXT_MESSAGE', 'HTML_MESSAGE', ),
self::TYPE_FIELDNAME => array('id', 'locale', 'title', 'subject', 'text_message', 'html_message', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
);
/**
@@ -121,12 +126,12 @@ class MessageI18nTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, 'Title' => 2, 'Description' => 3, 'DescriptionHtml' => 4, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, 'descriptionHtml' => 4, ),
self::TYPE_COLNAME => array(MessageI18nTableMap::ID => 0, MessageI18nTableMap::LOCALE => 1, MessageI18nTableMap::TITLE => 2, MessageI18nTableMap::DESCRIPTION => 3, MessageI18nTableMap::DESCRIPTION_HTML => 4, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, 'TITLE' => 2, 'DESCRIPTION' => 3, 'DESCRIPTION_HTML' => 4, ),
self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, 'description_html' => 4, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, )
self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, 'Title' => 2, 'Subject' => 3, 'TextMessage' => 4, 'HtmlMessage' => 5, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'subject' => 3, 'textMessage' => 4, 'htmlMessage' => 5, ),
self::TYPE_COLNAME => array(MessageI18nTableMap::ID => 0, MessageI18nTableMap::LOCALE => 1, MessageI18nTableMap::TITLE => 2, MessageI18nTableMap::SUBJECT => 3, MessageI18nTableMap::TEXT_MESSAGE => 4, MessageI18nTableMap::HTML_MESSAGE => 5, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, 'TITLE' => 2, 'SUBJECT' => 3, 'TEXT_MESSAGE' => 4, 'HTML_MESSAGE' => 5, ),
self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'subject' => 3, 'text_message' => 4, 'html_message' => 5, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
);
/**
@@ -146,10 +151,11 @@ class MessageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'message', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'LONGVARCHAR', false, null, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('DESCRIPTION_HTML', 'DescriptionHtml', 'CLOB', false, null, null);
$this->addColumn('SUBJECT', 'Subject', 'LONGVARCHAR', false, null, null);
$this->addColumn('TEXT_MESSAGE', 'TextMessage', 'CLOB', false, null, null);
$this->addColumn('HTML_MESSAGE', 'HtmlMessage', 'CLOB', false, null, null);
} // initialize()
/**
@@ -350,14 +356,16 @@ class MessageI18nTableMap extends TableMap
$criteria->addSelectColumn(MessageI18nTableMap::ID);
$criteria->addSelectColumn(MessageI18nTableMap::LOCALE);
$criteria->addSelectColumn(MessageI18nTableMap::TITLE);
$criteria->addSelectColumn(MessageI18nTableMap::DESCRIPTION);
$criteria->addSelectColumn(MessageI18nTableMap::DESCRIPTION_HTML);
$criteria->addSelectColumn(MessageI18nTableMap::SUBJECT);
$criteria->addSelectColumn(MessageI18nTableMap::TEXT_MESSAGE);
$criteria->addSelectColumn(MessageI18nTableMap::HTML_MESSAGE);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.LOCALE');
$criteria->addSelectColumn($alias . '.TITLE');
$criteria->addSelectColumn($alias . '.DESCRIPTION');
$criteria->addSelectColumn($alias . '.DESCRIPTION_HTML');
$criteria->addSelectColumn($alias . '.SUBJECT');
$criteria->addSelectColumn($alias . '.TEXT_MESSAGE');
$criteria->addSelectColumn($alias . '.HTML_MESSAGE');
}
}

50
core/lib/Thelia/Model/Map/MessageTableMap.php
View File

@@ -57,7 +57,7 @@ class MessageTableMap extends TableMap
/**
* The total number of columns
*/
const NUM_COLUMNS = 9;
const NUM_COLUMNS = 8;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class MessageTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
const NUM_HYDRATE_COLUMNS = 9;
const NUM_HYDRATE_COLUMNS = 8;
/**
* the column name for the ID field
@@ -75,20 +75,15 @@ class MessageTableMap extends TableMap
const ID = 'message.ID';
/**
* the column name for the CODE field
* the column name for the NAME field
*/
const CODE = 'message.CODE';
const NAME = 'message.NAME';
/**
* the column name for the SECURED field
*/
const SECURED = 'message.SECURED';
/**
* the column name for the REF field
*/
const REF = 'message.REF';
/**
* the column name for the CREATED_AT field
*/
@@ -126,7 +121,7 @@ class MessageTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
@@ -135,12 +130,12 @@ class MessageTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
self::TYPE_PHPNAME => array('Id', 'Code', 'Secured', 'Ref', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
self::TYPE_STUDLYPHPNAME => array('id', 'code', 'secured', 'ref', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
self::TYPE_COLNAME => array(MessageTableMap::ID, MessageTableMap::CODE, MessageTableMap::SECURED, MessageTableMap::REF, MessageTableMap::CREATED_AT, MessageTableMap::UPDATED_AT, MessageTableMap::VERSION, MessageTableMap::VERSION_CREATED_AT, MessageTableMap::VERSION_CREATED_BY, ),
self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'SECURED', 'REF', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
self::TYPE_FIELDNAME => array('id', 'code', 'secured', 'ref', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
self::TYPE_PHPNAME => array('Id', 'Name', 'Secured', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
self::TYPE_STUDLYPHPNAME => array('id', 'name', 'secured', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
self::TYPE_COLNAME => array(MessageTableMap::ID, MessageTableMap::NAME, MessageTableMap::SECURED, MessageTableMap::CREATED_AT, MessageTableMap::UPDATED_AT, MessageTableMap::VERSION, MessageTableMap::VERSION_CREATED_AT, MessageTableMap::VERSION_CREATED_BY, ),
self::TYPE_RAW_COLNAME => array('ID', 'NAME', 'SECURED', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
self::TYPE_FIELDNAME => array('id', 'name', 'secured', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -150,12 +145,12 @@ class MessageTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Secured' => 2, 'Ref' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, 'Version' => 6, 'VersionCreatedAt' => 7, 'VersionCreatedBy' => 8, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'secured' => 2, 'ref' => 3, 'createdAt' => 4, 'updatedAt' => 5, 'version' => 6, 'versionCreatedAt' => 7, 'versionCreatedBy' => 8, ),
self::TYPE_COLNAME => array(MessageTableMap::ID => 0, MessageTableMap::CODE => 1, MessageTableMap::SECURED => 2, MessageTableMap::REF => 3, MessageTableMap::CREATED_AT => 4, MessageTableMap::UPDATED_AT => 5, MessageTableMap::VERSION => 6, MessageTableMap::VERSION_CREATED_AT => 7, MessageTableMap::VERSION_CREATED_BY => 8, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'SECURED' => 2, 'REF' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, 'VERSION' => 6, 'VERSION_CREATED_AT' => 7, 'VERSION_CREATED_BY' => 8, ),
self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'secured' => 2, 'ref' => 3, 'created_at' => 4, 'updated_at' => 5, 'version' => 6, 'version_created_at' => 7, 'version_created_by' => 8, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
self::TYPE_PHPNAME => array('Id' => 0, 'Name' => 1, 'Secured' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, 'Version' => 5, 'VersionCreatedAt' => 6, 'VersionCreatedBy' => 7, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'name' => 1, 'secured' => 2, 'createdAt' => 3, 'updatedAt' => 4, 'version' => 5, 'versionCreatedAt' => 6, 'versionCreatedBy' => 7, ),
self::TYPE_COLNAME => array(MessageTableMap::ID => 0, MessageTableMap::NAME => 1, MessageTableMap::SECURED => 2, MessageTableMap::CREATED_AT => 3, MessageTableMap::UPDATED_AT => 4, MessageTableMap::VERSION => 5, MessageTableMap::VERSION_CREATED_AT => 6, MessageTableMap::VERSION_CREATED_BY => 7, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'NAME' => 1, 'SECURED' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, 'VERSION' => 5, 'VERSION_CREATED_AT' => 6, 'VERSION_CREATED_BY' => 7, ),
self::TYPE_FIELDNAME => array('id' => 0, 'name' => 1, 'secured' => 2, 'created_at' => 3, 'updated_at' => 4, 'version' => 5, 'version_created_at' => 6, 'version_created_by' => 7, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -175,9 +170,8 @@ class MessageTableMap extends TableMap
$this->setUseIdGenerator(true);
// columns
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
$this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null);
$this->addColumn('NAME', 'Name', 'VARCHAR', true, 255, null);
$this->addColumn('SECURED', 'Secured', 'TINYINT', false, null, null);
$this->addColumn('REF', 'Ref', 'VARCHAR', false, 255, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('VERSION', 'Version', 'INTEGER', false, null, 0);
@@ -204,7 +198,7 @@ class MessageTableMap extends TableMap
{
return array(
'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, description, description_html', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, subject, text_message, html_message', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
'versionable' => array('version_column' => 'version', 'version_table' => '', 'log_created_at' => 'true', 'log_created_by' => 'true', 'log_comment' => 'false', 'version_created_at_column' => 'version_created_at', 'version_created_by_column' => 'version_created_by', 'version_comment_column' => 'version_comment', ),
);
} // getBehaviors()
@@ -358,9 +352,8 @@ class MessageTableMap extends TableMap
{
if (null === $alias) {
$criteria->addSelectColumn(MessageTableMap::ID);
$criteria->addSelectColumn(MessageTableMap::CODE);
$criteria->addSelectColumn(MessageTableMap::NAME);
$criteria->addSelectColumn(MessageTableMap::SECURED);
$criteria->addSelectColumn(MessageTableMap::REF);
$criteria->addSelectColumn(MessageTableMap::CREATED_AT);
$criteria->addSelectColumn(MessageTableMap::UPDATED_AT);
$criteria->addSelectColumn(MessageTableMap::VERSION);
@@ -368,9 +361,8 @@ class MessageTableMap extends TableMap
$criteria->addSelectColumn(MessageTableMap::VERSION_CREATED_BY);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.CODE');
$criteria->addSelectColumn($alias . '.NAME');
$criteria->addSelectColumn($alias . '.SECURED');
$criteria->addSelectColumn($alias . '.REF');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
$criteria->addSelectColumn($alias . '.VERSION');

50
core/lib/Thelia/Model/Map/MessageVersionTableMap.php
View File

@@ -57,7 +57,7 @@ class MessageVersionTableMap extends TableMap
/**
* The total number of columns
*/
const NUM_COLUMNS = 9;
const NUM_COLUMNS = 8;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class MessageVersionTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
const NUM_HYDRATE_COLUMNS = 9;
const NUM_HYDRATE_COLUMNS = 8;
/**
* the column name for the ID field
@@ -75,20 +75,15 @@ class MessageVersionTableMap extends TableMap
const ID = 'message_version.ID';
/**
* the column name for the CODE field
* the column name for the NAME field
*/
const CODE = 'message_version.CODE';
const NAME = 'message_version.NAME';
/**
* the column name for the SECURED field
*/
const SECURED = 'message_version.SECURED';
/**
* the column name for the REF field
*/
const REF = 'message_version.REF';
/**
* the column name for the CREATED_AT field
*/
@@ -126,12 +121,12 @@ class MessageVersionTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
self::TYPE_PHPNAME => array('Id', 'Code', 'Secured', 'Ref', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
self::TYPE_STUDLYPHPNAME => array('id', 'code', 'secured', 'ref', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
self::TYPE_COLNAME => array(MessageVersionTableMap::ID, MessageVersionTableMap::CODE, MessageVersionTableMap::SECURED, MessageVersionTableMap::REF, MessageVersionTableMap::CREATED_AT, MessageVersionTableMap::UPDATED_AT, MessageVersionTableMap::VERSION, MessageVersionTableMap::VERSION_CREATED_AT, MessageVersionTableMap::VERSION_CREATED_BY, ),
self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'SECURED', 'REF', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
self::TYPE_FIELDNAME => array('id', 'code', 'secured', 'ref', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
self::TYPE_PHPNAME => array('Id', 'Name', 'Secured', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
self::TYPE_STUDLYPHPNAME => array('id', 'name', 'secured', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
self::TYPE_COLNAME => array(MessageVersionTableMap::ID, MessageVersionTableMap::NAME, MessageVersionTableMap::SECURED, MessageVersionTableMap::CREATED_AT, MessageVersionTableMap::UPDATED_AT, MessageVersionTableMap::VERSION, MessageVersionTableMap::VERSION_CREATED_AT, MessageVersionTableMap::VERSION_CREATED_BY, ),
self::TYPE_RAW_COLNAME => array('ID', 'NAME', 'SECURED', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
self::TYPE_FIELDNAME => array('id', 'name', 'secured', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -141,12 +136,12 @@ class MessageVersionTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Secured' => 2, 'Ref' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, 'Version' => 6, 'VersionCreatedAt' => 7, 'VersionCreatedBy' => 8, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'secured' => 2, 'ref' => 3, 'createdAt' => 4, 'updatedAt' => 5, 'version' => 6, 'versionCreatedAt' => 7, 'versionCreatedBy' => 8, ),
self::TYPE_COLNAME => array(MessageVersionTableMap::ID => 0, MessageVersionTableMap::CODE => 1, MessageVersionTableMap::SECURED => 2, MessageVersionTableMap::REF => 3, MessageVersionTableMap::CREATED_AT => 4, MessageVersionTableMap::UPDATED_AT => 5, MessageVersionTableMap::VERSION => 6, MessageVersionTableMap::VERSION_CREATED_AT => 7, MessageVersionTableMap::VERSION_CREATED_BY => 8, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'SECURED' => 2, 'REF' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, 'VERSION' => 6, 'VERSION_CREATED_AT' => 7, 'VERSION_CREATED_BY' => 8, ),
self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'secured' => 2, 'ref' => 3, 'created_at' => 4, 'updated_at' => 5, 'version' => 6, 'version_created_at' => 7, 'version_created_by' => 8, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
self::TYPE_PHPNAME => array('Id' => 0, 'Name' => 1, 'Secured' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, 'Version' => 5, 'VersionCreatedAt' => 6, 'VersionCreatedBy' => 7, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'name' => 1, 'secured' => 2, 'createdAt' => 3, 'updatedAt' => 4, 'version' => 5, 'versionCreatedAt' => 6, 'versionCreatedBy' => 7, ),
self::TYPE_COLNAME => array(MessageVersionTableMap::ID => 0, MessageVersionTableMap::NAME => 1, MessageVersionTableMap::SECURED => 2, MessageVersionTableMap::CREATED_AT => 3, MessageVersionTableMap::UPDATED_AT => 4, MessageVersionTableMap::VERSION => 5, MessageVersionTableMap::VERSION_CREATED_AT => 6, MessageVersionTableMap::VERSION_CREATED_BY => 7, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'NAME' => 1, 'SECURED' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, 'VERSION' => 5, 'VERSION_CREATED_AT' => 6, 'VERSION_CREATED_BY' => 7, ),
self::TYPE_FIELDNAME => array('id' => 0, 'name' => 1, 'secured' => 2, 'created_at' => 3, 'updated_at' => 4, 'version' => 5, 'version_created_at' => 6, 'version_created_by' => 7, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -166,9 +161,8 @@ class MessageVersionTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'message', 'ID', true, null, null);
$this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null);
$this->addColumn('NAME', 'Name', 'VARCHAR', true, 255, null);
$this->addColumn('SECURED', 'Secured', 'TINYINT', false, null, null);
$this->addColumn('REF', 'Ref', 'VARCHAR', false, 255, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
$this->addPrimaryKey('VERSION', 'Version', 'INTEGER', true, null, 0);
@@ -251,11 +245,11 @@ class MessageVersionTableMap extends TableMap
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 && $row[TableMap::TYPE_NUM == $indexType ? 6 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) {
if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 5 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) {
return null;
}
return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 6 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]));
return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 5 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]));
}
/**
@@ -372,9 +366,8 @@ class MessageVersionTableMap extends TableMap
{
if (null === $alias) {
$criteria->addSelectColumn(MessageVersionTableMap::ID);
$criteria->addSelectColumn(MessageVersionTableMap::CODE);
$criteria->addSelectColumn(MessageVersionTableMap::NAME);
$criteria->addSelectColumn(MessageVersionTableMap::SECURED);
$criteria->addSelectColumn(MessageVersionTableMap::REF);
$criteria->addSelectColumn(MessageVersionTableMap::CREATED_AT);
$criteria->addSelectColumn(MessageVersionTableMap::UPDATED_AT);
$criteria->addSelectColumn(MessageVersionTableMap::VERSION);
@@ -382,9 +375,8 @@ class MessageVersionTableMap extends TableMap
$criteria->addSelectColumn(MessageVersionTableMap::VERSION_CREATED_BY);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.CODE');
$criteria->addSelectColumn($alias . '.NAME');
$criteria->addSelectColumn($alias . '.SECURED');
$criteria->addSelectColumn($alias . '.REF');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
$criteria->addSelectColumn($alias . '.VERSION');

2
core/lib/Thelia/Model/Map/ModuleI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ModuleI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'module', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ModuleTableMap.php
View File

@@ -116,7 +116,7 @@ class ModuleTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class OrderStatusI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'order_status', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/OrderStatusTableMap.php
View File

@@ -101,7 +101,7 @@ class OrderStatusTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ProductDocumentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product_document', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ProductDocumentTableMap.php
View File

@@ -111,7 +111,7 @@ class ProductDocumentTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/ProductI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ProductI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ProductImageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product_image', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ProductImageTableMap.php
View File

@@ -111,7 +111,7 @@ class ProductImageTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/ProductTableMap.php
View File

@@ -131,7 +131,7 @@ class ProductTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/ResourceI18nTableMap.php
View File

@@ -151,7 +151,7 @@ class ResourceI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'resource', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);

2
core/lib/Thelia/Model/Map/ResourceTableMap.php
View File

@@ -101,7 +101,7 @@ class ResourceTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

4
core/lib/Thelia/Model/Map/RewritingUrlTableMap.php
View File

@@ -162,9 +162,9 @@ class RewritingUrlTableMap extends TableMap
// columns
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
$this->addColumn('URL', 'Url', 'VARCHAR', true, 255, null);
$this->addColumn('VIEW', 'View', 'VARCHAR', true, 255, null);
$this->addColumn('VIEW', 'View', 'VARCHAR', false, 255, null);
$this->addColumn('VIEW_ID', 'ViewId', 'VARCHAR', false, 255, null);
$this->addColumn('VIEW_LOCALE', 'ViewLocale', 'VARCHAR', true, 255, null);
$this->addColumn('VIEW_LOCALE', 'ViewLocale', 'VARCHAR', false, 255, null);
$this->addForeignKey('REDIRECTED', 'Redirected', 'INTEGER', 'rewriting_url', 'ID', false, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);

2
core/lib/Thelia/Model/Map/TaxI18nTableMap.php
View File

@@ -141,7 +141,7 @@ class TaxI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
} // initialize()

2
core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
View File

@@ -131,7 +131,7 @@ class TaxRuleI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
} // initialize()
/**

2
core/lib/Thelia/Model/Map/TaxRuleTableMap.php
View File

@@ -111,7 +111,7 @@ class TaxRuleTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames

2
core/lib/Thelia/Model/Map/TaxTableMap.php
View File

@@ -101,7 +101,7 @@ class TaxTableMap extends TableMap
*
* @var string
*/
const DEFAULT_LOCALE = 'en_EN';
const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames