Permalink
Browse files

Fixing merge conflicts on data branch.

  • Loading branch information...
2 parents 974469c + f2b556e commit f46b51a30e8deabf89a494bd34042cea5d381c9a @nateabele nateabele committed Oct 18, 2012
Showing with 7,153 additions and 3,100 deletions.
  1. +7 −10 core/Adaptable.php
  2. +1 −1 core/Libraries.php
  3. +274 −59 data/Collection.php
  4. +3 −4 data/Connections.php
  5. +105 −0 data/DocumentSchema.php
  6. +61 −11 data/Entity.php
  7. +310 −167 data/Model.php
  8. +177 −0 data/Schema.php
  9. +6 −7 data/Source.php
  10. +0 −204 data/collection/DocumentArray.php
  11. +70 −166 data/collection/DocumentSet.php
  12. +351 −0 data/collection/MultiKeyRecordSet.php
  13. +28 −291 data/collection/RecordSet.php
  14. +41 −23 data/entity/Document.php
  15. +15 −1 data/entity/Record.php
  16. +59 −27 data/model/Query.php
  17. +17 −4 data/model/Relationship.php
  18. +293 −80 data/source/Database.php
  19. +5 −3 data/source/Http.php
  20. +9 −2 data/source/Mock.php
  21. +137 −158 data/source/MongoDb.php
  22. +196 −0 data/source/Result.php
  23. +0 −65 data/source/database/Result.php
  24. +20 −70 data/source/database/adapter/MySql.php
  25. +445 −0 data/source/database/adapter/PostgreSql.php
  26. +61 −57 data/source/database/adapter/Sqlite3.php
  27. +0 −161 data/source/database/adapter/my_sql/Result.php
  28. +57 −0 data/source/database/adapter/pdo/Result.php
  29. +0 −48 data/source/database/adapter/sqlite3/Result.php
  30. +19 −9 data/source/http/adapter/CouchDb.php
  31. +36 −92 data/source/mongo_db/Exporter.php
  32. +14 −59 data/source/mongo_db/Result.php
  33. +58 −0 data/source/mongo_db/Schema.php
  34. +55 −58 tests/cases/data/CollectionTest.php
  35. +21 −14 tests/cases/data/ConnectionsTest.php
  36. +43 −6 tests/cases/data/EntityTest.php
  37. +282 −108 tests/cases/data/ModelTest.php
  38. +37 −0 tests/cases/data/SchemaTest.php
  39. +0 −67 tests/cases/data/collection/DocumentArrayTest.php
  40. +202 −24 tests/cases/data/collection/DocumentSetTest.php
  41. +816 −0 tests/cases/data/collection/MultiKeyRecordSetTest.php
  42. +304 −68 tests/cases/data/collection/RecordSetTest.php
  43. +171 −94 tests/cases/data/entity/DocumentTest.php
  44. +19 −29 tests/cases/data/entity/RecordTest.php
  45. +24 −23 tests/cases/data/model/QueryTest.php
  46. +403 −109 tests/cases/data/source/DatabaseTest.php
  47. +11 −15 tests/cases/data/source/HttpTest.php
  48. +288 −175 tests/cases/data/source/MongoDbTest.php
  49. +2 −2 tests/cases/data/source/database/adapter/MySqlTest.php
  50. +265 −0 tests/cases/data/source/database/adapter/PostgreSqlTest.php
  51. +80 −12 tests/cases/data/source/database/adapter/Sqlite3Test.php
  52. +34 −15 tests/cases/data/source/database/adapter/{my_sql → pdo}/ResultTest.php
  53. +9 −18 tests/cases/data/source/http/adapter/CouchDbTest.php
  54. +279 −62 tests/cases/data/source/mongo_db/ExporterTest.php
  55. +51 −0 tests/cases/data/source/mongo_db/SchemaTest.php
  56. +10 −5 tests/cases/template/helper/FormTest.php
  57. +133 −15 tests/cases/util/CollectionTest.php
  58. +0 −1 tests/integration/data/CrudTest.php
  59. +114 −43 tests/integration/data/DatabaseTest.php
  60. +0 −1 tests/integration/data/DocumentTest.php
  61. +1 −1 tests/integration/data/FieldsTest.php
  62. +0 −39 tests/integration/data/SourceTest.php
  63. +18 −0 tests/mocks/data/MockBadConnection.php
  64. +12 −4 tests/mocks/data/MockBase.php
  65. +6 −2 tests/mocks/data/MockComment.php
  66. +4 −2 tests/mocks/data/MockCreator.php
  67. +4 −16 tests/mocks/data/MockModel.php
  68. +34 −0 tests/mocks/data/MockModelCompositePk.php
  69. +3 −14 tests/mocks/data/MockPost.php
  70. +19 −13 tests/mocks/data/MockPostForValidates.php
  71. +31 −7 tests/mocks/data/MockSource.php
  72. +4 −2 tests/mocks/data/MockTag.php
  73. +4 −2 tests/mocks/data/MockTagging.php
  74. +41 −0 tests/mocks/data/collection/MockMultiKeyRecordSet.php
  75. +23 −4 tests/mocks/data/collection/MockRecordSet.php
  76. +42 −1 tests/mocks/data/model/MockDatabase.php
  77. +4 −4 tests/mocks/data/model/MockDatabaseComment.php
  78. +9 −4 tests/mocks/data/model/MockDatabasePost.php
  79. +29 −0 tests/mocks/data/model/MockDatabasePostRevision.php
  80. +4 −4 tests/mocks/data/model/MockDatabaseTag.php
  81. +4 −4 tests/mocks/data/model/MockDatabaseTagging.php
  82. +14 −26 tests/mocks/data/model/MockDocumentMultipleKey.php
  83. +11 −15 tests/mocks/data/model/MockDocumentPost.php
  84. +5 −90 tests/mocks/data/model/MockDocumentSource.php
  85. +4 −5 tests/mocks/data/model/MockQueryComment.php
  86. +5 −6 tests/mocks/data/model/MockQueryPost.php
  87. +20 −15 tests/mocks/data/model/mock_database/MockResult.php
  88. +13 −1 tests/mocks/data/source/MockHttpModel.php
  89. +45 −1 tests/mocks/data/source/MockMongoConnection.php
  90. +8 −29 tests/mocks/data/source/MockMongoPost.php
  91. +2 −2 tests/mocks/data/source/database/adapter/MockAdapter.php
  92. +108 −0 tests/mocks/data/source/database/adapter/MockPostgreSQL.php
  93. +7 −0 tests/mocks/data/source/database/adapter/postgresql_companies.sql
  94. +14 −6 tests/mocks/data/source/http/adapter/MockCouchPost.php
  95. +55 −18 tests/mocks/data/source/mongo_db/MockResult.php
  96. +18 −20 util/Collection.php
View
@@ -141,18 +141,15 @@ public static function strategies($name) {
$stack = new SplDoublyLinkedList();
foreach ($config['strategies'] as $key => $strategy) {
- $arguments = array();
-
- if (is_array($strategy)) {
- $name = $key;
- $class = static::_strategy($name, static::$_strategies);
- $index = (isset($config['strategies'][$name])) ? $name : $class;
- $arguments = $config['strategies'][$index];
- } else {
+ if (!is_array($strategy)) {
$name = $strategy;
$class = static::_strategy($name, static::$_strategies);
+ $stack->push(new $class());
+ continue;
}
- $stack->push(new $class($arguments));
+ $class = static::_strategy($key, static::$_strategies);
+ $index = (isset($config['strategies'][$key])) ? $key : $class;
+ $stack->push(new $class($config['strategies'][$index]));
}
return $stack;
}
@@ -168,7 +165,7 @@ public static function strategies($name) {
* @return mixed Result of application of strategies to data. If no strategies
* have been configured, this method will simply return the original data.
*/
- public static function applyStrategies($method, $name, $data, array $options = array()){
+ public static function applyStrategies($method, $name, $data, array $options = array()) {
$options += array('mode' => null);
if (!$strategies = static::strategies($name)) {
View
@@ -1076,4 +1076,4 @@ protected static function _params($type, $name = "*") {
}
}
-?>
+?>
Oops, something went wrong.

0 comments on commit f46b51a

Please sign in to comment.