Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
张磊
/
FileStorageBeego
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
6f516246
authored
2014-10-24 14:51:35 +0400
by
supar
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Add column DEFAULT attribute. Do not add if field is key or in
relations.
1 parent
c34c514b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
11 deletions
orm/cmd_utils.go
orm/models_info_f.go
orm/cmd_utils.go
View file @
6f51624
...
...
@@ -104,7 +104,11 @@ func getColumnAddQuery(al *alias, fi *fieldInfo) string {
typ
+=
" "
+
"NOT NULL"
}
return
fmt
.
Sprintf
(
"ALTER TABLE %s%s%s ADD COLUMN %s%s%s %s"
,
Q
,
fi
.
mi
.
table
,
Q
,
Q
,
fi
.
column
,
Q
,
typ
)
return
fmt
.
Sprintf
(
"ALTER TABLE %s%s%s ADD COLUMN %s%s%s %s %s"
,
Q
,
fi
.
mi
.
table
,
Q
,
Q
,
fi
.
column
,
Q
,
typ
,
getColumnDefault
(
fi
),
)
}
// create database creation string.
...
...
@@ -155,6 +159,9 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex
//if fi.initial.String() != "" {
// column += " DEFAULT " + fi.initial.String()
//}
// Append attribute DEFAULT
column
+=
getColumnDefault
(
fi
)
if
fi
.
unique
{
column
+=
" "
+
"UNIQUE"
...
...
@@ -240,6 +247,7 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex
return
}
// Get string value for the attribute "DEFAULT" for the CREATE, ALTER commands
func
getColumnDefault
(
fi
*
fieldInfo
)
string
{
var
(
...
...
@@ -255,19 +263,19 @@ func getColumnDefault(fi *fieldInfo) string {
// These defaults will be useful if there no config value orm:"default" and NOT NULL is on
switch
fi
.
fieldType
{
case
TypeDateField
:
d
=
"0000-00-00"
case
TypeDateTimeField
:
d
=
"0000-00-00 00:00:00"
case
TypeBooleanField
,
TypeBitField
,
TypeSmallIntegerField
,
TypeIntegerField
,
TypeBigIntegerField
,
TypePositiveBitField
,
TypePositiveSmallIntegerField
,
case
TypeDateField
:
d
=
"0000-00-00"
case
TypeDateTimeField
:
d
=
"0000-00-00 00:00:00"
case
TypeBooleanField
,
TypeBitField
,
TypeSmallIntegerField
,
TypeIntegerField
,
TypeBigIntegerField
,
TypePositiveBitField
,
TypePositiveSmallIntegerField
,
TypePositiveIntegerField
,
TypePositiveBigIntegerField
,
TypeFloatField
,
TypeDecimalField
:
d
=
"0"
d
=
"0"
}
if
fi
.
colDefault
{
if
!
fi
.
initial
.
Exist
()
{
v
=
fmt
.
Sprintf
(
t
,
""
)
...
...
orm/models_info_f.go
View file @
6f51624
...
...
@@ -116,6 +116,7 @@ type fieldInfo struct {
null
bool
index
bool
unique
bool
colDefault
bool
initial
StrTo
size
int
auto_now
bool
...
...
@@ -280,6 +281,11 @@ checkType:
fi
.
pk
=
attrs
[
"pk"
]
fi
.
unique
=
attrs
[
"unique"
]
// Mark object property if there is attribute "default" in the orm configuration
if
_
,
ok
:=
tags
[
"default"
];
ok
{
fi
.
colDefault
=
true
}
switch
fieldType
{
case
RelManyToMany
,
RelReverseMany
,
RelReverseOne
:
fi
.
null
=
false
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
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 post a comment