Commit Graph

180 Commits

Author SHA1 Message Date
Carsten Brandt
f6530314e2 Merge pull request #1765 from yiisoft/elasticsearch-pk-refactoring
[WIP] Changed elasticsearch AR primary key handling
2014-01-10 15:56:22 -08:00
Carsten Brandt
5dca1257b2 reverted primaryKey of elasticsearch to be array again
meet the AR interface requirements.
2014-01-09 13:44:12 +01:00
Qiang Xue
c4c328dc92 Fixes #1791: support ON condition for relational query. 2014-01-06 23:56:58 -05:00
Carsten Brandt
a7b852fcc3 Changed elasticsearch AR primary key handling
now supports mapped primary key when _id is part of source with an
alias.
2014-01-04 04:26:50 +01:00
Antonio Ramirez
53160797df added tests 2013-12-29 21:43:26 +01:00
Qiang Xue
4f44bb2416 Fixes #1581: Added ActiveQuery::joinWith() to support joining with relations 2013-12-24 00:08:49 -05:00
Carsten Brandt
4d1390ceb1 fixed travis mongodb 2013-12-18 04:33:41 +01:00
Paul Klimov
9b5f3fab99 Extension "mongo" renamed into "mongodb" 2013-12-06 17:35:32 +02:00
Klimov Paul
ca608a81a4 Mongo file Active Record updated. 2013-12-05 00:15:23 +02:00
Paul Klimov
96e794b4d3 Merge branch 'master' of github.com:yiisoft/yii2 into mongo 2013-12-03 11:20:02 +02:00
Paul Klimov
750c6275c0 Sphinx test AR classes moved to 'data/ar/sphinx'. 2013-12-03 10:46:02 +02:00
Klimov Paul
50a7bfea68 Merge branch 'master' of github.com:yiisoft/yii2 into mongo 2013-12-01 20:12:31 +02:00
Klimov Paul
0b8784860f Moved sphinx source database setup into ".sh" file allowing to use relative file path. 2013-12-01 18:00:08 +02:00
Klimov Paul
1129d820ed Mongo Active Relation unit test fixed. 2013-12-01 17:45:18 +02:00
Paul Klimov
3fd6d95aff Unit test for Mongo Active Relation added. 2013-11-29 17:25:17 +02:00
Paul Klimov
9c7d2b23c2 Mongo Active Record and Active Query fixed. 2013-11-29 16:40:57 +02:00
Paul Klimov
ee0c9ed61e Merge branch 'master' of github.com:yiisoft/yii2 into mongo 2013-11-28 10:56:49 +02:00
Carsten Brandt
83527e85ca made Model::attributes() non static again
- allows to have dynamic definition of attributes depended on the
  instance
- there was no real need for it to be static. Places that used it static
  have been refactored.

fixes #1318
2013-11-28 01:01:48 +01:00
Carsten Brandt
b4fb8abb87 reverted accidentally changed binary files
PR #1340 changed/broke them
2013-11-27 23:36:09 +01:00
Carsten Brandt
789f0285b8 adjusted sphinx tests to AR changes 2013-11-27 23:03:33 +01:00
Panagiotis Moustafellos
feef1256bd updated travis tests README 2013-11-27 22:54:58 +02:00
Panagiotis Moustafellos
0387666c8b added sphinx runtime pid dir 2013-11-27 22:30:31 +02:00
Panagiotis Moustafellos
75cc595630 proper db name (comply with yiitest) #2 2013-11-27 22:26:57 +02:00
Panagiotis Moustafellos
12fe9292fe proper db name (comply with yiitest) 2013-11-27 22:23:11 +02:00
Panagiotis Moustafellos
174574ebed created log and spl dir 2013-11-27 22:14:44 +02:00
Panagiotis Moustafellos
79771feab3 Revert "forcing travis build"
This reverts commit 0d8ae877d3.
2013-11-27 22:12:47 +02:00
Panagiotis Moustafellos
0d8ae877d3 forcing travis build 2013-11-27 22:10:41 +02:00
Panagiotis Moustafellos
5290fdfc81 adding sphinx log dirs etc 2013-11-27 22:06:28 +02:00
Panagiotis Moustafellos
5cb2283d89 Travis: Adding sphinx support 2013-11-27 21:52:10 +02:00
Panagiotis Moustafellos
f6a3496e8d Removed trailing whitespace.. (OCD really kicking in) 2013-11-27 19:53:11 +02:00
Paul Klimov
6eeeb6d169 Mongo test config fixed. 2013-11-27 11:54:09 +02:00
Klimov Paul
38df36840f Mongo test config updated. 2013-11-26 21:19:16 +02:00
Carsten Brandt
613758dda5 refactored elasticsearch COnnection and Command 2013-11-25 13:09:38 +01:00
Paul Klimov
ae0f04be99 Mongo extension created as blank. 2013-11-25 14:05:22 +02:00
Carsten Brandt
b081cf5e46 moved elasticsearch to extensions 2013-11-25 03:23:12 +01:00
Carsten Brandt
f6811002ca Merge branch 'master' into elasticsearch
* master: (59 commits)
  updated ext composer.json for issue labels
  moved redis to extensions
  fixed whitespaces
  update composer to include sphinx
  Added initial steps about configuring DB-based RBAC
  Fixes #1297: CSRF not generated on error pages
  fixes #1158 mentioned @web alias in docs
  Merged RBAC draft into authorization
  "yii\sphinx\ActiveQuery" updated to throw exception on conflict between "asArray" and "snippetByModel" options.
  Code style and docs at "yii\sphinx\*" fixed.
  Docs for Sphinx extension updated.
  Redundant typecast removed from yii\sphinx\ActiveRecord::create()
  yii\sphinx\Command reworked to extend yii\db\Command. yii\sphinx\DataReader removed.
  Sphinx Active Record updated to be compatible with ActiveDataProvider.
  Sphinx documentation updated.
  Sphinx documentation updated.
  Sphinx has many relation test prepared.
  Sphinx Query refactored.
  Create relation methods added to Sphinx Active Record.
  Sphinx Query Builder updated to respect column types for where statements
  ...
2013-11-25 03:21:08 +01:00
Carsten Brandt
8ac2b7364d moved redis to extensions 2013-11-25 02:27:04 +01:00
Qiang Xue
13f6a11277 Merge pull request #1259 from klimov-paul/sphinx
Sphinx fulltext search engine integration
2013-11-24 14:42:43 -08:00
Carsten Brandt
325fc28182 several fixes and cleanup 2013-11-24 22:46:13 +01:00
Carsten Brandt
af5d87ac4d renamed elasticsearch PK to id 2013-11-24 20:49:12 +01:00
Carsten Brandt
643593737d added test case for #1310 2013-11-24 20:45:50 +01:00
Carsten Brandt
f017ba357f refactored unit tests. put common AR tests in trait 2013-11-24 19:18:16 +01:00
Carsten Brandt
983b2286ba elasticsearch AR relations + null values 2013-11-24 04:07:25 +01:00
Carsten Brandt
779d6b6e96 fixed count and asArray() 2013-11-23 07:40:40 +01:00
Carsten Brandt
39ff11a374 first draft of elasticsearch AR 2013-11-23 06:30:36 +01:00
Carsten Brandt
bd589620d8 Merge branch 'master' into elasticsearch
* master: (59 commits)
  Refactored hasMany and hasOne so that they support cross-DBMS relationship.
  removed unused asset.php files
  fixed composer.json autoload pathes
  fixed c&p error
  allow installing yii2-dev and get the Yii.php file in the same place
  updated dev composer.json dependencies
  added composer.json for yii2-dev package
  fixed broken UniqueValidator
  removed call to nonexistsend property
  cleanup redis AR
  refactored Model and redis AR to allow drop of RecordSchema
  refactored redis AR to relect the latest changes
  "yii\swiftmailer\Mailer::createSwiftObject()" simplified.
  fixed empty result in findByPk list
  fixed problem with not closed transaction in deleteAll()
  fixed broken test
  apply changes to db\AR -> redis\AR
  added dependency in db\AR -> redis\AR needs to be refactored later
  redis AR cleanup
  ensure atomicity of operations
  ...

Conflicts:
	tests/unit/data/config.php
2013-11-23 03:02:35 +01:00
Carsten Brandt
8341a59717 Merge branch 'master' into elasticsearch
* master: (587 commits)
  fixed typo
  Fixes #1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Added example for dividers to bootstrap Nav
  Checkboxlist documentation fix
  Added "Using controller action to render errors"
  Fix doc
  Renamed DetailView attribute type to format
  encode email in Formatter
  Added default status code setting.
  "yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
  fix rbac select statement
  Comments cleanup.
  Reverted closeButton
  Nomenclature and code realignment.
  better nginx config
  guide about using bootstrap less files
  Include Schema in new migrations by default
  ...

Conflicts:
	framework/composer.json
	tests/unit/data/config.php
2013-11-22 20:19:49 +01:00
Carsten Brandt
cb4504a10f refactored Model and redis AR to allow drop of RecordSchema 2013-11-22 18:44:22 +01:00
Carsten Brandt
8542448f20 refactored redis AR to relect the latest changes
- make use of traits
- short array
- better implementation of query findByPk
2013-11-22 17:29:05 +01:00
Carsten Brandt
bc4324c041 Merge branch 'master' into redis
* master: (613 commits)
  fixed typo
  Fixes #1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Added example for dividers to bootstrap Nav
  Checkboxlist documentation fix
  Added "Using controller action to render errors"
  Fix doc
  Renamed DetailView attribute type to format
  encode email in Formatter
  Added default status code setting.
  "yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
  fix rbac select statement
  Comments cleanup.
  Reverted closeButton
  Nomenclature and code realignment.
  better nginx config
  guide about using bootstrap less files
  Include Schema in new migrations by default
  ...

Conflicts:
	framework/yii/db/ActiveRecord.php
	framework/yii/db/ActiveRelation.php
	tests/unit/data/config.php
2013-11-22 15:04:08 +01:00