Skip to content

support 1 dialect #4761

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

Closed
wants to merge 6 commits into from
Closed

support 1 dialect #4761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15b3297
support 1 dialect
sim1984 Sep 30, 2019
c81f038
pad space
sim1984 Oct 4, 2019
febbbe4
store dialect as bitfield
sim1984 Oct 8, 2019
e5a211c
Create dialect_1.phpt
sim1984 Oct 18, 2019
e7fe5a1
Update dialect_1.phpt
sim1984 Oct 18, 2019
bc79657
Update dialect_1.phpt
sim1984 Oct 25, 2019
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
18 changes: 12 additions & 6 deletions ext/pdo_firebird/firebird_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t *dbh, const char *sql, size_t s
}

/* prepare the statement */
if (isc_dsql_prepare(H->isc_status, &H->tr, s, 0, new_sql, PDO_FB_DIALECT, out_sqlda)) {
if (isc_dsql_prepare(H->isc_status, &H->tr, s, 0, new_sql, H->sql_dialect, out_sqlda)) {
RECORD_ERROR(dbh);
efree(new_sql);
return 0;
Expand Down Expand Up @@ -622,6 +622,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /*
{ "dbname", NULL, 0 },
{ "charset", NULL, 0 },
{ "role", NULL, 0 },
{ "dialect", "3", 0 },
{ "user", NULL, 0 },
{ "password", NULL, 0 }
};
Expand All @@ -630,14 +631,14 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /*

pdo_firebird_db_handle *H = dbh->driver_data = pecalloc(1,sizeof(*H),dbh->is_persistent);

php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 5);
php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 6);

if (!dbh->username && vars[3].optval) {
dbh->username = pestrdup(vars[3].optval, dbh->is_persistent);
if (!dbh->username && vars[4].optval) {
dbh->username = pestrdup(vars[4].optval, dbh->is_persistent);
}

if (!dbh->password && vars[4].optval) {
dbh->password = pestrdup(vars[4].optval, dbh->is_persistent);
if (!dbh->password && vars[5].optval) {
dbh->password = pestrdup(vars[5].optval, dbh->is_persistent);
}

do {
Expand All @@ -657,6 +658,11 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /*
buf_len -= dpb_len;
}
}

H->sql_dialect = PDO_FB_DIALECT;
if (vars[3].optval) {
H->sql_dialect = atoi(vars[3].optval);
}

/* fire it up baby! */
if (isc_attach_database(H->isc_status, 0, vars[0].optval, &H->db,(short)(dpb-dpb_buffer), dpb_buffer)) {
Expand Down
4 changes: 3 additions & 1 deletion ext/pdo_firebird/firebird_statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,9 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{

*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);

if (n >= 0) {
if ((var->sqltype & ~1) == SQL_DOUBLE) {
*len = slprintf(*ptr, CHAR_BUF_LEN, "%.*F", -var->sqlscale, *(double*)var->sqldata);
} else if (n >= 0) {
*len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d",
n / f, -var->sqlscale, n % f);
} else if (n <= -f) {
Expand Down
4 changes: 3 additions & 1 deletion ext/pdo_firebird/php_pdo_firebird_int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,13 @@ typedef struct {
char *date_format;
char *time_format;
char *timestamp_format;

unsigned sql_dialect:2;

/* prepend table names on column names in fetch */
unsigned fetch_table_names:1;

unsigned _reserved:31;
unsigned _reserved:29;

} pdo_firebird_db_handle;

Expand Down
58 changes: 58 additions & 0 deletions ext/pdo_firebird/tests/dialect_1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
--TEST--
PDO_Firebird: support 1 sql dialect
--SKIPIF--
<?php require('skipif.inc');
if (strpos(getenv('PDO_FIREBIRD_TEST_DSN'), 'dialect=1')===false) {
die('skip: PDO_FIREBIRD_TEST_DSN must contain a string "dialect=1"');
}
?>
--FILE--
<?php
require("testdb.inc");

$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
$dbh->setAttribute(PDO::FB_ATTR_TIMESTAMP_FORMAT, '%Y-%m-%d %H:%M:%S');

$sql =
'SELECT
1 as N,
2.0 as F,
cast(0.76 as numeric(15, 2)) as K,
cast(\'2019-06-12\' as date) as DT
FROM RDB$DATABASE';
$query = $dbh->prepare($sql);
$query->execute();
$row = $query->fetch(\PDO::FETCH_OBJ);
var_dump($row->N);
var_dump($row->F);
var_dump($row->K);
var_dump($row->DT);

unset($query);

$dbh->exec('RECREATE TABLE test_d1(K numeric(15, 2), DT date)');
$sql='INSERT INTO test_d1(K, DT) values(?, ?)';
$query = $dbh->prepare($sql);
$query->execute([0.76, '2019-06-12']);
unset($query);

$sql='SELECT * FROM test_d1';
$query = $dbh->prepare($sql);
$query->execute();
$row = $query->fetch(\PDO::FETCH_OBJ);
var_dump($row->K);
var_dump($row->DT);

unset($query);
unset($dbh);
echo "done\n";

?>
--EXPECT--
int(1)
string(8) "2.000000"
string(4) "0.76"
string(19) "2019-06-12 00:00:00"
string(4) "0.76"
string(19) "2019-06-12 00:00:00"
done