Initial support for Propel2 #45
Conversation
| public function flush() | ||
| { | ||
| $models = $this->persistedModels; | ||
| Propel::getConnection()->transaction( |
There was a problem hiding this comment.
Inject connection
| */ | ||
| private $generatedSqlPath; | ||
|
|
||
| public function __construct(string $generatedSqlPath) |
There was a problem hiding this comment.
Unfortunately Propel doesn't allow runtime access to its configuration
| )); | ||
| } | ||
|
|
||
| $connection->exec(file_get_contents($sqlPath)); |
There was a problem hiding this comment.
Not sure how well this will work regarding FK conflicts - the generated SQL is basically a dump with "DROP TABLE IF EXISTS ..." "CREATE TABLE ...".
It might otherwise be possible to build up a dependency graph for the models and purge them in order, but Propel doesn't make it easy.
There was a problem hiding this comment.
Also the tests are using Sqlite, which I don't think supports FKs - should probably make it use MySQL like the others.
|
Failing test is: Not sure if that's a side effect of this PR. |
tests/Bridge/Propel2/propel.yml
Outdated
| sqlDir: tests/Bridge/Propel2/generated/sql | ||
| generator: | ||
| schema: | ||
| autoPackage: true |
There was a problem hiding this comment.
This config is probably not required.
vendor-bin/propel2/composer.json
Outdated
| { | ||
| "autoload-dev": { | ||
| "classmap": [ | ||
| "../../tests/Bridge/Propel2/Model" |
There was a problem hiding this comment.
you shouldn't need that as this should be inherited thanks to theofidry/composer-inheritance-plugin
There was a problem hiding this comment.
But inherited from what? This namespace is manually mapped here because Propel doesn't allow PSR-4 IIRC.
vendor-bin/propel2/composer.json
Outdated
| ] | ||
| }, | ||
| "require-dev": { | ||
| "propel/propel": "@alpha", |
No! I missed those, will add. |
|
|
||
| $this->assertCount(5, AuthorQuery::create()->find()); | ||
| } | ||
| } |
There was a problem hiding this comment.
@theofidry this is the integration test as it stands - not sure if there is a better way to build the dependency tree above.
|
@dantleech what's the status of this one? Is there still bits missing or is it just waiting for my review? |
| public function persist($object) | ||
| { | ||
| if (false === $object instanceof ActiveRecordInterface) { | ||
| throw new \InvalidArgumentException( |
There was a problem hiding this comment.
import this class with a use statement
| public function create(PurgeMode $mode, PurgerInterface $purger = null): PurgerInterface | ||
| { | ||
| if ($mode == PurgeMode::createDeleteMode()) { | ||
| throw new \InvalidArgumentException( |
There was a problem hiding this comment.
this class should be imported with a use statement as well
| $sqlPath = sprintf('%s/%s.sql', $this->generatedSqlPath, $this->connection->getName()); | ||
|
|
||
| if (false === file_exists($sqlPath)) { | ||
| throw new \RuntimeException( |
| */ | ||
| public function testCannotPersistANonModelObject() | ||
| { | ||
| $object = new \stdClass(); |
There was a problem hiding this comment.
this class should be imported with a use statement
vendor-bin/propel2/composer.json
Outdated
| { | ||
| "autoload-dev": { | ||
| "classmap": [ | ||
| "../../tests/Bridge/Propel2/Model" |
.gitignore
Outdated
| !/bin/test.sh | ||
| !/bin/cs.sh | ||
| /tests/Bridge/Propel2/generated |
There was a problem hiding this comment.
can those two be moved in fixtures?
theofidry
changed the title
|
Tests are failing at the moment, so will need to find out why... |
|
Updated, let's see what happens with the tests ... |
dantleech
force-pushed
the
propel2
branch
2 times, most recently
from
7236fce to
9007774
Compare
|
@dantleech I rebased your work and tweaks a few things, could you double check if everything is good for you? |
|
Merging as I really want to include this in the new release. Feel free to point out any error which can then be fixed for the next release. Thanks again for that big contribution :) |
|
Thanks @theofidry, sorry for not giving it more attention - hope it's a good foundation for Propel 2 support :) |
Work-in-progress: Adds support for Propel2