summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/odbc
AgeCommit message (Collapse)AuthorFilesLines
2012-03-20Merge upstream branchAndrey Andreev4-13/+15
2012-03-20Again alter ODBC's escape_str()Andrey Andreev1-1/+1
2012-03-20Merge upstreamTimothy Warren3-107/+66
2012-03-20Visibility declarations and cleanup for CI_DB_odbc_resultAndrey Andreev1-26/+27
2012-03-20Visibility declarations and cleanup for CI_DB_odbc_utilityAndrey Andreev1-16/+10
2012-03-20Visibility declarations and cleanup for CI_DB_odbc_forgeAndrey Andreev1-21/+13
2012-03-20Alter str_replace() order in ODBC's escape_str()Andrey Andreev1-3/+3
2012-03-20Visibility declarations and cleanup for CI_DB_odbc_driverAndrey Andreev1-68/+40
2012-03-20Revert "ODBC access modifiers"Timothy Warren4-55/+92
This reverts commit 142ca8e565b722b758b5ef88c888891d04da8700.
2012-03-20Revert "Fixed visibility declarations on dbforge and utility classes"Timothy Warren2-10/+10
This reverts commit 78a2de4e049f478ec1efd92d639aaf11be933335.
2012-03-19Fixed visibility declarations on dbforge and utility classesTimothy Warren2-10/+10
2012-03-19ODBC access modifiersTimothy Warren4-92/+55
2012-03-19Removed pointless _prep_sql methodsTimothy Warren1-17/+0
2012-03-09Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon2-11/+9
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon4-4/+4
Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway...
2012-03-09Fix an eventual issue with LIKE escapingAndrey Andreev1-3/+2
2012-03-09Merge upstream branchAndrey Andreev2-2/+36
2012-03-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow3-86/+124
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php
2012-03-06Resolve _protect_identifiers()/protect_identifiers() usage issuesAndrey Andreev2-11/+9
2012-03-06Fix issue #1125 ... for realAndrey Andreev1-0/+35
2012-03-05Merge upstream branchAndrey Andreev1-2/+2
2012-03-05Partially fix issue #306Andrey Andreev1-4/+3
2012-03-05Merge upstream branchAndrey Andreev2-27/+41
2012-03-05Fix issue #1125Andrey Andreev1-1/+35
2012-03-03Improve DB version() implementation and add pg_version() supportAndrey Andreev1-13/+0
2012-03-02Replaced DB methods _error_message() and _error_number() with error() (issue ↵Andrey Andreev1-17/+6
#1097)
2012-03-01Merge upstream branchAndrey Andreev1-15/+0
2012-03-01Merge upstream changesAndrey Andreev1-23/+35
2012-03-01Merge upstream branchAndrey Andreev1-2/+4
2012-03-01Fix issue #129 (ODBC num_rows() returning -1 in some cases)Andrey Andreev1-4/+16
2012-03-01Merge upstream branchAndrey Andreev1-5/+4
2012-03-01Fix issue #81 (ODBC list_fields(), field_data())Andrey Andreev1-19/+19
2012-02-29Fix ODBC num_rows() for subdrivers that return -1Andrey Andreev1-1/+12
2012-02-27Fixed a db_set_charset() bugAndrey Andreev1-17/+1
2012-02-19Renaming Active Record to Query Builder across the systemJamie Rumbelow1-2/+2
2012-02-14Fix issue #81Andrey Andreev1-8/+14
2012-02-13Revert fix for #81 - it actually breaks thingsAndrey Andreev1-2/+2
2012-02-13Added DSN string supportAndrey Andreev1-2/+8
2012-02-12Fix issue #81Andrey Andreev1-3/+3
2012-01-26Improve the ODBC database driverAndrey Andreev4-351/+185
2012-01-02Updating copyright date to 2012Greg Aker4-4/+4
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones4-16/+64
added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change
2011-10-10Converted database constructors to PHP5 typeTimothy Warren1-2/+2
2011-08-25odbc called incorrect parent in constructMichiel Vugteveen1-1/+1
2011-08-20Fixed a bug (#200) where MySQL queries would be malformed after calling ↵Greg Aker1-0/+1
db->count_all() then db->get()
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones4-6/+6
broke the Typography class's string replacements, for instance
2011-04-25Fixed double-space typo.Razican4-6/+6
2011-02-14Whitespace cleanup in db classesPascal Kriete1-2/+2
2011-02-14Uppercasing some stray lowercase keywords for code consistencyPascal Kriete1-2/+2
2011-01-05Hey look, it's 2011Greg Aker4-4/+4