aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Resolve merge conflictsJef van Schendel2012-02-2135-198/+1683
|\
| * We now require sqlalchemy and sqlalchemy-migrateChristopher Allan Webber2012-02-191-0/+2
| |
| * Commenting out the migrations that don't exist yetChristopher Allan Webber2012-02-181-4/+4
| |
| * Updates so that dbupdate command worksChristopher Allan Webber2012-02-189-10/+124
| | | | | | | | | | | | - Various fixes to dbupdate itself - Switching db/sql/migrations.py to use a dict instead of a list - Registering the function
| * Merge branch 'master' into sqlmigrateChristopher Allan Webber2012-02-186-9/+42
| |\
| | * Start having useful defaults for SQLElrond2012-02-184-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly this means: Havintg a config_spec.ini that has a local (relative to mediagoblin.ini) sqlite db with the name "mediagoblin.db". Also: - Add to .gitignore - Add a notice to mediagoblin.ini about the db
| | * Fix MediaTag __init__ to handle no argsElrond2012-02-181-3/+5
| | | | | | | | | | | | | | | Let the init code also handle createing a fresh clean instance without any attrs set.
| | * SQL: fail_metadata as JSON encoded fieldElrond2012-02-183-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | fail_metadata used to be a dict in mongo. So a json encoded field should be okay too. We could use a pickled field instead, which would be more flexible.
| * | Merge branch 'master' into sqlmigrateChristopher Allan Webber2012-02-18181-372/+656
| |\| | | | | | | | | | | | | Conflicts: mediagoblin/db/sql/models.py
| | * Drop pre-rendered html: MediaComment.content_htmlElrond2012-02-186-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a bit of discussion, we decided to drop the pre-rendered html from the database and render it on the fly. In another step, we will use some proper caching method to cache this stuff. This commit affects the MediaComment.content_html part.
| | * Drop pre-rendered html: MediaEntry.description_htmlElrond2012-02-189-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a bit of discussion, we decided to drop the pre-rendered html from the database and render it on the fly. In another step, we will use some proper caching method to cache this stuff. This commit affects the MediaEntry.description_html part.
| | * Drop pre-rendered html: User.bio_htmlElrond2012-02-186-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a bit of discussion, we decided to drop the pre-rendered html from the database and render it on the fly. In another step, we will use some proper caching method to cache this stuff. This commit affects the User.bio_html part.
| | * Revert "Layout overhaul time!"Christopher Allan Webber2012-02-138-173/+146
| | | | | | | | | | | | | | | | | | | | | | | | This reverts a whole bunch of commits, fb1dc4f5 thru 92e8ca79, where an experimental new layout was played with. Unfortunately, this layout broke the look and feel of master, even though it was going in the right direction for mobile stuff. Jef said he'll do things in a branch!
| | * 47: Only lowercase host part of emailElrond2012-02-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to most documentation it seems that the local part of an email adress is/can be case sensitive. While the host part is not. So we lowercase only the host part of the given adress. See: http://issues.mediagoblin.org/ticket/47
| | * Our javascript is actually AGPLv3+, not LGPL*. Correcting.Christopher Allan Webber2012-02-121-1/+1
| | |
| * | Explained why migration #1 commented out.Christopher Allan Webber2012-01-291-0/+3
| | |
| * | Excepting that migration 1 doesn't work(!), sqlalchemy migration branch workingChristopher Allan Webber2012-01-292-38/+77
| | | | | | | | | | | | | | | | | | | | | The reason migration 1 doesn't work, and is commented out, is because of sqlalchemy-migrate not handling certain constraints while dropping binary sqlite columns right. See also: http://code.google.com/p/sqlalchemy-migrate/issues/detail?id=143&thanks=143&ts=1327882242
| * | Update the string outputs to match our tests: newlines, ...->:, etc.Christopher Allan Webber2012-01-291-2/+2
| | |
| * | db_conn.engine -> db_conn.bindChristopher Allan Webber2012-01-291-21/+21
| | |
| * | migrations_to_run here a list, so no reason to call itChristopher Allan Webber2012-01-291-1/+1
| | |
| * | Migration manager's current migration should be 3, not 7, after running all ↵Christopher Allan Webber2012-01-291-3/+3
| | | | | | | | | | | | migrations!
| * | Fixed the descriptions for the necroplex!Christopher Allan Webber2012-01-291-2/+2
| | |
| * | assert column type from Unicode -> VARCHAR. SQLAlchemy reflection only so ↵Christopher Allan Webber2012-01-291-29/+29
| | | | | | | | | | | | smart ;)
| * | printer = CollectingPrinter -> printer = CollectingPrinter()Christopher Allan Webber2012-01-291-2/+2
| | |
| * | CollectingPrinter is a class, not a function!Christopher Allan Webber2012-01-291-1/+1
| | |
| * | self.latest_migration now a property, so we shouldn't __call__ it!Christopher Allan Webber2012-01-291-1/+1
| | |
| * | For clarity, self.database -> self.session.Christopher Allan Webber2012-01-291-12/+12
| | | | | | | | | | | | | | | Actually, I'm not even sure *that* is ideal! But better than what we had...
| * | Yet *another* self.database -> self.database.bind fix!Christopher Allan Webber2012-01-291-1/+1
| | |
| * | Fix database_current_version for when self.migration_data is None.Christopher Allan Webber2012-01-291-0/+4
| | |
| * | another db -> db.bind fix.Christopher Allan Webber2012-01-291-1/+1
| | |
| * | A few basic fixes to sql/util.pyChristopher Allan Webber2012-01-291-5/+9
| | | | | | | | | | | | | | | | | | - MigrationRecord to MigrationData, again - If the table doesn't exist, return None for database_current_migration - database.engine -> database.bind
| * | magical_powers relationship set on wrong table, fixedChristopher Allan Webber2012-01-291-1/+1
| | |
| * | Also switch database_current_migration to a propertyChristopher Allan Webber2012-01-291-3/+4
| | |
| * | Migration records are dicts, not lists. Fix SET1_MIGATIONS!Christopher Allan Webber2012-01-291-1/+1
| | |
| * | Make latest_migration a propertyChristopher Allan Webber2012-01-291-0/+1
| | |
| * | Import MigrationData, not MigrationRecordChristopher Allan Webber2012-01-291-3/+3
| | |
| * | test_set1_to_set3() now has appropriate amount of code, even if it doesn't ↵Christopher Allan Webber2012-01-291-8/+37
| | | | | | | | | | | | run :)
| * | Fixing some obvious errors caught by pyflakesChristopher Allan Webber2012-01-291-21/+25
| | |
| * | More stuff even yet per sql migration stuff! And still not ready!Christopher Allan Webber2012-01-291-4/+4
| | |
| * | Closer to the end of this migration test...Christopher Allan Webber2012-01-291-2/+70
| | |
| * | unicode stuff and more bits on the actual migration methodChristopher Allan Webber2012-01-291-89/+214
| | |
| * | A ton more work on the SQL migration unit tests...Christopher Allan Webber2012-01-291-5/+85
| | |
| * | Wrote up some scaffolding for the actual testsChristopher Allan Webber2012-01-291-3/+53
| | |
| * | Insert migration objects round 3Christopher Allan Webber2012-01-291-0/+87
| | |
| * | import changeset into sql modelsChristopher Allan Webber2012-01-291-0/+7
| | |
| * | Wrote some (semi-silly) descriptions of each migrationChristopher Allan Webber2012-01-291-0/+18
| | |
| * | Docstrings for stage 2 migrationsChristopher Allan Webber2012-01-291-0/+19
| | |
| * | Theoretical full set of migration2 objects to insert for testingChristopher Allan Webber2012-01-291-1/+76
| | |
| * | Insert migration1 objects. Also, Level1 id from Integer->UnicodeChristopher Allan Webber2012-01-291-7/+43
| | |
| * | All theoretical migrations written!Christopher Allan Webber2012-01-291-5/+25
| | |