Merge pull request #94 from andrex47/master

query string refatoration

Author: andrex47

src/Database/Connection.php

@@ -264,55 +264,32 @@ private function queryString($tables)
 //        Has domain.table
         if (isset($explicitDB[1])) {
             return <<<SQL
-                SELECT
-                    a.name,
-                    st.name AS type
-                FROM
-                    {$explicitDB[0]}..syscolumns a,
-                    {$explicitDB[0]}..systypes b,
-                    {$explicitDB[0]}..systypes s,
-                    {$explicitDB[0]}..systypes st
-                WHERE
-                    a.usertype = b.usertype AND
-                    s.usertype = a.usertype AND
-                    s.type = st.type AND
-                    st.name NOT IN (
-                        'timestamp',
-                        'sysname',
-                        'longsysname',
-                        'nchar',
-                        'nvarchar'
-                    ) AND
-                    st.usertype < 100 AND
-                    object_name (
-                        a.id,
-                        db_id ('{$explicitDB[0]}')
-                    ) = '{$explicitDB[1]}'
-                SQL;
+            SELECT
+                syscolumns.name,
+                systypes.name AS type
+            FROM
+                {$explicitDB[0]}..syscolumns noholdlock
+            JOIN
+                {$explicitDB[0]}..systypes noholdlock ON systypes.usertype = syscolumns.usertype
+            WHERE
+                systypes.name NOT IN ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
+                AND systypes.usertype < 100
+                AND object_name(syscolumns.id, db_id('{$explicitDB[0]}')) = '{$explicitDB[1]}'
+            SQL;
         } else {
             return <<<SQL
-                SELECT
-                    a.name,
-                    st.name AS type
-                FROM
-                    syscolumns a,
-                    systypes b,
-                    systypes s,
-                    systypes st
-                WHERE
-                    a.usertype = b.usertype AND
-                    s.usertype = a.usertype AND
-                    s.type = st.type AND
-                    st.name NOT IN (
-                        'timestamp',
-                        'sysname',
-                        'longsysname',
-                        'nchar',
-                        'nvarchar'
-                    ) AND
-                    st.usertype < 100 AND
-                    object_name (a.id) = '{$tables}'
-                SQL;
+                    SELECT
+                syscolumns.name,
+                systypes.name AS type
+            FROM
+                syscolumns
+            JOIN
+                systypes ON systypes.usertype = syscolumns.usertype
+            WHERE
+                systypes.name NOT IN ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
+                AND systypes.usertype < 100
+            AND object_name(syscolumns.id) = '{$tables}'
+            SQL;
         }
     }
 

src/Database/Schema/Grammar.php

@@ -48,17 +48,18 @@ public function compileTableExists()
     public function compileColumnExists(string $table)
     {
         return "
-            SELECT
-                col.name
-            FROM
-                sys.columns AS col
-            JOIN
-                sys.objects AS obj
-            ON
-                col.object_id = obj.object_id
-            WHERE
-                obj.type = 'U' AND
-                obj.name = '$table'";
+                   SELECT
+            col.name
+        FROM
+            syscolumns col noholdlock
+        JOIN
+            sysobjects obj noholdlock
+        ON
+            col.id = obj.id
+        WHERE
+            obj.type = 'U' AND
+            obj.name = '$table';
+";
     }
 
     /**
@@ -112,15 +113,15 @@ public function compileColumns($table)
            NULL AS collation, -- Sybase não fornece suporte direto para collation em colunas
            com.text AS comment -- Comentários associados à coluna, se existirem
        FROM
-           sysobjects obj
+           sysobjects obj noholdlock
                JOIN
-           syscolumns col ON obj.id = col.id
+           syscolumns col noholdlock ON obj.id = col.id
                JOIN
-           systypes type ON col.usertype = type.usertype
+           systypes type noholdlock ON col.usertype = type.usertype
                LEFT JOIN
-           syscomments def ON col.cdefault = def.id -- Valores padrão da coluna
+           syscomments def noholdlock ON col.cdefault = def.id -- Valores padrão da coluna
                LEFT JOIN
-           syscomments com ON col.colid = com.colid -- Comentários associados às colunas (se habilitados)
+           syscomments com  noholdlock ON col.colid = com.colid -- Comentários associados às colunas (se habilitados)
        WHERE
            obj.type IN ('U', 'V') -- 'U' para tabelas, 'V' para visões
          AND obj.name = '$table'
@@ -142,9 +143,9 @@ public function compileIndexes($table)
                  CASE WHEN i.status & 2048 = 2048 THEN 'YES' ELSE 'NO' END AS is_primary,
                  CASE WHEN i.status & 2 = 2 THEN 'YES' ELSE 'NO' END AS is_unique
     FROM
-        sysobjects o
-            INNER JOIN sysindexes i ON i.id = o.id
-            INNER JOIN syscolumns c ON c.id = o.id
+        sysobjects o noholdlock
+            INNER JOIN sysindexes i noholdlock ON i.id = o.id
+            INNER JOIN syscolumns c noholdlock ON c.id = o.id
     WHERE
         o.type = 'U'  -- Apenas tabelas de usuário
       AND o.name = '$table'  -- Nome da tabela alvo