1
0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Commit Graph

16 Commits

Author SHA1 Message Date
Alex Gaynor
1dafb9ad6c [soc2009/multidb] Resolved a number of strange merge conflicts that had arisen throughout various merges.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-23 16:46:07 +00:00
Alex Gaynor
4e36fffab2 [soc2009/multidb] Renaming of database attributes - you now use NAME, ENGINE, etc rather than DATABASE_NAME, DATABASE_ENGINE inside DATABASES. Also deprecates the use of short names (.e.g., `sqlite3` for backends in ENGINE). Patch from Russell Keith-Magee.
Conflicts:

	docs/releases/1.2.txt

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-23 16:45:41 +00:00
Alex Gaynor
1fc8f9a279 [soc2009/multidb] Merged up to trunk r11760.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-23 14:25:44 +00:00
Alex Gaynor
4f40925785 [soc2009/multidb] Split SQL construction into two seperate classes, the Query class which stores data about a query being constructed, and a Compiler class which generates SQL.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-21 07:03:40 +00:00
Alex Gaynor
2bc7422b52 [soc2009/multidb] Updated to trunk r11603. This includes a critical security fix.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 22:16:10 +00:00
Alex Gaynor
2231e64115 [soc2009/multidb] Fixed some exceptionally weird merging that git did. Bad git.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-06 00:48:45 +00:00
Alex Gaynor
b7b5493fc3 [soc2009/multidb] Fix the remaining tests that were depending on the out of date setting.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-06 00:46:53 +00:00
Alex Gaynor
1a98f6ff26 [soc2009/multidb] Updated to trunk r11371.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-31 18:29:06 +00:00
Russell Keith-Magee
b97178f7ec Fixed #10842 -- Corrected parsing of version numbers for PostgreSQL 8.4beta series. Thanks to hgdeoro for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-10 09:22:06 +00:00
Justin Bronn
da3b38cdda Fixed #6064 -- Added the connection_created signal for when a database connection is created.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-29 23:15:58 +00:00
Matt Boersma
b41a45f8e5 Fixed #5543: callproc() and friends now work with Oracle and our FormatStylePlaceholderCursor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-16 22:23:58 +00:00
Russell Keith-Magee
9dc4ba875f Fixed #5461 -- Refactored the database backend code to use classes for the creation and introspection modules. Introduces a new validation module for DB-specific validation. This is a backwards incompatible change; see the wiki for details.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-11 12:11:25 +00:00
Ian Kelly
6929c0d4d1 Fixed #6254: Made fetchone() in the oracle backend correctly convert
strings to unicode objects.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-04 22:51:22 +00:00
Malcolm Tredinnick
7a6e9f7633 Rewrote the backends test to be more portable. Was previously failing on MySQL.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-16 10:04:26 +00:00
Jacob Kaplan-Moss
5af2af3e33 Fixed the test in [6218] which was invalid for psycopg2 and friends -- executemany() shouldn't accept None, just empty lists.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-14 22:54:58 +00:00
Ian Kelly
5a5d8a90b5 Added test cases for [6218].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-14 21:38:45 +00:00