Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
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
edx
edx-platform
Commits
c436c6aa
Commit
c436c6aa
authored
Dec 06, 2013
by
David Baumgold
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1879 from edx/db/mitx-edx-sqlite
Change mitx.db to edx.db for dev sqlite
parents
39f4cb80
2666b969
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
5 deletions
+9
-5
CHANGELOG.rst
+4
-0
cms/envs/dev.py
+1
-1
common/djangoapps/terrain/browser.py
+1
-1
lms/envs/dev.py
+1
-1
lms/envs/static.py
+1
-1
lms/envs/test.py
+1
-1
No files found.
CHANGELOG.rst
View file @
c436c6aa
...
...
@@ -5,6 +5,10 @@ These are notable changes in edx-platform. This is a rolling list of changes,
in roughly chronological order, most recent first. Add your entries at or near
the top. Include a label indicating the component affected.
Common: Switch from mitx.db to edx.db for sqlite databases. This will effectively
reset state for local instances of the code, unless you manually rename your
mitx.db file to edx.db.
Blades: Video Transcripts: Fix clear and download buttons. BLD-438.
Common: Switch over from MITX_FEATURES to just FEATURES. To override items in
...
...
cms/envs/dev.py
View file @
c436c6aa
...
...
@@ -71,7 +71,7 @@ CONTENTSTORE = {
DATABASES
=
{
'default'
:
{
'ENGINE'
:
'django.db.backends.sqlite3'
,
'NAME'
:
ENV_ROOT
/
"db"
/
"
mit
x.db"
,
'NAME'
:
ENV_ROOT
/
"db"
/
"
ed
x.db"
,
}
}
...
...
common/djangoapps/terrain/browser.py
View file @
c436c6aa
...
...
@@ -155,7 +155,7 @@ def initial_setup(server):
def
reset_data
(
scenario
):
"""
Clean out the django test database defined in the
envs/acceptance.py file:
mitx_all/db/test_mit
x.db
envs/acceptance.py file:
edx-platform/db/test_ed
x.db
"""
LOGGER
.
debug
(
"Flushing the test database..."
)
call_command
(
'flush'
,
interactive
=
False
,
verbosity
=
0
)
...
...
lms/envs/dev.py
View file @
c436c6aa
...
...
@@ -55,7 +55,7 @@ LOGGING = get_logger_config(ENV_ROOT / "log",
DATABASES
=
{
'default'
:
{
'ENGINE'
:
'django.db.backends.sqlite3'
,
'NAME'
:
ENV_ROOT
/
"db"
/
"
mit
x.db"
,
'NAME'
:
ENV_ROOT
/
"db"
/
"
ed
x.db"
,
}
}
...
...
lms/envs/static.py
View file @
c436c6aa
...
...
@@ -25,7 +25,7 @@ LOGGING = get_logger_config(ENV_ROOT / "log",
DATABASES
=
{
'default'
:
{
'ENGINE'
:
'django.db.backends.sqlite3'
,
'NAME'
:
ENV_ROOT
/
"db"
/
"
mit
x.db"
,
'NAME'
:
ENV_ROOT
/
"db"
/
"
ed
x.db"
,
}
}
...
...
lms/envs/test.py
View file @
c436c6aa
...
...
@@ -130,7 +130,7 @@ DOC_STORE_CONFIG = {
DATABASES
=
{
'default'
:
{
'ENGINE'
:
'django.db.backends.sqlite3'
,
'NAME'
:
TEST_ROOT
/
'db'
/
'
mit
x.db'
'NAME'
:
TEST_ROOT
/
'db'
/
'
ed
x.db'
},
}
...
...
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