Skip to content

Commit 9c7d2f7

Browse files
andrehankeandrehanke
authored andcommitted
enhance: removido filtro de colunas de tabela
1 parent 59d261c commit 9c7d2f7

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/Database/Connection.php

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -270,23 +270,18 @@ private function queryString($tables)
270270
JOIN
271271
{$explicitDB[0]}..systypes as systypes noholdlock ON systypes.usertype = syscolumns.usertype
272272
WHERE
273-
systypes.name NOT IN ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
274-
AND systypes.usertype < 100
275-
AND object_name(syscolumns.id, db_id('{$explicitDB[0]}')) = '{$explicitDB[1]}'
273+
object_name(syscolumns.id, db_id('{$explicitDB[0]}')) = '{$explicitDB[1]}'
276274
SQL;
277275
} else {
278276
return <<<SQL
279277
SELECT
280278
syscolumns.name,
281279
systypes.name AS type
282280
FROM
283-
syscolumns
281+
syscolumns noholdlock
284282
JOIN
285-
systypes ON systypes.usertype = syscolumns.usertype
286-
WHERE
287-
systypes.name NOT IN ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
288-
AND systypes.usertype < 100
289-
AND object_name(syscolumns.id) = '{$tables}'
283+
systypes ON systypes.usertype = syscolumns.usertype noholdlock
284+
WHERE object_name(syscolumns.id) = '{$tables}'
290285
SQL;
291286
}
292287
}
@@ -341,7 +336,7 @@ private function compileNewQuery($query, $bindings)
341336
$newQuery = join(array_map(fn ($k1, $k2) => $k1.$k2, $partQuery, $bindings));
342337
$newQuery = str_replace('[]', '', $newQuery);
343338
$application_encoding = config('database.sybase.application_encoding');
344-
if (is_null($application_encoding)) {
339+
if (is_null($application_encoding) || $application_encoding == false) {
345340
return $newQuery;
346341
}
347342
$database_charset = config('database.sybase.database_charset');
@@ -391,7 +386,7 @@ public function select($query, $bindings = [], $useReadPdo = true)
391386
$result = [...$result];
392387

393388
$application_encoding = config('database.sybase.application_encoding');
394-
if (is_null($application_encoding)) {
389+
if (is_null($application_encoding) || $application_encoding == false) {
395390
return $result;
396391
}
397392
$database_charset = config('database.sybase.database_charset');

0 commit comments

Comments
 (0)