Zend\Db\Sql\Ddl Improvements #6257

kabel · 2014-05-13T03:04:02Z

Reduces code duplication in column classes using the inheritance chain and abstract classes
Adds API to allow Zend\Db\Sql\Ddl\Constraint classes to be added to columns
Adds some missing standard SQL data types
Refactor the MySQL CreateTableDecorator class to allow for inserting data type options and adding other column options in the correct position/order
Clean up some tests

DDL expressions should not result in trailing whitespace.

AbstractPrecisionColumn

Fixes missing DEFAULT value in expression data

Purposely ignore $isNullable from parent by resetting it in getExpressionData()

* NOT NULL should be in the spec like DEFAULT * Type is never in the spec (always second param) * Float column should have FLOAT type

Should follow the same SQL92 named constrained syntax pattern

* Constraint doesn't need to use position placeholders * Reference column should support an array of column identifiers

Reduced duplicated code

Provides an API for adding single column constraints to avoid adding a separate, named constaint to the table

Splits the specification into two parts; the named part (for table constraints), and the rest (the table/column constraints)

kabel · 2014-05-18T17:40:39Z

@jimmysole, if this is accepted, yes, it will allow you to create unsigned columns among other things:

$pkCol = new Zend\Db\Sql\Ddl\Column\Integer('foo', false, null, array('auto_increment' => true, 'unsigned' => true));
$pkCol->addConstraint(new Zend\Db\Sql\Ddl\Constraint\PrimaryKey());

jimmysole · 2014-05-18T18:44:31Z

@kabel That would be awesome! I hope it is accepted.

weierophinney · 2014-08-06T16:01:49Z

Scheduling for 2.4.0, as it adds significant functionality and changes internals.

Ocramius · 2014-11-17T17:55:27Z

Adding the BC Break flag as there are internal breakages.

…simplifications

…explicit casts

Close #6257

Ocramius · 2014-11-17T17:56:33Z

Merged into develop in 4b34fba, thanks @kabel :-)

mfairchild365 · 2014-11-17T19:09:22Z

+1

adamlundrigan · 2014-11-18T05:07:15Z

@Ocramius php-cs-fixer is now complaining about CS failures in:

library/Zend/Db/Sql/Ddl/Column/Integer.php (braces)
tests/Zend/Db/Sql/Ddl/Column/BinaryTest.php (braces)

I've PR'd what php-cs-fixer spit out over here: #6889

Ocramius · 2014-11-18T22:43:07Z

@adamlundrigan already merged #6885 by @samsonasik about that :-) Thanks anyway!

Maks3w and others added 30 commits May 7, 2014 20:48

Merge pull request #6237 in master

369afb5

Change AlterTable column add/change expection to not have trailing w/s

ee48f8a

DDL expressions should not result in trailing whitespace.

Add abstract Ddl Column classes to handle variable length data types

60cf35c

Change floating point Ddl columns to inherhit from

b5c3f1e

AbstractPrecisionColumn

Change character Ddl column classes to inherhit AbstractLengthColumn

1c983ab

Removed unused $length property from Integer Ddl column class

cdfc0f2

Reduce code duplication in temporal ddl column classes

674397d

Fixes missing DEFAULT value in expression data

Fix BLOB Ddl column erroniously allows length, adds Binary with length

ca27525

Reduce code duplication in Booloan Ddl column class

a4d2e2e

Purposely ignore $isNullable from parent by resetting it in getExpressionData()

Reduce code duplication in the Text Ddl Column class

edef2c6

Add Ddl column classes to support DATETIME, TIMESTAMP, and VARBINARY

ca82ee4

Adjust Dbl Column class test expectations

cc39a56

* NOT NULL should be in the spec like DEFAULT * Type is never in the spec (always second param) * Float column should have FLOAT type

Move NOT NULL into the spec for Ddl Columns

c6730da

Allow length based column types to be constructed without length

73b744d

Move the Integer column construction signature to the parent Column

24d043f

Use the parent Column constructor for the length/precision abstracts

dbc85ff

Change the getLengthExpression method visibility to protected

b490f92

Add tests for the abstract length classes.

d65341e

Remove length tests from Binary column, tested in abstraction

37c3811

Correct copy/paste error in class name of Timestamp Ddl Column

ce6ab13

Add test for the Datetime, Timestamp, Varbinary Ddl Column classes

ec128c1

Remove extension requirement on SqlSrv test that doesn't need it

7016855

Remove todo from implemented SqlSrv Statement test

e76aec6

Move extension requirement logic into PHPUnit phpDoc annotation

34fbb96

Correct the UniqueKeyTest expection for expression data

dffd093

Should follow the same SQL92 named constrained syntax pattern

Update ForeignKeyTest expectation for expression data.

dab9719

* Constraint doesn't need to use position placeholders * Reference column should support an array of column identifiers

Extend parent logic for getting expression data in AbstractLengthColumn

7f34891

Reduced duplicated code

Adds support for Ddl Columns to have Ddl Constraints added to them

e4d54fd

Provides an API for adding single column constraints to avoid adding a separate, named constaint to the table

Move duplicated Constraint generation code to the abstract parent

6514a4e

Splits the specification into two parts; the named part (for table constraints), and the rest (the table/column constraints)

Use the parent logic exclusively for expression data on Primary/Unique

f06e2e7

weierophinney added this to the 2.4.0 milestone Aug 6, 2014

EvanDotPro force-pushed the develop branch from 8f4d208 to a2c77c3 Compare September 28, 2014 00:34

Ocramius added the BC Break label Nov 17, 2014

Ocramius self-assigned this Nov 17, 2014

Ocramius mentioned this pull request Nov 17, 2014

Document new Zend\Db\Sql\Ddl types introduced in zendframework/zf2#6257 zendframework/zf2-documentation#1397

Open

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - fixing sorting of DDL statements in test (fragile test)

6ed03b6

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - explicit casts, inheriting docs where it makes sense

c8cb18c

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - making nullable values explicit (and documented), minor code …

3adfeb9

…simplifications

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - Boolean fields should not be nullable

ac0c7f7

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - making Boolean always not-nullable

38de28f

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - adding missing docblocks, ensuring default values types

6226c08

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - adding explicit casts, removing confusing ternaries

755ecc9

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - removing duplicate docblocks, minor CS fixes

434bf1d

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - removing useless type check, as an (array) cast suffices

93bf110

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - removing duplicate docblocks, ensuring default types, adding …

df1d6b8

…explicit casts

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - reverting 6ed03b6 as the sorting was expected to be weighed

d89f208

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - correcting Zend\Db\Sql\CreateTable#$columns type-hint

bc2b81c

Ocramius added a commit that referenced this pull request Nov 17, 2014

#6257 - minor CS fixes, cleaning up code duplication

0aaddfd

Ocramius added a commit that referenced this pull request Nov 17, 2014

Merge branch 'feature/#6257-zend-db-sql-ddl-improvements' into develop

4b34fba

Close #6257

Ocramius closed this Nov 17, 2014

adamlundrigan added a commit to adamlundrigan/zf2 that referenced this pull request Nov 18, 2014

Clean up two small CS issues introduced in zendframework#6257

734d0cf

kabel deleted the ddl-columns branch August 2, 2015 01:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Zend\Db\Sql\Ddl Improvements #6257

Zend\Db\Sql\Ddl Improvements #6257

kabel commented May 13, 2014

kabel commented May 18, 2014

jimmysole commented May 18, 2014

weierophinney commented Aug 6, 2014

Ocramius commented Nov 17, 2014

Ocramius commented Nov 17, 2014

mfairchild365 commented Nov 17, 2014

adamlundrigan commented Nov 18, 2014

Ocramius commented Nov 18, 2014

Zend\Db\Sql\Ddl Improvements #6257

Zend\Db\Sql\Ddl Improvements #6257

Conversation

kabel commented May 13, 2014

kabel commented May 18, 2014

jimmysole commented May 18, 2014

weierophinney commented Aug 6, 2014

Ocramius commented Nov 17, 2014

Ocramius commented Nov 17, 2014

mfairchild365 commented Nov 17, 2014

adamlundrigan commented Nov 18, 2014

Ocramius commented Nov 18, 2014