Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Oct 03, 2013
@marcj marcj Some migration fixes.
[Platform] Added `normalizeTable` which acts as a normalizer for the current platform, so diffs are now more accurate. This fixes a scenario added in Migration/ForeignKey.
[PgSQL] RENAME statement does not want the FQName of the table.
80bf53c
Commits on Oct 06, 2013
@willdurand willdurand Merge pull request #464 from marcj/migration
Some migration fixes.
c5662f5
Commits on Oct 10, 2013
@nicolas-bastien nicolas-bastien Add a link to github "How to create a pull request" article 37c474c
Commits on Oct 21, 2013
@willdurand willdurand Merge pull request #467 from nicolas-bastien/patch-2
Add a link to github "How to create a pull request" article
0651ea3
@robin850 robin850 Remove deprecated doc related to PHP < 5.4
magic_quotes and ze1_compatibility_mode have been removed as of PHP 5.4
f78d29d
@robin850 robin850 Update the deprecated commands
Remove the deprecated commands and replace them by the new ones. Also
update the documentation where we were relying on the propel-gen script.
Instead rely on the propel one (which should be aliased to the propel
script stored in the propel vendor directory).
fa4d9a3
@robin850 robin850 Update for some deprecated objects and methods
Update the documentation for some deprecated objects/methods:

  * containsColumn -> hasColumn
  * addParameter(array) -> setParameter(name, value)
  * Persistent -> ActiveRecordInterface
51d1b10
@robin850 robin850 Fix a broken link to the MIT license 7ac3a27
@robin850 robin850 Fix symlink location in the installation guide d88e281
@robin850 robin850 Update references to Propel 1.x generated folders
The folders generated with the propel-gen script aren't the same in
Propel 2. These folders are:

  * build/classes -> generated-classes
  * build/sql     -> generated-sql
  * build/conf    -> generated-conf

Update also the sub-structure of the generated-classes one.
03e73c4
@robin850 robin850 Update the references to the 1.x repository
Update the documentation replacing all references to the "Propel" github
repository to match the actual one.
0c9ec7d
@robin850 robin850 Move path pointing to propel to Composer's autoload
This one was easy!
f28f53a
@robin850 robin850 Update the contribution guideline
Since the new repository's design, the process to create a pull request
has been a little bit change ; update the documentation to match the
actual one.

Also remove the contribution part in the README file and move it to the
contributing file. The README was up to date with the new testing
process.

Also update the part about fixing checkstyle. To keep clean logs and
make git blame easier, we should only fix files which have been changed.
815f8a0
@robin850 robin850 Update svn co url since svn.github.com is out of date 6faab4f
@robin850 robin850 Remove the Symfony 1.x documentation
Remove all the documentation related to the integration of Propel in a
Symfony 1.x project. The sfPropelORMPlugin won't be updated for the next
Propel major release (2.0).
96da490
@robin850 robin850 Remove mentions about dbd2propel
The dbd2propel command has been removed. The whole cookbook on
DBDesigner is deprecated.
3157aef
@robin850 robin850 Update a little bit the doc for PHP 5.4 7932256
@robin850 robin850 Basic update for the documentation about BaseObject 73775ea
@robin850 robin850 Add Windows instructions to put propel bin in PATH 172fd3c
@robin850 robin850 Fix Propel's bin location with Composer set up 6097f68
@robin850 robin850 Fix a little typo on the number of generate classes c0e8dcc
@robin850 robin850 Remove references to Phing
Apart from the "Customizing build" guide which needs to be completely
updated, any reference to Phing should have been removed from the
repository.
cd06cfb
@robin850 robin850 Remove references about datasql and datadump commands
The datasql and datadump commands have been deprecated.
f186ee2
@robin850 robin850 Remove references to the old DBDesign cookbook
Since the dbd2propel command has been removed in Propel 2.0, this guide
is useless and has been still removed in 53ab611 but there were still
links pointing to it.
97dab46
@robin850 robin850 Little enhancement when displaying trees
Instead of displaying them in code blocks, let's display them
in lists.
3e80681
@willdurand willdurand Merge pull request #423 from robin850/documentation
Update the whole documentation
9f2bcd6
@willdurand willdurand Remove documentation/ folder 4f2bb75
@willdurand willdurand Merge pull request #468 from propelorm/remove-doc-folder
Remove documentation/ folder
8a601c6
@willdurand willdurand Add branch alias d578844
Commits on Oct 27, 2013
@mpscholten Fixed Exception was created with wrong constructor call c957f77
@willdurand willdurand Merge pull request #469 from mpscholten/exception-bug
Fixed Exception was created with wrong constructor call
0f1be63
Commits on Oct 28, 2013
@mpscholten Changed old documentation-url to the new repository-url dc1c45a
@willdurand willdurand Merge pull request #471 from mpscholten/contribute
Changed old documentation-url to the new repository-url
fc1de8d
Commits on Nov 07, 2013
@marcj marcj Fixed bug where tableMaps were not cached.
#478 - Performance increase from 16,252,928bytes/3.284s =>  12,058,624bytes/2.170s
b017852
@marcj marcj Removed slow in_array and replaced it with isset for `modifiedColumns`.
#478 - Performance increase 100ms
5389763
@marcj marcj Removed slow call_user_func and replaced it direct call.
#478 - Performance increase 50+ms
5e27559
Commits on Nov 08, 2013
@willdurand willdurand Merge pull request #479 from marcj/perf
Perf
736a3b3
Commits on Nov 10, 2013
@marcj marcj Fixed memory leak in Collection class with a new implementation.
#478 - memory consumption optimized from 12,377,160 bytes to 6,053,976.
c32108e
Commits on Nov 11, 2013
@willdurand willdurand Merge pull request #482 from marcj/perf2
Fixed memory leak in Collection class with a new implementation.
1875723
Commits on Nov 22, 2013
@lunika lunika add compatible doCount and doSelect methods from query_cache behavior
with ModelCriteria class

return DataFetcherInterface instance for doCount and doSelect methods in
query_cache behavior
cd47368
@willdurand willdurand Merge pull request #484 from lunika/master
fix query_cache behavior compatibility with Criteria and ModelCriteria
47a5903
Commits on Dec 01, 2013
@marcj marcj Fixed notice a2b9369
Commits on Dec 02, 2013
@willdurand willdurand Merge pull request #494 from marcj/patch-1
Fixed notice
1f321f4
Commits on Dec 20, 2013
@K-Phoen K-Phoen Tables with no primary keys confused code generators fbdc1b3
Commits on Dec 30, 2013
@lunika lunika must test if setIgnoreCase exists on each criterion 8c32a89
Commits on Dec 31, 2013
@csanquer csanquer fix failing tests in ArrayToPhpConverterTest 02b8661
@willdurand willdurand Merge pull request #506 from csanquer/master
fix failing tests in ArrayToPhpConverterTest
59f6551
@staabm staabm Added hhvm to travis config d05f094
@willdurand willdurand Merge pull request #507 from staabm/patch-1
Added hhvm to travis config
1c2f26a
Commits on Jan 03, 2014
@willdurand willdurand Merge pull request #505 from lunika/getParamsIssue
must test if setIgnoreCase exists on each criterion
5e7cd44
@willdurand willdurand Merge pull request #504 from K-Phoen/fix-452
Fix #452
079f1c0
Commits on Jan 07, 2014
@gossi gossi Fixes #508 7c71da2
Commits on Jan 08, 2014
@willdurand willdurand Merge pull request #510 from gossi/master
Add DataFetcherInterface for generated Map Classes. Fixes #508
800318f
@lunika lunika fix array casting in InCriterion and InModelCriterion. Fix #492 d1e3f06
@willdurand willdurand Merge pull request #512 from lunika/InCriterionFix
fix array casting in InCriterion and InModelCriterion. Fix #492
793aea6
Commits on Jan 12, 2014
@marcj marcj Fixed missing closing "database" tag. fed7670
@marcj marcj Fixed #520, related to #452 e56bc76
Commits on Jan 13, 2014
@willdurand willdurand Merge pull request #521 from marcj/typo2
Fixed missing closing "database" tag.
9d344cb
Commits on Jan 14, 2014
@willdurand willdurand Merge pull request #522 from marcj/issue-520
Fixed #520, related to #452
920efd0
@fzerorubigd fzerorubigd add recursive option to command for search in sub-dir for schema.xml
fix #519
e3599b4
@willdurand willdurand Merge pull request #524 from fzerorubigd/master
add recursive option to command for search in sub-dir for schema.xml, fix #519
a828b44
Commits on Jan 28, 2014
@gossi gossi Fixes #502
Changed Column Constant getters

Changes:
1) getConstantName() -> getFQConstantName() and returns
[TableName]Map::COL_COLUMN_NAME
2) getConstantColumnName() -> getConstantName() and returns
COL_COLUMN_NAME
3) added getUppercasedName() and returns COLUMN_NAME
8060e19
@willdurand willdurand Merge pull request #516 from gossi/constants-patch
Fixes #502
528a4df
Commits on Jan 29, 2014
@marcj marcj Delete test.sq3 b704f5f
@gossi gossi Install Behaviors with Composer 8b5fe57
@willdurand willdurand Merge pull request #511 from gossi/composer-behavior
Install Behaviors with Composer
944fb87
Commits on Feb 12, 2014
@livioribeiro livioribeiro Fixed "Undefined variable" in migration:status
Fixed "Undefined variable: oldestMigrationTimestamp" when running "migration:status" without "-v"
6636c6c
@gharlan gharlan fixed enum param/return type cde157f
Commits on Feb 14, 2014
@willdurand willdurand Merge pull request #514 from gharlan/enum-docs
Wrong phpdoc for enum getters and setters
94ad953
@willdurand willdurand Merge pull request #540 from livioribeiro/patch-1
Fixes "Undefined variable" in migration:status
3c2133c
Commits on Feb 16, 2014
@gmsantos gmsantos php 5.6 support
Adding php 5.6 on travis ci testing
c55bac4
Commits on Feb 17, 2014
@willdurand willdurand Merge pull request #544 from gmsantosxl/master
php 5.6 support
86c753d
Commits on Feb 24, 2014
@mpscholten Fixed MigrationManager::getMigrationDir call which should be Migratio…
…nManager::getWorkingDir instead
5ce4e9c