Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Y
yii2bootstrap
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
夏彬
yii2bootstrap
Commits
51972f25
Commit
51972f25
authored
Jun 07, 2013
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #505 from gevik/pgsql-driver
Pgsql driver implementation (update 4)
parents
7a7d2a9c
b6d5a900
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
471 additions
and
149 deletions
+471
-149
.travis.yml
.travis.yml
+2
-1
QueryBuilder.php
framework/yii/db/pgsql/QueryBuilder.php
+41
-0
Schema.php
framework/yii/db/pgsql/Schema.php
+284
-0
config.php
tests/unit/data/config.php
+6
-0
postgres.sql
tests/unit/data/postgres.sql
+70
-148
DatabaseTestCase.php
tests/unit/framework/db/DatabaseTestCase.php
+3
-0
PostgreSQLActiveRecordTest.php
tests/unit/framework/db/pgsql/PostgreSQLActiveRecordTest.php
+14
-0
PostgreSQLConnectionTest.php
tests/unit/framework/db/pgsql/PostgreSQLConnectionTest.php
+51
-0
No files found.
.travis.yml
View file @
51972f25
...
@@ -10,5 +10,6 @@ env:
...
@@ -10,5 +10,6 @@ env:
before_script
:
before_script
:
-
sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS yiitest;'; fi"
-
sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS yiitest;'; fi"
-
psql -U postgres -c 'drop database if exists yiitest;';
-
psql -U postgres -c 'create database yiitest;';
script
:
phpunit
script
:
phpunit
\ No newline at end of file
framework/yii/db/pgsql/QueryBuilder.php
0 → 100644
View file @
51972f25
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace
yii\db\pgsql
;
/**
* QueryBuilder is the query builder for PostgreSQL databases.
*
* @author Gevik Babakhani <gevikb@gmail.com>
* @since 2.0
*/
class
QueryBuilder
extends
\yii\db\QueryBuilder
{
/**
* @var array mapping from abstract column types (keys) to physical column types (values).
*/
public
$typeMap
=
array
(
Schema
::
TYPE_PK
=>
'serial not null primary key'
,
Schema
::
TYPE_STRING
=>
'varchar'
,
Schema
::
TYPE_TEXT
=>
'text'
,
Schema
::
TYPE_SMALLINT
=>
'smallint'
,
Schema
::
TYPE_INTEGER
=>
'integer'
,
Schema
::
TYPE_BIGINT
=>
'bigint'
,
Schema
::
TYPE_FLOAT
=>
'double precision'
,
Schema
::
TYPE_DECIMAL
=>
'numeric'
,
Schema
::
TYPE_DATETIME
=>
'timestamp'
,
Schema
::
TYPE_TIMESTAMP
=>
'timestamp'
,
Schema
::
TYPE_TIME
=>
'time'
,
Schema
::
TYPE_DATE
=>
'date'
,
Schema
::
TYPE_BINARY
=>
'bytea'
,
Schema
::
TYPE_BOOLEAN
=>
'boolean'
,
Schema
::
TYPE_MONEY
=>
'numeric(19,4)'
,
);
}
framework/yii/db/pgsql/Schema.php
0 → 100644
View file @
51972f25
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace
yii\db\pgsql
;
use
yii\db\TableSchema
;
use
yii\db\ColumnSchema
;
/**
* Schema is the class for retrieving metadata from a PostgreSQL database
* (version 9.x and above).
*
* @author Gevik Babakhani <gevikb@gmail.com>
* @since 2.0
*/
class
Schema
extends
\yii\db\Schema
{
/**
* The default schema used for the current session.
* @var string
*/
public
$defaultSchema
=
'public'
;
/**
* @var array mapping from physical column types (keys) to abstract
* column types (values)
*/
public
$typeMap
=
array
(
'abstime'
=>
self
::
TYPE_TIMESTAMP
,
'bit'
=>
self
::
TYPE_STRING
,
'boolean'
=>
self
::
TYPE_BOOLEAN
,
'box'
=>
self
::
TYPE_STRING
,
'character'
=>
self
::
TYPE_STRING
,
'bytea'
=>
self
::
TYPE_BINARY
,
'char'
=>
self
::
TYPE_STRING
,
'cidr'
=>
self
::
TYPE_STRING
,
'circle'
=>
self
::
TYPE_STRING
,
'date'
=>
self
::
TYPE_DATE
,
'real'
=>
self
::
TYPE_FLOAT
,
'double precision'
=>
self
::
TYPE_DECIMAL
,
'inet'
=>
self
::
TYPE_STRING
,
'smallint'
=>
self
::
TYPE_SMALLINT
,
'integer'
=>
self
::
TYPE_INTEGER
,
'bigint'
=>
self
::
TYPE_BIGINT
,
'interval'
=>
self
::
TYPE_STRING
,
'json'
=>
self
::
TYPE_STRING
,
'line'
=>
self
::
TYPE_STRING
,
'macaddr'
=>
self
::
TYPE_STRING
,
'money'
=>
self
::
TYPE_MONEY
,
'name'
=>
self
::
TYPE_STRING
,
'numeric'
=>
self
::
TYPE_STRING
,
'numrange'
=>
self
::
TYPE_DECIMAL
,
'oid'
=>
self
::
TYPE_BIGINT
,
// should not be used. it's pg internal!
'path'
=>
self
::
TYPE_STRING
,
'point'
=>
self
::
TYPE_STRING
,
'polygon'
=>
self
::
TYPE_STRING
,
'text'
=>
self
::
TYPE_TEXT
,
'time without time zone'
=>
self
::
TYPE_TIME
,
'timestamp without time zone'
=>
self
::
TYPE_TIMESTAMP
,
'timestamp with time zone'
=>
self
::
TYPE_TIMESTAMP
,
'time with time zone'
=>
self
::
TYPE_TIMESTAMP
,
'unknown'
=>
self
::
TYPE_STRING
,
'uuid'
=>
self
::
TYPE_STRING
,
'bit varying'
=>
self
::
TYPE_STRING
,
'character varying'
=>
self
::
TYPE_STRING
,
'xml'
=>
self
::
TYPE_STRING
);
/**
* Creates a query builder for the MySQL database.
* @return QueryBuilder query builder instance
*/
public
function
createQueryBuilder
()
{
return
new
QueryBuilder
(
$this
->
db
);
}
/**
* Resolves the table name and schema name (if any).
* @param TableSchema $table the table metadata object
* @param string $name the table name
*/
protected
function
resolveTableNames
(
$table
,
$name
)
{
$parts
=
explode
(
'.'
,
str_replace
(
'"'
,
''
,
$name
));
if
(
isset
(
$parts
[
1
]))
{
$table
->
schemaName
=
$parts
[
0
];
$table
->
name
=
$parts
[
1
];
}
else
{
$table
->
name
=
$parts
[
0
];
}
if
(
$table
->
schemaName
===
null
)
{
$table
->
schemaName
=
$this
->
defaultSchema
;
}
}
/**
* Quotes a table name for use in a query.
* A simple table name has no schema prefix.
* @param string $name table name
* @return string the properly quoted table name
*/
public
function
quoteSimpleTableName
(
$name
)
{
return
strpos
(
$name
,
'"'
)
!==
false
?
$name
:
'"'
.
$name
.
'"'
;
}
/**
* Loads the metadata for the specified table.
* @param string $name table name
* @return TableSchema|null driver dependent table metadata. Null if the table does not exist.
*/
public
function
loadTableSchema
(
$name
)
{
$table
=
new
TableSchema
();
$this
->
resolveTableNames
(
$table
,
$name
);
if
(
$this
->
findColumns
(
$table
))
{
$this
->
findConstraints
(
$table
);
return
$table
;
}
}
/**
* Collects the foreign key column details for the given table.
* @param TableSchema $table the table metadata
*/
protected
function
findConstraints
(
$table
)
{
$tableName
=
$this
->
quoteValue
(
$table
->
name
);
$tableSchema
=
$this
->
quoteValue
(
$table
->
schemaName
);
//We need to extract the constraints de hard way since:
//http://www.postgresql.org/message-id/26677.1086673982@sss.pgh.pa.us
$sql
=
<<<SQL
select
ct.conname as containst,
c.relname as table_name,
ns.nspname as table_schema,
current_database() as table_catalog,
(select string_agg(attname,',') attname from pg_attribute where attrelid=ct.conrelid and attnum = any(ct.conkey)) as columns,
fc.relname as foreign_table_name,
fns.nspname as foreign_table_schema,
current_database() as foreign_table_catalog,
(select string_agg(attname,',') attname from pg_attribute where attrelid=ct.confrelid and attnum = any(ct.confkey)) as foreign_columns
from
pg_constraint ct
inner join pg_class c on c.oid=ct.conrelid
inner join pg_namespace ns on c.relnamespace=ns.oid
left join pg_class fc on fc.oid=ct.confrelid
left join pg_namespace fns on fc.relnamespace=fns.oid
where
ct.contype='f'
and c.relname={$tableName}
and ns.nspname={$tableSchema}
SQL;
$constraints
=
$this
->
db
->
createCommand
(
$sql
)
->
queryAll
();
foreach
(
$constraints
as
$constraint
)
{
$columns
=
explode
(
','
,
$constraint
[
'columns'
]);
$fcolumns
=
explode
(
','
,
$constraint
[
'foreign_columns'
]);
$citem
=
array
(
$constraint
[
'foreign_table_name'
]);
foreach
(
$columns
as
$idx
=>
$column
)
{
$citem
[]
=
array
(
$fcolumns
[
$idx
]
=>
$column
);
}
$table
->
foreignKeys
[]
=
$citem
;
}
}
/**
* Collects the metadata of table columns.
* @param TableSchema $table the table metadata
* @return boolean whether the table exists in the database
*/
protected
function
findColumns
(
$table
)
{
$tableName
=
$this
->
db
->
quoteValue
(
$table
->
name
);
$schemaName
=
$this
->
db
->
quoteValue
(
$table
->
schemaName
);
$sql
=
<<<SQL
SELECT
current_database() as table_catalog,
d.nspname AS table_schema,
c.relname AS table_name,
a.attname AS column_name,
t.typname AS data_type,
a.attlen AS character_maximum_length,
pg_catalog.col_description(c.oid, a.attnum) AS column_comment,
a.atttypmod AS modifier,
a.attnotnull = false AS is_nullable,
CAST(pg_get_expr(ad.adbin, ad.adrelid) AS varchar) AS column_default,
coalesce(pg_get_expr(ad.adbin, ad.adrelid) ~ 'nextval',false) AS is_autoinc,
array_to_string((select array_agg(enumlabel) from pg_enum where enumtypid=a.atttypid)::varchar[],',') as enum_values,
CASE atttypid
WHEN 21 /*int2*/ THEN 16
WHEN 23 /*int4*/ THEN 32
WHEN 20 /*int8*/ THEN 64
WHEN 1700 /*numeric*/ THEN
CASE WHEN atttypmod = -1
THEN null
ELSE ((atttypmod - 4) >> 16) & 65535
END
WHEN 700 /*float4*/ THEN 24 /*FLT_MANT_DIG*/
WHEN 701 /*float8*/ THEN 53 /*DBL_MANT_DIG*/
ELSE null
END AS numeric_precision,
CASE
WHEN atttypid IN (21, 23, 20) THEN 0
WHEN atttypid IN (1700) THEN
CASE
WHEN atttypmod = -1 THEN null
ELSE (atttypmod - 4) & 65535
END
ELSE null
END AS numeric_scale,
CAST(
information_schema._pg_char_max_length(information_schema._pg_truetypid(a, t), information_schema._pg_truetypmod(a, t))
AS numeric
) AS size,
a.attnum = any (ct.conkey) as is_pkey
FROM
pg_class c
LEFT JOIN pg_attribute a ON a.attrelid = c.oid
LEFT JOIN pg_attrdef ad ON a.attrelid = ad.adrelid AND a.attnum = ad.adnum
LEFT JOIN pg_type t ON a.atttypid = t.oid
LEFT JOIN pg_namespace d ON d.oid = c.relnamespace
LEFT join pg_constraint ct on ct.conrelid=c.oid and ct.contype='p'
WHERE
a.attnum > 0
and c.relname = {$tableName}
and d.nspname = {$schemaName}
ORDER BY
a.attnum;
SQL;
try
{
$columns
=
$this
->
db
->
createCommand
(
$sql
)
->
queryAll
();
}
catch
(
\Exception
$e
)
{
return
false
;
}
foreach
(
$columns
as
$column
)
{
$column
=
$this
->
loadColumnSchema
(
$column
);
$table
->
columns
[
$column
->
name
]
=
$column
;
if
(
$column
->
isPrimaryKey
===
true
)
{
$table
->
primaryKey
[]
=
$column
->
name
;
if
(
$table
->
sequenceName
===
null
&&
preg_match
(
"/nextval\('\w+'(::regclass)?\)/"
,
$column
->
defaultValue
)
===
1
)
{
$table
->
sequenceName
=
preg_replace
(
array
(
'/nextval/'
,
'/::/'
,
'/regclass/'
,
'/\'\)/'
,
'/\(\'/'
),
''
,
$column
->
defaultValue
);
}
}
}
return
true
;
}
/**
* Loads the column information into a [[ColumnSchema]] object.
* @param array $info column information
* @return ColumnSchema the column schema object
*/
protected
function
loadColumnSchema
(
$info
)
{
$column
=
new
ColumnSchema
();
$column
->
allowNull
=
$info
[
'is_nullable'
];
$column
->
autoIncrement
=
$info
[
'is_autoinc'
];
$column
->
comment
=
$info
[
'column_comment'
];
$column
->
dbType
=
$info
[
'data_type'
];
$column
->
defaultValue
=
$info
[
'column_default'
];
$column
->
enumValues
=
explode
(
','
,
str_replace
(
array
(
"''"
),
array
(
"'"
),
$info
[
'enum_values'
]));
$column
->
unsigned
=
false
;
// has no meanining in PG
$column
->
isPrimaryKey
=
$info
[
'is_pkey'
];
$column
->
name
=
$info
[
'column_name'
];
$column
->
precision
=
$info
[
'numeric_precision'
];
$column
->
scale
=
$info
[
'numeric_scale'
];
$column
->
size
=
$info
[
'size'
];
if
(
isset
(
$this
->
typeMap
[
$column
->
dbType
]))
{
$column
->
type
=
$this
->
typeMap
[
$column
->
dbType
];
}
else
{
$column
->
type
=
self
::
TYPE_STRING
;
}
$column
->
phpType
=
$this
->
getColumnPhpType
(
$column
);
return
$column
;
}
}
\ No newline at end of file
tests/unit/data/config.php
View file @
51972f25
...
@@ -18,5 +18,11 @@ return array(
...
@@ -18,5 +18,11 @@ return array(
'password'
=>
''
,
'password'
=>
''
,
'fixture'
=>
__DIR__
.
'/mssql.sql'
,
'fixture'
=>
__DIR__
.
'/mssql.sql'
,
),
),
'pgsql'
=>
array
(
'dsn'
=>
'pgsql:host=localhost;dbname=yiitest;port=5432;'
,
'username'
=>
'postgres'
,
'password'
=>
'postgres'
,
'fixture'
=>
__DIR__
.
'/postgres.sql'
,
)
)
)
);
);
tests/unit/data/postgres.sql
View file @
51972f25
This diff is collapsed.
Click to expand it.
tests/unit/framework/db/DatabaseTestCase.php
View file @
51972f25
...
@@ -37,6 +37,9 @@ abstract class DatabaseTestCase extends TestCase
...
@@ -37,6 +37,9 @@ abstract class DatabaseTestCase extends TestCase
$db
->
username
=
$this
->
database
[
'username'
];
$db
->
username
=
$this
->
database
[
'username'
];
$db
->
password
=
$this
->
database
[
'password'
];
$db
->
password
=
$this
->
database
[
'password'
];
}
}
if
(
isset
(
$this
->
database
[
'attributes'
]))
{
$db
->
attributes
=
$this
->
database
[
'attributes'
];
}
if
(
$open
)
{
if
(
$open
)
{
$db
->
open
();
$db
->
open
();
$lines
=
explode
(
';'
,
file_get_contents
(
$this
->
database
[
'fixture'
]));
$lines
=
explode
(
';'
,
file_get_contents
(
$this
->
database
[
'fixture'
]));
...
...
tests/unit/framework/db/pgsql/PostgreSQLActiveRecordTest.php
0 → 100644
View file @
51972f25
<?php
namespace
yiiunit\framework\db\pgsql
;
use
yiiunit\framework\db\ActiveRecordTest
;
class
PostgreSQLActiveRecordTest
extends
ActiveRecordTest
{
protected
function
setUp
()
{
$this
->
driverName
=
'pgsql'
;
parent
::
setUp
();
}
}
tests/unit/framework/db/pgsql/PostgreSQLConnectionTest.php
0 → 100644
View file @
51972f25
<?php
namespace
yiiunit\framework\db\pgsql
;
use
yiiunit\framework\db\ConnectionTest
;
class
PostgreSQLConnectionTest
extends
ConnectionTest
{
public
function
setUp
()
{
$this
->
driverName
=
'pgsql'
;
parent
::
setUp
();
}
public
function
testConnection
()
{
$connection
=
$this
->
getConnection
(
true
);
}
function
testQuoteValue
()
{
$connection
=
$this
->
getConnection
(
false
);
$this
->
assertEquals
(
123
,
$connection
->
quoteValue
(
123
));
$this
->
assertEquals
(
"'string'"
,
$connection
->
quoteValue
(
'string'
));
$this
->
assertEquals
(
"'It''s interesting'"
,
$connection
->
quoteValue
(
"It's interesting"
));
}
function
testQuoteTableName
()
{
$connection
=
$this
->
getConnection
(
false
);
$this
->
assertEquals
(
'"table"'
,
$connection
->
quoteTableName
(
'table'
));
$this
->
assertEquals
(
'"table"'
,
$connection
->
quoteTableName
(
'"table"'
));
$this
->
assertEquals
(
'"schema"."table"'
,
$connection
->
quoteTableName
(
'schema.table'
));
$this
->
assertEquals
(
'"schema"."table"'
,
$connection
->
quoteTableName
(
'schema."table"'
));
$this
->
assertEquals
(
'"schema"."table"'
,
$connection
->
quoteTableName
(
'"schema"."table"'
));
$this
->
assertEquals
(
'{{table}}'
,
$connection
->
quoteTableName
(
'{{table}}'
));
$this
->
assertEquals
(
'(table)'
,
$connection
->
quoteTableName
(
'(table)'
));
}
function
testQuoteColumnName
()
{
$connection
=
$this
->
getConnection
(
false
);
$this
->
assertEquals
(
'"column"'
,
$connection
->
quoteColumnName
(
'column'
));
$this
->
assertEquals
(
'"column"'
,
$connection
->
quoteColumnName
(
'"column"'
));
$this
->
assertEquals
(
'"table"."column"'
,
$connection
->
quoteColumnName
(
'table.column'
));
$this
->
assertEquals
(
'"table"."column"'
,
$connection
->
quoteColumnName
(
'table."column"'
));
$this
->
assertEquals
(
'"table"."column"'
,
$connection
->
quoteColumnName
(
'"table"."column"'
));
$this
->
assertEquals
(
'[[column]]'
,
$connection
->
quoteColumnName
(
'[[column]]'
));
$this
->
assertEquals
(
'{{column}}'
,
$connection
->
quoteColumnName
(
'{{column}}'
));
$this
->
assertEquals
(
'(column)'
,
$connection
->
quoteColumnName
(
'(column)'
));
}
}
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