Commit graph

13408 commits

Author SHA1 Message Date
Rachman Chavik
c4cbf1c635 Adding cross schema test 2011-11-25 22:29:23 +07:00
Rachman Chavik
813ecb6348 set schemaName for joinTable object in TranslateBehavior 2011-11-25 22:29:23 +07:00
Rachman Chavik
204851842b In a multidb habtm, we cannot rely on 'joinTable'
Instead, we should use value from 'with' when it's available.
2011-11-25 22:29:23 +07:00
Rachman Chavik
fd07b961d4 Use the correct datasource when saving multiple model 2011-11-25 22:29:23 +07:00
Rachman Chavik
144b556d1f Adding new property Model::schemaName
Just like physical table name, the schema name is an important information
that should be available in models.  The property will be populated accordingly
by the model's datasource.
2011-11-25 22:29:23 +07:00
mark_story
5180540d1f Fix protocol relative urls for CSS and JS files.
Protocol relative urls are generally not on the same host
don't try and run them through the asset filters.

Fixes #2285
2011-11-24 21:04:57 -05:00
Rachman Chavik
fa80be50eb Removing timestamp lines from generated files
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
2011-11-25 08:45:33 +07:00
Ceeram
179a5c8559 remove order, which was required with setting default order on CakeTestModel 2011-11-24 22:20:29 +01:00
Ceeram
c12c853f10 moving order for finds from constructor to beforeFind 2011-11-24 22:12:39 +01:00
José Lorenzo Rodríguez
7e790aa6cb Merge pull request #332 from rchavik/schema-shell
Enable short option for --plugin and --connection
2011-11-24 08:32:04 -08:00
Rachman Chavik
211146fb7a Enable short option for --plugin and --connection
This is done to make things more consistent with the bake shell
2011-11-24 19:29:27 +07:00
Christian Hieke
6757891a33 Ceeram suggested this change https://github.com/cakephp/cakephp/pull/322#issuecomment-2780158 2011-11-24 09:51:05 +01:00
Christian Hieke
61b9d77b75 Ceeram suggested this change https://github.com/cakephp/cakephp/pull/322#issuecomment-2780158 2011-11-24 09:41:58 +01:00
mark_story
2969a8f6ac Make a few more tests run in AllTests. 2011-11-23 21:30:28 -05:00
mark_story
4103fe14a2 Fix double / issue in ExtractTask
Also fix an issue where extracting pot files for plugins ended up creating
a Localedefault.pot file incorrectly.

Fixes #2284
2011-11-23 21:03:24 -05:00
mark_story
07462f0bef Fix nested name attributes for submit()
Nested name attributes and Security component did not co-operate.

Fixes #2271
2011-11-23 20:40:25 -05:00
Renan Gonçalves aka renan.saddam
0cd45d4711 Merge pull request #329 from shama/patch-doc
Add @link to CookieComponent docblocks
2011-11-23 00:58:21 -08:00
Kyle Robinson Young
bc0e0b5c05 Add @link to CookieComponent docblocks 2011-11-22 22:32:13 -08:00
Ceeram
07d1621bc5 fixing CakeTestModel constructor of previous commit, cleaning up after schema() call 2011-11-23 01:32:27 +01:00
Ceeram
05940ae1ec adding default order on id to CakeTestModel, to ensure correct order. Postgres can return results in any order it considers appropriate if none specified 2011-11-22 21:50:17 +01:00
Ceeram
f57c287c43 fixing test to ensure tests dont fail on 1 second timestamp diff 2011-11-22 17:21:00 +01:00
Ceeram
7d6637f55b ensure test doesnt fail by 1 second diff in timestamp 2011-11-22 10:57:36 +01:00
Ceeram
9b48c546b1 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-22 10:54:40 +01:00
Renan Gonçalves aka renan.saddam
f68d0f95e1 Merge pull request #328 from shama/patch-doc
Add @link to Shell docblocks
2011-11-22 01:37:23 -08:00
Kyle Robinson Young
bb51b0f497 Add @link to Shell docblocks 2011-11-21 21:33:07 -08:00
ADmad
0e6697dbc6 Skipping failing test when run through web browser. 2011-11-22 02:00:58 +05:30
Mark Story
340d112693 Merge pull request #327 from bigclick/patch-1
Fix for when trying to use "Console/cake schema generate snapshot"
2011-11-21 07:20:07 -08:00
mark_story
ceaf6871e0 Fix import. 2011-11-21 10:18:12 -05:00
mark_story
6d6ac10834 Fix failing tests caused by previous commit. 2011-11-20 23:00:58 -05:00
m
58a2ee064c CakeSchema updated for 2.0
Converting var to public.
Fixes #2276

Signed-off-by: mark_story <mark@mark-story.com>
2011-11-20 22:44:52 -05:00
bigclick
037f2c016e preg_quote'd $fileName to avoid issues when using a special character in their schema filename 2011-11-21 13:19:57 +11:00
bigclick
7a68f7fed1 Fix for when trying to use "Console/cake schema generate snapshot" command, line 67 was making the name param snapshot, also fixed auto numbering in the case where the filename wasn't "schema" 2011-11-21 11:43:51 +11:00
AD7six
adf73abb07 another bulletproofing for schemaless baking 2011-11-20 16:08:01 +01:00
AD7six
d2514f34c0 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-20 15:45:25 +01:00
AD7six
43ae7af17d prevent missing-index notices
when baking with a schemaless db
2011-11-20 15:44:44 +01:00
mark_story
21cd3f00ac Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
José Lorenzo Rodríguez
02efc24b12 Merge pull request #325 from ProLoser/patch-5
Unecessary if statement in basics.php config()
2011-11-19 17:39:15 -08:00
mark_story
3e2f8ddf98 CakeException subclasses render correctly now.
CakeException subclasses without their own view files, would trigger
a MissingViewException, which would result in no application helpers
being used.  This could cause issues when app helpers are used
in the layout.

Instead a error500 template is rendered using app helpers.

Fixes #2274, fixes #2004
2011-11-19 20:25:20 -05:00
Dean Sofer
e6c49766c7 Unnecessary if statement. The else clause covers all necessary scenarios 2011-11-19 17:08:46 -08:00
AD7six
f0fa6c7875 code standards 2011-11-20 01:17:07 +01:00
AD7six
8e38f666b7 allow baking models with missing tables - even for rdbms
test updated to reflect expected new expected behavior. If you bake a
model with the table missing, if forced to run skip any part of the
process that would result in an exception.
2011-11-20 01:11:33 +01:00
AD7six
ac8e1e8304 allow creating models without the table existing
particularly useful/appropriate for schemaless datasources
2011-11-19 23:51:39 +01:00
mark_story
95b85118c7 Fix issue with button() and nested name attributes.
Buttons with nested name attributes were not properly unlocked
and caused SecurityComponent to black hole the request.

Fixes #2271
2011-11-19 11:43:09 -05:00
mark_story
f36c43bfe4 Add protected to method picked from 1.3 2011-11-19 11:37:37 -05:00
mark_story
c8ab4ad05b Fix issue in TimeHelper with translated values.
LC_TIME files using unicode code points would incorrectly display.
Use either the Multibyte class or mbstring to correctly detect
and convert values.

Fixes #912

Conflicts:

	lib/Cake/View/Helper/TimeHelper.php
2011-11-19 10:12:05 -05:00
m
2957a33b23 assertEqual to assertEquals in core test files
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-19 09:25:03 -05:00
Ceeram
2da45df4c2 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-19 13:42:44 +01:00
ADmad
59e28fc94f Merge pull request #323 from shama/patch-doc
Updating docblocks with @link on File, Folder and Set utilities
2011-11-18 12:21:37 -08:00
Kyle Robinson Young
708ae873a5 Add @link to Set methods 2011-11-18 11:13:46 -08:00
Kyle Robinson Young
53f7a716ec Add @link to File/Folder properties 2011-11-18 11:05:30 -08:00