Skip to content

Commit

Permalink
Changed migration down version
Browse files Browse the repository at this point in the history
  • Loading branch information
vera-liu committed Jan 11, 2017
1 parent 22a4c21 commit 7719e5a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions superset/migrations/versions/bcf3126872fc_add_keyvalue.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"""Add keyvalue table
Revision ID: bcf3126872fc
Revises: 1b2c3f7c96f9
Revises: 1296d28ec131
Create Date: 2017-01-10 11:47:56.306938
"""

# revision identifiers, used by Alembic.
revision = 'bcf3126872fc'
down_revision = '1b2c3f7c96f9'
down_revision = '1296d28ec131'

from alembic import op
import sqlalchemy as sa
Expand Down
2 changes: 1 addition & 1 deletion superset/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
DateTime, Date, Table, Numeric,
create_engine, MetaData, desc, asc, select, and_
)

from sqlalchemy.ext.compiler import compiles
from sqlalchemy.ext.declarative import declared_attr
from sqlalchemy.orm import backref, relationship
Expand Down Expand Up @@ -210,6 +209,7 @@ class Url(Model, AuditMixinNullable):
id = Column(Integer, primary_key=True)
url = Column(Text)


class KeyValue(Model, AuditMixinNullable):

"""Used for any type of key-value store"""
Expand Down
8 changes: 4 additions & 4 deletions superset/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1104,16 +1104,16 @@ def ping():
return "OK"



class KV(BaseSupersetView):

""" used for storing and retrieving key value pairs """
"""used for storing and retrieving key value pairs"""

@log_this
@expose("/store/", methods=['POST', 'GET'])
def store(self):
value = request.form.get('data')
base_url = request.form.get('baseUrl')
base_url = request.form.get('baseUrl') \
if request.form.get('baseUrl') else ''
obj = models.KeyValue(value=value)
db.session.add(obj)
db.session.commit()
Expand Down Expand Up @@ -1775,7 +1775,7 @@ def tables(self, db_id, schema):
)
tables = [t for t in database.all_table_names(schema) if
self.datasource_access_by_name(database, t, schema=schema)]
views = [v for v in database.all_table_names(schema) if
views = [v for v in database.all_view_names(schema) if
self.datasource_access_by_name(database, v, schema=schema)]
payload = {'tables': tables, 'views': views}
return Response(
Expand Down
14 changes: 8 additions & 6 deletions tests/core_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,17 @@ def test_shortner(self):
assert '/r/' in resp.data.decode('utf-8')

def test_kv(self):
self.logout()
self.login(username='admin')
data = {
'dbId': 1,
'sql': 'sql ...',
'data': 'this is a test',
}
resp = self.client.post('/kv/store/', data=data, baseUrl='superset/sqllab')
assert 'superset/sqllab' in resp.data.decode('utf-8')
kvs = db.session.query(models.KeyValue).all()
self.assertEqual(len(kvs), 1)
resp = self.client.post('/kv/store/', data=dict(data=json.dumps(data)))
kv = db.session.query(models.KeyValue).first()
kv_value = kv.value
assert 'this is a test' in kv_value
kv_id = 'id={}'.format(kv.id)
assert kv_id in resp.data.decode('utf-8')

def test_save_dash(self, username='admin'):
self.login(username=username)
Expand Down

0 comments on commit 7719e5a

Please sign in to comment.