RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Sqlite datadict: composite primary key support

Browse source
This commit is contained in:
doctrine 2006-07-05 18:59:46 +00:00
parent ff50405000
commit 703ba51fab
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Doctrine/DataDict.php
View file

@ -40,7 +40,8 @@ class Doctrine_DataDict {
try { try {
$this->dbh->query($sql); $this->dbh->query($sql);
} catch(PDOException $e) { } catch(PDOException $e) {
$return = false;
$return = $e;
} }
} }

2
Doctrine/Locking/Manager/Pessimistic.php
View file

@ -237,4 +237,4 @@ class Doctrine_Locking_Manager_Pessimistic
} }
?> ?>

7
Doctrine/adodb-hack/drivers/datadict-sqlite.inc.php
View file

@ -56,6 +56,7 @@ class ADODB2_sqlite extends ADODB_DataDict {
if ($funsigned) $suffix .= ' UNSIGNED'; if ($funsigned) $suffix .= ' UNSIGNED';
if ($fnotnull) $suffix .= ' NOT NULL'; if ($fnotnull) $suffix .= ' NOT NULL';
if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault"; if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
if ($fautoinc) $suffix .= ' PRIMARY KEY AUTOINCREMENT'; if ($fautoinc) $suffix .= ' PRIMARY KEY AUTOINCREMENT';
if ($fconstraint) $suffix .= ' '.$fconstraint; if ($fconstraint) $suffix .= ' '.$fconstraint;
return $suffix; return $suffix;
@ -77,12 +78,12 @@ class ADODB2_sqlite extends ADODB_DataDict {
} }
$s = "CREATE TABLE $tabname (\n"; $s = "CREATE TABLE $tabname (\n";
$s .= implode(",\n", $lines); $s .= implode(",\n", $lines);
/**
if (sizeof($pkey)>0) { if (sizeof($pkey)>0 && ! $this->autoIncrement) {
$s .= ",\n PRIMARY KEY ("; $s .= ",\n PRIMARY KEY (";
$s .= implode(", ",$pkey).")"; $s .= implode(", ",$pkey).")";
} }
*/
if (isset($tableoptions['CONSTRAINTS'])) if (isset($tableoptions['CONSTRAINTS']))
$s .= "\n".$tableoptions['CONSTRAINTS']; $s .= "\n".$tableoptions['CONSTRAINTS'];