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
eb0eb44d
Commit
eb0eb44d
authored
Aug 07, 2006
by
doctrine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compiler issues fixed
parent
e3df7b6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
Doctrine.php
Doctrine.php
+2
-0
DataDict.php
Doctrine/DataDict.php
+7
-3
No files found.
Doctrine.php
View file @
eb0eb44d
...
@@ -395,6 +395,8 @@ final class Doctrine {
...
@@ -395,6 +395,8 @@ final class Doctrine {
if
(
!
self
::
$path
)
if
(
!
self
::
$path
)
self
::
$path
=
dirname
(
__FILE__
);
self
::
$path
=
dirname
(
__FILE__
);
if
(
class_exists
(
$classname
))
return
false
;
$class
=
self
::
$path
.
DIRECTORY_SEPARATOR
.
str_replace
(
"_"
,
DIRECTORY_SEPARATOR
,
$classname
)
.
".php"
;
$class
=
self
::
$path
.
DIRECTORY_SEPARATOR
.
str_replace
(
"_"
,
DIRECTORY_SEPARATOR
,
$classname
)
.
".php"
;
...
...
Doctrine/DataDict.php
View file @
eb0eb44d
...
@@ -4,8 +4,12 @@ class Doctrine_DataDict {
...
@@ -4,8 +4,12 @@ class Doctrine_DataDict {
private
$dbh
;
private
$dbh
;
public
function
__construct
(
PDO
$dbh
)
{
public
function
__construct
(
PDO
$dbh
)
{
$manager
=
Doctrine_Manager
::
getInstance
();
$file
=
Doctrine
::
getPath
()
.
DIRECTORY_SEPARATOR
.
"Doctrine"
.
DIRECTORY_SEPARATOR
.
"adodb-hack"
.
DIRECTORY_SEPARATOR
.
"adodb.inc.php"
;
require_once
(
$manager
->
getRoot
()
.
"/adodb-hack/adodb.inc.php"
);
if
(
!
file_exists
(
$file
))
throw
new
Doctrine_Exception
(
"Couldn't include datadict. File
$file
does not exist"
);
require_once
(
$file
);
$this
->
dbh
=
$dbh
;
$this
->
dbh
=
$dbh
;
$this
->
dict
=
NewDataDictionary
(
$dbh
);
$this
->
dict
=
NewDataDictionary
(
$dbh
);
...
@@ -37,7 +41,7 @@ class Doctrine_DataDict {
...
@@ -37,7 +41,7 @@ class Doctrine_DataDict {
$return
=
true
;
$return
=
true
;
foreach
(
$a
as
$sql
)
{
foreach
(
$a
as
$sql
)
{
try
{
try
{
$this
->
dbh
->
query
(
$sql
);
$this
->
dbh
->
query
(
$sql
);
}
catch
(
Exception
$e
)
{
}
catch
(
Exception
$e
)
{
$return
=
$e
;
$return
=
$e
;
...
...
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