Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
324e1069
Commit
324e1069
authored
Nov 26, 2013
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated sphinx active record with changes from DB AR
parent
25fb11e9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
51 deletions
+41
-51
ActiveRecord.php
extensions/sphinx/ActiveRecord.php
+33
-43
ActiveRecord.php
framework/yii/db/ActiveRecord.php
+8
-8
No files found.
extensions/sphinx/ActiveRecord.php
View file @
324e1069
This diff is collapsed.
Click to expand it.
framework/yii/db/ActiveRecord.php
View file @
324e1069
...
...
@@ -316,9 +316,9 @@ class ActiveRecord extends Model
* (because another user has modified the data), a [[StaleObjectException]] exception will be thrown,
* and the update or deletion is skipped.
*
* Optimi
zed
locking is only supported by [[update()]] and [[delete()]].
* Optimi
stic
locking is only supported by [[update()]] and [[delete()]].
*
* To use
optimized
locking:
* To use
Optimistic
locking:
*
* 1. Create a column to store the version number of each row. The column type should be `BIGINT DEFAULT 0`.
* Override this method to return the name of this column.
...
...
@@ -469,9 +469,9 @@ class ActiveRecord extends Model
*
* @param string $class the class name of the related record
* @param array $link the primary-foreign key constraint. The keys of the array refer to
* the
columns in the table
associated with the `$class` model, while the values of the
* array refer to the corresponding
columns in the table associated with this
AR class.
* @return ActiveRelation the relation object.
* the
attributes of the record
associated with the `$class` model, while the values of the
* array refer to the corresponding
attributes in **this**
AR class.
* @return ActiveRelation
Interface
the relation object.
*/
public
function
hasOne
(
$class
,
$link
)
{
...
...
@@ -508,9 +508,9 @@ class ActiveRecord extends Model
*
* @param string $class the class name of the related record
* @param array $link the primary-foreign key constraint. The keys of the array refer to
* the
columns in the table
associated with the `$class` model, while the values of the
* array refer to the corresponding
columns in the table associated with this
AR class.
* @return ActiveRelation the relation object.
* the
attributes of the record
associated with the `$class` model, while the values of the
* array refer to the corresponding
attributes in **this**
AR class.
* @return ActiveRelation
Interface
the relation object.
*/
public
function
hasMany
(
$class
,
$link
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment