Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pimped testsuite for PostgreSQL #428

Merged
merged 18 commits into from
Aug 14, 2013
Merged

Pimped testsuite for PostgreSQL #428

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
35e281b
Use symfony/validator 2.2.*@dev as long as the fix for issue #427 is …
Aug 14, 2013
a39a8e9
Added for `namespaced` schema a tablePrexis, otherwise it will overwr…
Aug 14, 2013
e825912
Fixed typo
Aug 14, 2013
c85d122
Print now the SQL in the exception in sql:insert command when it fail…
Aug 14, 2013
f89bf6e
Added some docBlocks. Added a check against `->getDatabase` before ac…
Aug 14, 2013
cbc571d
Added `hasColumn` and some docBlocks.
Aug 14, 2013
ee377e0
Added isUnique to Model\Table and some docBlocks.
Aug 14, 2013
6bd470a
PostgreSQL requires the keys of the foreignTable of a foreignKeys to …
Aug 14, 2013
e0a328c
Fixed missing `use`.
Aug 14, 2013
215034a
Only parse tables from the schema in $database or in the schema of `s…
Aug 14, 2013
2bbdd53
Added method `applyGroupBy` and `getPlainSelectedColumns` to PDoAdapt…
Aug 14, 2013
b6e3b19
Outsourced the commands for the setup of test environment in travis.y…
Aug 14, 2013
2f54b49
Typo
Aug 14, 2013
6d255b1
Fixed all tests to be multi-db/PostgreSQL compatible.
Aug 14, 2013
69b66c2
Improved the travis build script a bit.
Aug 14, 2013
e553c9e
Moved to the simple folder check as it seems travis doesnt have full …
Aug 14, 2013
ecd5340
Renamed function declaration to posix-syntax as it seems travis doesn…
Aug 14, 2013
9b1fc99
Added phpDoc to `isUnique`
Aug 14, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Only parse tables from the schema in $database or in the schema of `s… 
…earch_path`. Fixed `atthasdef` check - it should be boolean.
  • Loading branch information
marcj committed Aug 14, 2013
commit 215034ac611b7d70bfd95871c0487c63eea544f5
25 changes: 22 additions & 3 deletions src/Propel/Generator/Reverse/PgsqlSchemaParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,35 @@ public function parse(Database $database)
// Clean up
$stmt = null;

$stmt = $this->dbh->query("SELECT c.oid,
$searchPath = '?';
$params = [$database->getSchema()];
if (!$database->getSchema()) {
$stmt = $this->dbh->query('SHOW search_path');
$searchPathString = $stmt->fetchColumn();

$params = [];
$searchPath = explode(',', $searchPathString);

foreach ($searchPath as $n => &$path) {
$params[] = $path;
$path = '?';
}
$searchPath = implode(', ', $searchPath);
}

$stmt = $this->dbh->prepare("SELECT c.oid,
c.relname, n.nspname
FROM pg_class c join pg_namespace n on (c.relnamespace=n.oid)
WHERE c.relkind = 'r'
AND n.nspname NOT IN ('information_schema','pg_catalog')
AND n.nspname NOT LIKE 'pg_temp%'
AND n.nspname NOT LIKE 'pg_toast%'
AND n.nspname IN ($searchPath)
ORDER BY relname"
);

$stmt->execute($params);

$tableWraps = array();

// First load the tables (important that this happen before filling out details of tables)
Expand Down Expand Up @@ -223,7 +242,7 @@ protected function addColumns(Table $table, $oid, $version)
$autoincrement = null;

// if column has a default
if ('t' === $boolHasDefault && (strlen(trim($default)) > 0)) {
if (true === $boolHasDefault && (strlen(trim($default)) > 0)) {
if (!preg_match('/^nextval\(/', $default)) {
$strDefault= preg_replace('/::[\W\D]*/', '', $default);
$default = str_replace("'", '', $strDefault);
Expand Down Expand Up @@ -335,7 +354,7 @@ private function processDomain($strDomain)
$arrDomain['scale'] = $arrLengthPrecision['scale'];
$arrDomain['notnull'] = $row['typnotnull'];
$arrDomain['default'] = $row['typdefault'];
$arrDomain['hasdefault'] = (strlen(trim($row['typdefault'])) > 0) ? 't' : 'f';
$arrDomain['hasdefault'] = (strlen(trim($row['typdefault'])) > 0) ? true : false;

$stmt = null; // cleanup

Expand Down