Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
Tomáš Trávníček
doctrine-dbal
Commits
8c5887d0
Commit
8c5887d0
authored
Sep 19, 2009
by
romanb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[2.0][DDC-5] Fixed.
parent
92801ba8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
33 deletions
+1
-33
AnnotationDriver.php
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+0
-2
DoctrineAnnotations.php
lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
+1
-3
XmlDriver.php
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
+0
-8
YamlDriver.php
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
+0
-8
SchemaTool.php
lib/Doctrine/ORM/Tools/SchemaTool.php
+0
-12
No files found.
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View file @
8c5887d0
...
...
@@ -169,10 +169,8 @@ class AnnotationDriver implements Driver
$mapping
[
'type'
]
=
$columnAnnot
->
type
;
$mapping
[
'length'
]
=
$columnAnnot
->
length
;
$mapping
[
'fixed'
]
=
$columnAnnot
->
fixed
;
$mapping
[
'precision'
]
=
$columnAnnot
->
precision
;
$mapping
[
'scale'
]
=
$columnAnnot
->
scale
;
$mapping
[
'unsigned'
]
=
$columnAnnot
->
unsigned
;
$mapping
[
'nullable'
]
=
$columnAnnot
->
nullable
;
$mapping
[
'options'
]
=
$columnAnnot
->
options
;
$mapping
[
'unique'
]
=
$columnAnnot
->
unique
;
...
...
lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
View file @
8c5887d0
...
...
@@ -56,13 +56,11 @@ final class JoinColumns extends Annotation {}
final
class
Column
extends
Annotation
{
public
$type
;
public
$length
;
public
$fixed
=
false
;
public
$precision
=
0
;
// The precision for a decimal (exact numeric) column (Applies only for decimal column)
public
$scale
=
0
;
// The scale for a decimal (exact numeric) column (Applies only for decimal column)
public
$unsigned
=
false
;
public
$unique
=
false
;
public
$nullable
=
false
;
public
$default
;
public
$default
;
//TODO: remove?
public
$name
;
public
$options
=
array
();
}
...
...
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View file @
8c5887d0
...
...
@@ -125,10 +125,6 @@ class XmlDriver extends AbstractFileDriver
$mapping
[
'length'
]
=
(
int
)
$fieldMapping
[
'length'
];
}
if
(
isset
(
$fieldMapping
[
'fixed'
]))
{
$mapping
[
'fixed'
]
=
(
bool
)
$fieldMapping
[
'fixed'
];
}
if
(
isset
(
$fieldMapping
[
'precision'
]))
{
$mapping
[
'precision'
]
=
(
int
)
$fieldMapping
[
'precision'
];
}
...
...
@@ -137,10 +133,6 @@ class XmlDriver extends AbstractFileDriver
$mapping
[
'scale'
]
=
(
int
)
$fieldMapping
[
'scale'
];
}
if
(
isset
(
$fieldMapping
[
'unsigned'
]))
{
$mapping
[
'unsigned'
]
=
(
bool
)
$fieldMapping
[
'unsigned'
];
}
if
(
isset
(
$fieldMapping
[
'unique'
]))
{
$mapping
[
'unique'
]
=
(
bool
)
$fieldMapping
[
'unique'
];
}
...
...
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View file @
8c5887d0
...
...
@@ -128,10 +128,6 @@ class YamlDriver extends AbstractFileDriver
$mapping
[
'length'
]
=
$fieldMapping
[
'length'
];
}
if
(
isset
(
$fieldMapping
[
'fixed'
]))
{
$mapping
[
'fixed'
]
=
(
bool
)
$fieldMapping
[
'fixed'
];
}
if
(
isset
(
$fieldMapping
[
'precision'
]))
{
$mapping
[
'precision'
]
=
$fieldMapping
[
'precision'
];
}
...
...
@@ -140,10 +136,6 @@ class YamlDriver extends AbstractFileDriver
$mapping
[
'scale'
]
=
$fieldMapping
[
'scale'
];
}
if
(
isset
(
$fieldMapping
[
'unsigned'
]))
{
$mapping
[
'unsigned'
]
=
(
bool
)
$fieldMapping
[
'unsigned'
];
}
if
(
isset
(
$fieldMapping
[
'unique'
]))
{
$mapping
[
'unique'
]
=
(
bool
)
$fieldMapping
[
'unique'
];
}
...
...
lib/Doctrine/ORM/Tools/SchemaTool.php
View file @
8c5887d0
...
...
@@ -569,24 +569,12 @@ class SchemaTool
$columnInfo
[
'fixed'
]
=
$fieldMapping
[
'fixed'
];
$columnChanged
=
true
;
}
// 7. check for unsigned change
$fieldMapping
[
'unsigned'
]
=
(
!
isset
(
$fieldMapping
[
'unsigned'
]))
?
false
:
$fieldMapping
[
'unsigned'
];
if
(
$columnInfo
[
'unsigned'
]
!=
$fieldMapping
[
'unsigned'
])
{
$columnInfo
[
'unsigned'
]
=
$fieldMapping
[
'unsigned'
];
$columnChanged
=
true
;
}
// Only add to column changed list if it was actually changed
if
(
$columnChanged
)
{
$updateFields
[]
=
$columnInfo
;
}
//var_dump($columnInfo);
echo
PHP_EOL
.
PHP_EOL
;
unset
(
$currentColumns
[
$index
]);
$exists
=
true
;
break
;
...
...
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