Skip to content

Commit 1b0db40

Browse files
committed
Merge branch '10.x' into 11.x
# Conflicts: # CHANGELOG.md # src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php # src/Illuminate/Foundation/Application.php # src/Illuminate/Foundation/Console/ServeCommand.php
2 parents 4fcf4a6 + c278f6c commit 1b0db40

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function compileColumns($table)
105105
{
106106
return sprintf(
107107
'select name, type, not "notnull" as "nullable", dflt_value as "default", pk as "primary", hidden as "extra" '
108-
.'from pragma_table_xinfo(%s) order by cid asc',
108+
.'from pragma_table_info(%s) order by cid asc',
109109
$this->quoteString(str_replace('.', '__', $table))
110110
);
111111
}

0 commit comments

Comments
 (0)