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
0f33f901
Commit
0f33f901
authored
May 09, 2013
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/yiisoft/yii2
parents
c7e40f5c
a61ec6bd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
33 deletions
+33
-33
Connection.php
framework/db/Connection.php
+1
-1
Console.php
framework/helpers/base/Console.php
+32
-32
No files found.
framework/db/Connection.php
View file @
0f33f901
...
...
@@ -242,7 +242,7 @@ class Connection extends Component
'mysql'
=>
'yii\db\mysql\Schema'
,
// MySQL
'sqlite'
=>
'yii\db\sqlite\Schema'
,
// sqlite 3
'sqlite2'
=>
'yii\db\sqlite\Schema'
,
// sqlite 2
'mssql'
=>
'yi\db\dao\mssql\Schema'
,
// Mssql driver on windows hosts
'mssql'
=>
'yi
i
\db\dao\mssql\Schema'
,
// Mssql driver on windows hosts
'sqlsrv'
=>
'yii\db\mssql\Schema'
,
// Mssql
'oci'
=>
'yii\db\oci\Schema'
,
// Oracle driver
'dblib'
=>
'yii\db\mssql\Schema'
,
// dblib drivers on linux (and maybe others os) hosts
...
...
framework/helpers/base/Console.php
View file @
0f33f901
...
...
@@ -456,39 +456,39 @@ class Console
public
static
function
renderColoredString
(
$string
,
$colored
=
true
)
{
static
$conversions
=
array
(
'%y'
=>
array
(
s
tatic
::
FG_YELLOW
),
'%g'
=>
array
(
s
tatic
::
FG_GREEN
),
'%b'
=>
array
(
s
tatic
::
FG_BLUE
),
'%r'
=>
array
(
s
tatic
::
FG_RED
),
'%p'
=>
array
(
s
tatic
::
FG_PURPLE
),
'%m'
=>
array
(
s
tatic
::
FG_PURPLE
),
'%c'
=>
array
(
s
tatic
::
FG_CYAN
),
'%w'
=>
array
(
s
tatic
::
FG_GREY
),
'%k'
=>
array
(
s
tatic
::
FG_BLACK
),
'%y'
=>
array
(
s
elf
::
FG_YELLOW
),
'%g'
=>
array
(
s
elf
::
FG_GREEN
),
'%b'
=>
array
(
s
elf
::
FG_BLUE
),
'%r'
=>
array
(
s
elf
::
FG_RED
),
'%p'
=>
array
(
s
elf
::
FG_PURPLE
),
'%m'
=>
array
(
s
elf
::
FG_PURPLE
),
'%c'
=>
array
(
s
elf
::
FG_CYAN
),
'%w'
=>
array
(
s
elf
::
FG_GREY
),
'%k'
=>
array
(
s
elf
::
FG_BLACK
),
'%n'
=>
array
(
0
),
// reset
'%Y'
=>
array
(
s
tatic
::
FG_YELLOW
,
static
::
BOLD
),
'%G'
=>
array
(
s
tatic
::
FG_GREEN
,
static
::
BOLD
),
'%B'
=>
array
(
s
tatic
::
FG_BLUE
,
static
::
BOLD
),
'%R'
=>
array
(
s
tatic
::
FG_RED
,
static
::
BOLD
),
'%P'
=>
array
(
s
tatic
::
FG_PURPLE
,
static
::
BOLD
),
'%M'
=>
array
(
s
tatic
::
FG_PURPLE
,
static
::
BOLD
),
'%C'
=>
array
(
s
tatic
::
FG_CYAN
,
static
::
BOLD
),
'%W'
=>
array
(
s
tatic
::
FG_GREY
,
static
::
BOLD
),
'%K'
=>
array
(
s
tatic
::
FG_BLACK
,
static
::
BOLD
),
'%N'
=>
array
(
0
,
s
tatic
::
BOLD
),
'%3'
=>
array
(
s
tatic
::
BG_YELLOW
),
'%2'
=>
array
(
s
tatic
::
BG_GREEN
),
'%4'
=>
array
(
s
tatic
::
BG_BLUE
),
'%1'
=>
array
(
s
tatic
::
BG_RED
),
'%5'
=>
array
(
s
tatic
::
BG_PURPLE
),
'%6'
=>
array
(
s
tatic
::
BG_PURPLE
),
'%7'
=>
array
(
s
tatic
::
BG_CYAN
),
'%0'
=>
array
(
s
tatic
::
BG_GREY
),
'%F'
=>
array
(
s
tatic
::
BLINK
),
'%U'
=>
array
(
s
tatic
::
UNDERLINE
),
'%8'
=>
array
(
s
tatic
::
NEGATIVE
),
'%9'
=>
array
(
s
tatic
::
BOLD
),
'%_'
=>
array
(
s
tatic
::
BOLD
)
'%Y'
=>
array
(
s
elf
::
FG_YELLOW
,
self
::
BOLD
),
'%G'
=>
array
(
s
elf
::
FG_GREEN
,
self
::
BOLD
),
'%B'
=>
array
(
s
elf
::
FG_BLUE
,
self
::
BOLD
),
'%R'
=>
array
(
s
elf
::
FG_RED
,
self
::
BOLD
),
'%P'
=>
array
(
s
elf
::
FG_PURPLE
,
self
::
BOLD
),
'%M'
=>
array
(
s
elf
::
FG_PURPLE
,
self
::
BOLD
),
'%C'
=>
array
(
s
elf
::
FG_CYAN
,
self
::
BOLD
),
'%W'
=>
array
(
s
elf
::
FG_GREY
,
self
::
BOLD
),
'%K'
=>
array
(
s
elf
::
FG_BLACK
,
self
::
BOLD
),
'%N'
=>
array
(
0
,
s
elf
::
BOLD
),
'%3'
=>
array
(
s
elf
::
BG_YELLOW
),
'%2'
=>
array
(
s
elf
::
BG_GREEN
),
'%4'
=>
array
(
s
elf
::
BG_BLUE
),
'%1'
=>
array
(
s
elf
::
BG_RED
),
'%5'
=>
array
(
s
elf
::
BG_PURPLE
),
'%6'
=>
array
(
s
elf
::
BG_PURPLE
),
'%7'
=>
array
(
s
elf
::
BG_CYAN
),
'%0'
=>
array
(
s
elf
::
BG_GREY
),
'%F'
=>
array
(
s
elf
::
BLINK
),
'%U'
=>
array
(
s
elf
::
UNDERLINE
),
'%8'
=>
array
(
s
elf
::
NEGATIVE
),
'%9'
=>
array
(
s
elf
::
BOLD
),
'%_'
=>
array
(
s
elf
::
BOLD
)
);
if
(
$colored
)
{
...
...
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