AFPy
/
pasteque
9
1
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fixed: key is a MySQL reserved keyword :p

This commit is contained in:
Alexandre Henriet 2013-04-05 15:04:17 +02:00
parent 004aa6f700
commit ca38d1aa17
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paste/models.py
View File

@ -21,7 +21,7 @@ EXPIRE_CHOICES = (
class Language(models.Model):
"""Language object."""
name = models.CharField(max_length=200, unique=True)
key = models.CharField(max_length=200, unique=True)
slug = models.SlugField(max_length=200, unique=True)
def __unicode__(self):
"""String representation."""

2
paste/renderers.py
View File

@ -12,7 +12,7 @@ def render_pygments(request, paste, data):
if cache_exists(key):
highlighted_content = cache_fetch(key)
else:
lexer = get_lexer_by_name(paste.language.key)
lexer = get_lexer_by_name(paste.language.slug)
formatter = get_formatter_by_name('html')
highlighted_content = highlight(paste.content, lexer, formatter)
cache_store(key, highlighted_content)

36
share/language-dml.sql
View File

@ -1,18 +1,18 @@
insert into paste_language('name', 'key') values('Bash (shell)', 'bash');
insert into paste_language('name', 'key') values('C#','csharp');
insert into paste_language('name', 'key') values('C','c');
insert into paste_language('name', 'key') values('C++','cpp');
insert into paste_language('name', 'key') values('CSS','css');
insert into paste_language('name', 'key') values('Diff','diff');
insert into paste_language('name', 'key') values('Go','go');
insert into paste_language('name', 'key') values('HTML','html');
insert into paste_language('name', 'key') values('Java','java');
insert into paste_language('name', 'key') values('Javascript','javascript');
insert into paste_language('name', 'key') values('Perl','perl');
insert into paste_language('name', 'key') values('PHP','php');
insert into paste_language('name', 'key') values('Plain text','text');
insert into paste_language('name', 'key') values('Python','python');
insert into paste_language('name', 'key') values('Ruby','ruby');
insert into paste_language('name', 'key') values('SQL','sql');
insert into paste_language('name', 'key') values('XML','xml');
insert into paste_language('name', 'key') values('YAML','yaml');
INSERT INTO paste_language (name, slug) VALUES ('Bash (shell)', 'bash');
INSERT INTO paste_language (name, slug) VALUES ('C#','csharp');
INSERT INTO paste_language (name, slug) VALUES ('C','c');
INSERT INTO paste_language (name, slug) VALUES ('C++','cpp');
INSERT INTO paste_language (name, slug) VALUES ('CSS','css');
INSERT INTO paste_language (name, slug) VALUES ('Diff','diff');
INSERT INTO paste_language (name, slug) VALUES ('Go','go');
INSERT INTO paste_language (name, slug) VALUES ('HTML','html');
INSERT INTO paste_language (name, slug) VALUES ('Java','java');
INSERT INTO paste_language (name, slug) VALUES ('Javascript','javascript');
INSERT INTO paste_language (name, slug) VALUES ('Perl','perl');
INSERT INTO paste_language (name, slug) VALUES ('PHP','php');
INSERT INTO paste_language (name, slug) VALUES ('Plain text','text');
INSERT INTO paste_language (name, slug) VALUES ('Python','python');
INSERT INTO paste_language (name, slug) VALUES ('Ruby','ruby');
INSERT INTO paste_language (name, slug) VALUES ('SQL','sql');
INSERT INTO paste_language (name, slug) VALUES ('XML','xml');
INSERT INTO paste_language (name, slug) VALUES ('YAML','yaml');