Author: Jonathan.Wage
Date: 2010-02-11 01:13:16 +0100 (Thu, 11 Feb 2010)
New Revision: 27873
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
plugins/sfSympalPlugin/trunk/test/fixtures/project/config/databases.yml
Log:
[1.4][sfSympalPlugin][1.0] Fixes for pgsql
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
2010-02-10 23:57:17 UTC (rev 27872)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
2010-02-11 00:13:16 UTC (rev 27873)
@@ -161,7 +161,9 @@
->leftJoin($alias.'.CreatedBy u')
->innerJoin($alias.'.Type t')
->innerJoin($alias.'.Site si')
- ->andWhere('si.slug = ?', $sympalContext->getSiteSlug())
+ // Don't use param to work around Doctrine pgsql bug
+ // with limit subquery and number of params
+ ->andWhere(sprintf("si.slug = '%s'", $sympalContext->getSiteSlug()))
->orderBy('l.slug ASC, a.slug ASC');
$user = sfContext::getInstance()->getUser();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
2010-02-10 23:57:17 UTC (rev 27872)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
2010-02-11 00:13:16 UTC (rev 27873)
@@ -56,7 +56,7 @@
table_method: getAdminGenQuery
title: Manage Content
display: [_title, _is_published]
- sort: ['m.root_id, m.lft', 'asc']
+ sort: ['m.root_id asc, m.lft']
batch_actions:
_delete:
publish:
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/config/databases.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/test/fixtures/project/config/databases.yml
2010-02-10 23:57:17 UTC (rev 27872)
+++ plugins/sfSympalPlugin/trunk/test/fixtures/project/config/databases.yml
2010-02-11 00:13:16 UTC (rev 27873)
@@ -4,6 +4,7 @@
param:
#dsn: 'sqlite:///%SF_DATA_DIR%/test.sqlite'
dsn: 'mysql://root:@localhost/sympal'
+ #dsn: 'pgsql://postgres:postg...@localhost/sympal'
#username: root
test:
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
