Commit Graph

128 Commits

Author SHA1 Message Date
Sergey Makinen
c8856ccd4e Fix merging issues & CS 2017-06-17 01:02:01 +03:00
Sergey Makinen
f820d2ca36 Merge branch 'master' into db-constraints 2017-06-16 16:52:43 +03:00
Robert Korulczyk
ba0ab403b5 Added php-cs-fixer coding standards validation to Travis CI (#14100)
* php-cs-fixer: PSR2 rule.

* php-cs-fixer: PSR2 rule - fix views.

* Travis setup refactoring.

* Add php-cs-fixer to travis cs tests.

* Fix tests on hhvm-3.12

* improve travis config

* composer update

* revert composer update

* improve travis config

* Fix CS.

* Extract config to separate classes.

* Extract config to separate classes.

* Add file header.

* Force short array syntax.

* binary_operator_spaces fixer

* Fix broken tests

* cast_spaces fixer

* concat_space fixer

* dir_constant fixer

* ereg_to_preg fixer

* function_typehint_space fixer

* hash_to_slash_comment fixer

* is_null fixer

* linebreak_after_opening_tag fixer

* lowercase_cast fixer

* magic_constant_casing fixer

* modernize_types_casting fixer

* native_function_casing fixer

* new_with_braces fixer

* no_alias_functions fixer

* no_blank_lines_after_class_opening fixer

* no_blank_lines_after_phpdoc fixer

* no_empty_comment fixer

* no_empty_phpdoc fixer

* no_empty_statement fixer

* no_extra_consecutive_blank_lines fixer

* no_leading_import_slash fixer

* no_leading_namespace_whitespace fixer

* no_mixed_echo_print fixer

* no_multiline_whitespace_around_double_arrow fixer

* no_multiline_whitespace_before_semicolons fixer

* no_php4_constructor fixer

* no_short_bool_cast fixer

* no_singleline_whitespace_before_semicolons fixer

* no_spaces_around_offset fixer

* no_trailing_comma_in_list_call fixer

* no_trailing_comma_in_singleline_array fixer

* no_unneeded_control_parentheses fixer

* no_unused_imports fixer

* no_useless_return fixer

* no_whitespace_before_comma_in_array fixer

* no_whitespace_in_blank_line fixer

* not_operator_with_successor_space fixer

* object_operator_without_whitespace fixer

* ordered_imports fixer

* php_unit_construct fixer

* php_unit_dedicate_assert fixer

* php_unit_fqcn_annotation fixer

* phpdoc_indent fixer

* phpdoc_no_access fixer

* phpdoc_no_empty_return fixer

* phpdoc_no_package fixer

* phpdoc_no_useless_inheritdoc fixer

* Fix broken tests

* phpdoc_return_self_reference fixer

* phpdoc_single_line_var_spacing fixer

* phpdoc_single_line_var_spacing fixer

* phpdoc_to_comment fixer

* phpdoc_trim fixer

* phpdoc_var_without_name fixer

* psr4 fixer

* self_accessor fixer

* short_scalar_cast fixer

* single_blank_line_before_namespace fixer

* single_quote fixer

* standardize_not_equals fixer

* ternary_operator_spaces fixer

* trailing_comma_in_multiline_array fixer

* trim_array_spaces fixer

* protected_to_private fixer

* unary_operator_spaces fixer

* whitespace_after_comma_in_array fixer

* `parent::setRules()` -> `$this->setRules()`

* blank_line_after_opening_tag fixer

* Update finder config.

* Revert changes for YiiRequirementChecker.

* Fix array formatting.

* Add missing import.

* Fix CS for new code merged from master.

* Fix some indentation issues.
2017-06-12 12:25:45 +03:00
Carsten Brandt
be658f82bf release version 2.0.12 2017-06-05 16:33:41 +02:00
Sergey Makinen
73ac13e6d7 Implement retrieving dbms constraints 2017-05-15 20:55:25 +03:00
Sergey Makinen
454f0a9301 Fixes #13807: Fixed yii\db\QueryBuilder to inherit subquery params when building a INSERT INTO ... SELECT query 2017-04-17 03:31:43 +03:00
Sergey Makinen
9a915ba10c Fixes #8120: Fixes LIKE special characters escaping for Cubrid/MSSQL/Oracle/SQLite in yii\db\QueryBuilder 2017-02-24 01:24:06 +03:00
Dmitry Naumenko
407c38d13a Merge branch 'master' into 13221_limit_offset_expression 2017-02-23 23:36:49 +02:00
Alex
6db6a2ddbe Fixes #13418: Fixed QueryBuilder::batchInsert() if $rows is \Generator 2017-02-24 00:28:27 +03:00
Alexander Makarov
10b59ee6e4 Merge branch 'master' into 13221_limit_offset_expression 2017-02-22 17:02:04 +03:00
Sergey Makinen
209fb7d94b Fixes #13594: Fixes insufficient quoting in yii\db\QueryBuilder::prepareInsertSelectSubQuery() 2017-02-18 23:58:04 +03:00
PowerGamer1
37b8cbb2d0 Fixes #12758: Added the ability to use instances of \yii\db\Query class as values in the \yii\db\QueryBuilder::insert() method 2017-01-29 00:54:46 +03:00
voroks
25f08afc96 Fixes #8293: yii\db\Query can be passed to insert method in yii\db\QueryBuilder 2017-01-28 23:47:26 +03:00
p.chapl
5488fc6e28 fixes #13221
Make \yii\db\QueryTrait::limit and \yii\db\QueryTrait::offset methods works with \yii\db\Expression
2016-12-20 14:08:03 +07:00
Robert Korulczyk
4aa935e69e Fixes #12055: Changed boolean to bool and integer to int in phpdoc 2016-11-07 02:51:39 +03:00
Boudewijn Vahrmeijer
32f4dc8997 Fixes #5385: links created from classes to corresponding guide articles (#12920) 2016-11-04 18:55:14 +03:00
Alexander Makarov
ef4885f478 Removed unnecessary semicolon 2016-07-29 22:57:47 +03:00
Robert Korulczyk
104712103b Fixes #11693: Handle QueryBuilder::batchInsert() calls with no data to insert. (#11812) 2016-06-25 15:51:09 +03:00
Carsten Brandt
4e3c9e4a98 fixed scalar value for IN condition
fixes regression from 2.0.8 #10961

fixes #11536
2016-06-20 15:20:21 +02:00
Carsten Brandt
4411a74ebd proper fix for #9425, adjust changes from #11363
includes tests and fix that works in all cases.
2016-04-28 01:29:07 +02:00
SilverFire - Dmitry Naumenko
e2e4f76229 Updated SqliteQueryBuilderTest to work with Composite in conditions
Updated code style, CHANGELOG
2016-04-25 23:36:41 +03:00
Sam Mousa
baab8d6a68 QueryBuilder now supports Traversable objects for IN clauses. 2016-04-25 23:36:32 +03:00
SilverFire - Dmitry Naumenko
0fe27b9d3b Refactored code in PR #9441 2016-04-19 17:48:25 +03:00
SilverFire - Dmitry Naumenko
c9dfc90be0 Merge branch 'methods_for_schema_builder' of https://github.com/vaseninm/yii2 into vaseninm-methods_for_schema_builder 2016-04-19 12:21:33 +03:00
Alexander Makarov
2c325fbd48 Added @since, adjusted changelog #9425 2016-04-18 12:49:22 +03:00
PowerGamer1
73eb62a3cd DBMS specific workarounds for unsupported SQL92 form of SELECT EXISTS() (#11369) 2016-04-17 17:44:52 +03:00
Chris Harris
b8e44b2f47 Merge branch 'master' of git://github.com/yiisoft/yii2 into 9562-add-char-datatype 2016-03-14 05:33:41 -07:00
SilverFire - Dmitry Naumenko
7229b3aa7d QueryBuilder::buildAndCondition() - added Expression value extraction
Updated CHANGELOG
Added test case for param binding in `or` condition

Closes #11093
2016-03-13 19:22:32 +02:00
CedricYii
2bd14098f9 Fix Expression parameter binding in 'And' clause 2016-03-13 19:19:48 +02:00
Chris Harris
51b99320bd Sqlite specific schema builder class actually gets loaded now 2016-02-20 06:53:31 -08:00
Chris Harris
eaeb926768 Adds char datatype to framework 2016-02-20 01:52:23 -08:00
Carsten Brandt
e43c41c9ea db layer phpdoc fixes 2016-02-07 16:33:26 +01:00
Carsten Brandt
8680f0f1d8 BC way of merging expression params of orderBy and groupBy
this logic should be moved to the sub methods in 2.1
2016-01-28 17:01:16 +01:00
Carsten Brandt
f0a62cdbd3 allow expressions in GROUP BY 2016-01-27 16:53:20 +01:00
Carsten Brandt
468886a77b small refactoring for #9452 2015-12-06 06:04:46 +01:00
Klimov Paul
bea90e1228 Fixed yii\db\Query::where() does not add params from directly passed yii\db\Expression 2015-12-05 12:28:43 +02:00
SilverFire - Dmitry Naumenko
cd87d67f34 Global DOCS update: ~~~ replaced with ``` 2015-12-02 23:15:28 +02:00
Alexander Makarov
1b3770fd21 Use === instead of == where possible 2015-10-10 01:04:35 +03:00
Alexander Makarov
5ab4f0f090 Better quotes usage in strings
- Use single quote where interpolation isn't necessary
- Use interpolation when it's better than concatenation
2015-10-10 00:23:52 +03:00
Matvey Vasenin
ce6e92b736 add comment control methods 2015-08-14 12:27:21 +03:00
Carsten Brandt
681db52ba6 refactored SchemaBuilder
- rename class to ColumnSchemaBuilder as this is more appropriate
- changed internal organisation to match how the rest of schema related classes work
  - the ColumnSchemaBuilder is now created the same way as QueryBuilder is
- removed static call magic and method annotations, now real methods are called as they are
- the whole code works on objects in a db context now instead of setting database connection in global state
- trait is now used by Migration by default but can be used in other contexts as well

Migration usage is now as follows:

```php
$this->createTable('example_table', [
  'id' => $this->primaryKey(),
  'name' => $this->string(64)->notNull(),
  'type' => $this->integer()->notNull()->defaultValue(10),
  'description' => $this->text(),
  'rule_name' => $this->string(64),
  'data' => $this->text(),
  'created_at' => $this->datetime()->notNull(),
  'updated_at' => $this->datetime(),
]);
```
2015-08-03 23:25:50 +02:00
Matvey Vasenin
b456f699cc Implemented SchemaBuilder 2015-07-08 15:38:21 +03:00
Alexander Mohorev
ae42a054bb PSR-2 spaces, commas, etc 2015-06-09 00:05:06 +03:00
John Was
57db031d1c Merge branch 'master' into 7374-inserting-ar-without-values 2015-05-24 23:29:40 +02:00
Qiang Xue
5d4780da21 Fixes #8268: Allow QueryBuilder to recognize more variations of limit and offset values 2015-05-05 22:28:50 -04:00
Carsten Brandt
21f51400ef added information about quoting to batch insert 2015-04-27 10:22:56 +02:00
Jan Was
5f099b3f8d Merge branch 'master' into 7374-inserting-ar-without-values 2015-04-21 09:49:46 +02:00
Carsten Brandt
1cfc40d6e5 link to the guide on quoting from query phpdoc
fixes #8141
2015-04-20 23:24:01 +02:00
Carsten Brandt
5306cac4b9 added support for subqueries to simple conditions
fixes #8027
2015-04-12 01:45:21 +02:00
Jan Waś
edf400df96 add missing space 2015-04-11 02:25:26 +02:00