<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>eb3ae44ccaff1dc63eb31bf86d8db07c88ddc413</id>
      </parent>
      <parent>
        <id>600a89f2082beadf4af9fe140a1a2ae56386cd49</id>
      </parent>
    </parents>
    <author>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/0e2fbd80e2420329738b891240d44a056cea1de4</url>
    <id>0e2fbd80e2420329738b891240d44a056cea1de4</id>
    <committed-date>2009-08-10T14:07:33-07:00</committed-date>
    <authored-date>2009-08-10T14:07:33-07:00</authored-date>
    <message>Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/calculations.rb
	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb</message>
    <tree>5b16755670be58e168b5e86e2cdcb43ee5aa3918</tree>
    <committer>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9c1bac0b7fcb627640db6824dca3e6e829a3c3e6</id>
      </parent>
    </parents>
    <author>
      <name>Leonardo Borges</name>
      <email>leonardoborges.rj@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/0c391b46fb39b697bbae1493caade23e2ddbd8a6</url>
    <id>0c391b46fb39b697bbae1493caade23e2ddbd8a6</id>
    <committed-date>2009-08-09T22:24:54-07:00</committed-date>
    <authored-date>2009-08-09T01:56:25-07:00</authored-date>
    <message>PostgreSQL: XML datatype support

[#1874 state:committed]

Signed-off-by: Jeremy Kemper &lt;jeremy@bitsweat.net&gt;</message>
    <tree>5af5ca090d1cf4cc31b51b2f4cfd528e21d2f724</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d2d464e26e9d41b7299675e145ae1455cce37dd4</id>
      </parent>
    </parents>
    <author>
      <name>Jaime Bellmyer</name>
      <email>online@bellmyer.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/f0602214e0ff4638fafb819a7ffbd4ce0e37efb7</url>
    <id>f0602214e0ff4638fafb819a7ffbd4ce0e37efb7</id>
    <committed-date>2009-08-09T22:17:39-07:00</committed-date>
    <authored-date>2009-02-26T07:48:58-08:00</authored-date>
    <message>raises exception (ActiveRecord::ConfigurationError with message) on habtm association creation if join table contains a primary key

Signed-off-by: Jeremy Kemper &lt;jeremy@bitsweat.net&gt;</message>
    <tree>d9c6e56dae0cf5c0a34deec95523c06d2a2fc372</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>50f73bd39c729b4ba4b5215b608e5767ab0aa7a1</id>
      </parent>
      <parent>
        <id>b5dfdc714fab7d2836e0a979ca88b4a17db9ec06</id>
      </parent>
    </parents>
    <author>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/9c70442534c7754eac3738e0ddf11446b01c4f9e</url>
    <id>9c70442534c7754eac3738e0ddf11446b01c4f9e</id>
    <committed-date>2009-06-30T15:34:26-07:00</committed-date>
    <authored-date>2009-06-30T15:34:26-07:00</authored-date>
    <message>Merge commit 'rails/master'

Conflicts:
	activerecord/test/cases/adapter_test.rb</message>
    <tree>7af8614ad91e7400735a6be1b36dca704d87e3b6</tree>
    <committer>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>00a5fd3d18ac908af688c5944922cf69c56e850b</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/b5dfdc714fab7d2836e0a979ca88b4a17db9ec06</url>
    <id>b5dfdc714fab7d2836e0a979ca88b4a17db9ec06</id>
    <committed-date>2009-06-25T22:01:21-07:00</committed-date>
    <authored-date>2009-06-25T21:59:27-07:00</authored-date>
    <message>Make sure the wrapped exceptions also have the original exception available.

[#2419 state:committed]</message>
    <tree>642341d623b59be813290765dd08dc4b64eab464</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>53a3eaa8603cf6e7a3c007f327fe5d3bb68de1ee</id>
      </parent>
    </parents>
    <author>
      <name>Michael Schuerig</name>
      <email>michael@schuerig.de</email>
    </author>
    <url>http://github.com/rails/rails/commit/00a5fd3d18ac908af688c5944922cf69c56e850b</url>
    <id>00a5fd3d18ac908af688c5944922cf69c56e850b</id>
    <committed-date>2009-06-25T21:52:55-07:00</committed-date>
    <authored-date>2009-04-04T16:42:21-07:00</authored-date>
    <message>Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.

Signed-off-by: Michael Koziarski &lt;michael@koziarski.com&gt;</message>
    <tree>ab0acf2af0a1404701fe04386e10e1f12084b630</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>18a97a66017452dbe6cf6881c69d7a7dedc7a7bd</id>
      </parent>
    </parents>
    <author>
      <name>Michael Schuerig</name>
      <email>michael@schuerig.de</email>
    </author>
    <url>http://github.com/rails/rails/commit/53a3eaa8603cf6e7a3c007f327fe5d3bb68de1ee</url>
    <id>53a3eaa8603cf6e7a3c007f327fe5d3bb68de1ee</id>
    <committed-date>2009-06-25T21:52:54-07:00</committed-date>
    <authored-date>2009-04-04T16:19:29-07:00</authored-date>
    <message>Translate adapter errors that indicate a violated uniqueness constraint to ActiveRecord::RecordNotUnique exception derived from ActiveReecord::StatementInvalid.

Signed-off-by: Michael Koziarski &lt;michael@koziarski.com&gt;</message>
    <tree>e1f8734cd8b0cc68b99a1acb7c4cde8435204713</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bc899fd3a37fae7e0024e8f0439f204818aeafd7</id>
      </parent>
    </parents>
    <author>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/02a723f7b5f30b00fc77bc85162598f707c7b682</url>
    <id>02a723f7b5f30b00fc77bc85162598f707c7b682</id>
    <committed-date>2009-06-23T13:38:31-07:00</committed-date>
    <authored-date>2009-06-23T13:38:31-07:00</authored-date>
    <message>Arel now buils SQL queries for associations. Removed old code and
updated Arel version to support this.</message>
    <tree>f3761e591165cac781455b7fbf27b1ba316a3e90</tree>
    <committer>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90</id>
      </parent>
      <parent>
        <id>a94e7d7897a300a95d5d5a00c5efc573b42bcb58</id>
      </parent>
    </parents>
    <author>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/103b282130dd340143654801430aed787da4c9c6</url>
    <id>103b282130dd340143654801430aed787da4c9c6</id>
    <committed-date>2009-06-09T06:29:55-07:00</committed-date>
    <authored-date>2009-06-09T06:29:55-07:00</authored-date>
    <message>Merge commit 'rails/master'</message>
    <tree>eddbe800d02f1a3c23f6266b808e74656af31f82</tree>
    <committer>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>99803b7cdba13345d267127e14809fc389a0e0c2</id>
      </parent>
    </parents>
    <author>
      <name>Eugene Pimenov</name>
      <email>libc@mac.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/74c1249d0727e6375529e4bb5b2e2ac78f4a91dc</url>
    <id>74c1249d0727e6375529e4bb5b2e2ac78f4a91dc</id>
    <committed-date>2009-06-09T01:12:01-07:00</committed-date>
    <authored-date>2009-04-23T02:45:12-07:00</authored-date>
    <message>PostgreSQL adapter should call thread safe quote_string function

Signed-off-by: Michael Koziarski &lt;michael@koziarski.com&gt;</message>
    <tree>5912d1ea691667813471ca17982354a6bc767bb5</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b3d40546923b194a89be0d9e00758864fa60b9e8</id>
      </parent>
    </parents>
    <author>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/522711952bf315bc52353e941183237a41f61b23</url>
    <id>522711952bf315bc52353e941183237a41f61b23</id>
    <committed-date>2009-06-02T07:40:01-07:00</committed-date>
    <authored-date>2009-06-02T07:40:01-07:00</authored-date>
    <message>Refactors to work with latest Arel implementation.</message>
    <tree>debb3e1956a6e9b61fc0ff0df8b898d984c8cbf8</tree>
    <committer>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0048897a417774f7e5a0c8c9e82fc8684f94ebc1</id>
      </parent>
      <parent>
        <id>27de7f150b57a18d4ccdd274f6f8b621b58108c6</id>
      </parent>
    </parents>
    <author>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/a04dedd5634cbb602cf48938cee0ff11c046b4c2</url>
    <id>a04dedd5634cbb602cf48938cee0ff11c046b4c2</id>
    <committed-date>2009-05-18T07:18:46-07:00</committed-date>
    <authored-date>2009-05-18T07:18:46-07:00</authored-date>
    <message>Merge commit 'rails/master'

Conflicts:

	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/migration.rb
	activerecord/test/cases/helper.rb</message>
    <tree>66c51731cc283310362db57503d4952e0a0213bb</tree>
    <committer>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fa5da8ad54d68ea0484825845eb6f6a8e8bca361</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/rails/rails/commit/e8550ee0329586b32de425e905c7af7e65bc78a8</url>
    <id>e8550ee0329586b32de425e905c7af7e65bc78a8</id>
    <committed-date>2009-05-13T12:00:15-07:00</committed-date>
    <authored-date>2009-05-13T01:10:37-07:00</authored-date>
    <message>Cherry-pick core extensions</message>
    <tree>0cdfe0f9f0d3fb010280ff0453fc553ab6ff2d92</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>118b19a9fa59587e72af315bfbc0e6812025f12b</id>
      </parent>
    </parents>
    <author>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/8885b2d6c1855742600d0afdb9dfc002acb62e5e</url>
    <id>8885b2d6c1855742600d0afdb9dfc002acb62e5e</id>
    <committed-date>2009-05-06T10:16:03-07:00</committed-date>
    <authored-date>2009-05-06T10:16:03-07:00</authored-date>
    <message>Refactor to calculations. Migration's versions are string not integer. ARel submodule updated.</message>
    <tree>7c217e880d84e3bda88902a89540355d41be39c7</tree>
    <committer>
      <name>Emilio Tagua</name>
      <email>miloops@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>64b33b6cf9db508d2c12394cc1a3f36c91fb2eed</id>
      </parent>
    </parents>
    <author>
      <name>Max Lapshin</name>
      <email>max@maxidoors.ru</email>
    </author>
    <url>http://github.com/rails/rails/commit/f3ac4f387dd748db349ec217030d2b13260516f1</url>
    <id>f3ac4f387dd748db349ec217030d2b13260516f1</id>
    <committed-date>2009-04-21T03:44:13-07:00</committed-date>
    <authored-date>2009-04-20T08:47:31-07:00</authored-date>
    <message>Fixed dumping from postgresql columns in index in wrong order. [#2515 state:resolved]

Signed-off-by: Tarmo T&#228;nav &lt;tarmo@itech.ee&gt;</message>
    <tree>9f7bebcd267c68ff929f516700e91149552daab9</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>cdcd638c2f27ebf98ba7aa59512547f58a5e0c61</id>
      </parent>
    </parents>
    <author>
      <name>Scott Woods</name>
      <email>scott@westarete.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/64b33b6cf9db508d2c12394cc1a3f36c91fb2eed</url>
    <id>64b33b6cf9db508d2c12394cc1a3f36c91fb2eed</id>
    <committed-date>2009-04-21T03:43:38-07:00</committed-date>
    <authored-date>2009-04-20T13:48:02-07:00</authored-date>
    <message>Quote table names when casting to regclass so that capitalized tables are supported. [#2418 state:resolved]

Signed-off-by: Tarmo T&#228;nav &lt;tarmo@itech.ee&gt;</message>
    <tree>4ee0d64fba52ffe0c7ddec4a5fd88adf70561767</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b10fb7e7bcb5efea6c93ae52bad125887cfc235c</id>
      </parent>
    </parents>
    <author>
      <name>Max Lapshin</name>
      <email>max@maxidoors.ru</email>
    </author>
    <url>http://github.com/rails/rails/commit/cdcd638c2f27ebf98ba7aa59512547f58a5e0c61</url>
    <id>cdcd638c2f27ebf98ba7aa59512547f58a5e0c61</id>
    <committed-date>2009-04-21T03:42:40-07:00</committed-date>
    <authored-date>2009-04-20T09:08:51-07:00</authored-date>
    <message>Fixed wrong quoting of index names in postgres [#2402 state:resolved]

Signed-off-by: Tarmo T&#228;nav &lt;tarmo@itech.ee&gt;</message>
    <tree>6673b667fd9daa818962d969724adc6a5306741d</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>632bbbfe1cc49ab92c6de858865ffcdcfa67635f</id>
      </parent>
    </parents>
    <author>
      <name>Max Lapshin</name>
      <email>max@maxidoors.ru</email>
    </author>
    <url>http://github.com/rails/rails/commit/70de8e64e30092b2b1b77869e459b4868f5b9577</url>
    <id>70de8e64e30092b2b1b77869e459b4868f5b9577</id>
    <committed-date>2009-04-05T04:36:36-07:00</committed-date>
    <authored-date>2009-04-04T10:11:33-07:00</authored-date>
    <message>Support multiple schemas in table names for postgresql [#390 state:resolved]

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
    <tree>1074d2da7b3f11af56f7ebce6283c49abc729b98</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b281a6a5b2137548501ef590379d7af5f6955d2d</id>
      </parent>
    </parents>
    <author>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </author>
    <url>http://github.com/rails/rails/commit/9bcf01b23c25e640da7908ac8b1b49fbf7d2e51a</url>
    <id>9bcf01b23c25e640da7908ac8b1b49fbf7d2e51a</id>
    <committed-date>2009-01-13T15:58:50-08:00</committed-date>
    <authored-date>2009-01-13T07:01:44-08:00</authored-date>
    <message>Fix PostgreSQL unit test failures that only occur when using the old 'postgres' driver.

[#1748 state:committed]

Signed-off-by: Jeremy Kemper &lt;jeremy@bitsweat.net&gt;</message>
    <tree>78f7a9bc449265bbf666baafa52bcc9c88c2ffdc</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>13c6c3cfc59ff0b400b294dce15f32752b0fb5f5</id>
      </parent>
      <parent>
        <id>9fe69b225cfbf12c02ee1433adf3a5aa17bcdf59</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/rails/rails/commit/223a1d9451c88800e9fcc93a726fdebec99e2650</url>
    <id>223a1d9451c88800e9fcc93a726fdebec99e2650</id>
    <committed-date>2009-01-10T12:14:44-08:00</committed-date>
    <authored-date>2009-01-10T12:14:44-08:00</authored-date>
    <message>Merge branch 'master' into savepoints</message>
    <tree>207b0b671778ac7a0e00829f6f642256b261cb28</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1fb275541a58e6a2100261c6117e96e6c014cc6c</id>
      </parent>
    </parents>
    <author>
      <name>Xavier Noria</name>
      <email>fxn@hashref.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/a2270ef2594b97891994848138614657363f2806</url>
    <id>a2270ef2594b97891994848138614657363f2806</id>
    <committed-date>2008-12-28T11:49:28-08:00</committed-date>
    <authored-date>2008-12-28T11:48:05-08:00</authored-date>
    <message>Inline code comments for class_eval/module_eval [#1657 state:resolved]

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
    <tree>29962a36c4eb70272df2665db2b28d5b3ad15b99</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e916aa7ea1613be966959c05ad41d13fee55a683</id>
      </parent>
    </parents>
    <author>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </author>
    <url>http://github.com/rails/rails/commit/fb2325e35855d62abd2c76ce03feaa3ca7992e4f</url>
    <id>fb2325e35855d62abd2c76ce03feaa3ca7992e4f</id>
    <committed-date>2008-11-03T11:56:28-08:00</committed-date>
    <authored-date>2008-10-09T08:57:49-07:00</authored-date>
    <message>Reimplement Jeremy's PostgreSQL automatic transaction state introspection code.

- Fixed compatibility with the old 'postgres' driver which doesn't support
  transaction state introspection.
- Added unit tests for it.</message>
    <tree>4864fc83385f6329441b950a83f807a97f59b1e3</tree>
    <committer>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e981eaaf342d06e399b5138553c964adcfadd87c</id>
      </parent>
    </parents>
    <author>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </author>
    <url>http://github.com/rails/rails/commit/885c11b8f9e18f34b12076023455e72166365f00</url>
    <id>885c11b8f9e18f34b12076023455e72166365f00</id>
    <committed-date>2008-11-03T11:56:14-08:00</committed-date>
    <authored-date>2008-10-09T06:41:56-07:00</authored-date>
    <message>Make SQLite3 pass the unit tests for savepoints.</message>
    <tree>bfe3f92932d8f8209a8608fc34a9fdeb3d3d150a</tree>
    <committer>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e383835e738a30cd992c322eff126380bd15094f</id>
      </parent>
    </parents>
    <author>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </author>
    <url>http://github.com/rails/rails/commit/e981eaaf342d06e399b5138553c964adcfadd87c</url>
    <id>e981eaaf342d06e399b5138553c964adcfadd87c</id>
    <committed-date>2008-11-03T11:56:07-08:00</committed-date>
    <authored-date>2008-10-09T05:52:02-07:00</authored-date>
    <message>Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in transaction_test.</message>
    <tree>1b0341fc4167b981916c9d0476061e028efbb082</tree>
    <committer>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f48703e8c6ad8497795a67708ace4eb507a91119</id>
      </parent>
    </parents>
    <author>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </author>
    <url>http://github.com/rails/rails/commit/e383835e738a30cd992c322eff126380bd15094f</url>
    <id>e383835e738a30cd992c322eff126380bd15094f</id>
    <committed-date>2008-11-03T11:56:00-08:00</committed-date>
    <authored-date>2008-10-09T05:47:43-07:00</authored-date>
    <message>Revert &quot;PostgreSQL: introduce transaction_active? rather than tracking activity ourselves&quot;
This commit conflicts with savepoint support.

This reverts commit 045713ee240fff815edb5962b25d668512649478.

Conflicts:

	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb</message>
    <tree>a963b5332f484d8ec5f77d4629797c44da68d418</tree>
    <committer>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>18bf7b421d55c60029289edef1df409a58d021e4</id>
      </parent>
    </parents>
    <author>
      <name>Jonathan Viney</name>
      <email>jonathan@jonathan-desktop.(none)</email>
    </author>
    <url>http://github.com/rails/rails/commit/b3420f5a2e3c38e5efc2b3d995354c39af09569e</url>
    <id>b3420f5a2e3c38e5efc2b3d995354c39af09569e</id>
    <committed-date>2008-11-03T11:55:26-08:00</committed-date>
    <authored-date>2008-08-31T02:09:16-07:00</authored-date>
    <message>Implement savepoints.</message>
    <tree>6d24a360aa1407d2653ea178e0e191f82a444254</tree>
    <committer>
      <name>Hongli Lai (Phusion)</name>
      <email>hongli@phusion.nl</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ef9b6b5cba08f13dcbf7095226b78aaf22df13f7</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/9e2bb2caff2b6fd4712ca3db258b68a588a69e9a</url>
    <id>9e2bb2caff2b6fd4712ca3db258b68a588a69e9a</id>
    <committed-date>2008-10-26T12:04:09-07:00</committed-date>
    <authored-date>2008-10-26T12:04:09-07:00</authored-date>
    <message>Remove reference to fformat to restore support for postgres gem.</message>
    <tree>5806e7a114dd76a105d91a97088f542d4009cbcd</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5c97d4ff29cfd944da751f01177a3024626d57bb</id>
      </parent>
    </parents>
    <author>
      <name>Adam Majer</name>
      <email>adamm@zombino.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/932dffc559ef188eb31d0223116e9da361833488</url>
    <id>932dffc559ef188eb31d0223116e9da361833488</id>
    <committed-date>2008-10-25T03:54:48-07:00</committed-date>
    <authored-date>2008-09-19T19:38:39-07:00</authored-date>
    <message>Fix binary data corruption bug in PostgreSQL adaptor

  1. Move the binary escape/unescape from column to the driver - we should store binary data AR just like most other adaptors
  2. check to make sure we only unescape bytea data
     PGresult.ftype( column ) == 17
  that is passed to us in escaped format
     PGresult.fformat( column ) == 0

Signed-off-by: Michael Koziarski &lt;michael@koziarski.com&gt;
[#1063 state:committed]</message>
    <tree>3b0afabc3f70537b143b8c468182bcc329bbb4c9</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>045713ee240fff815edb5962b25d668512649478</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/rails/rails/commit/039d78a7d81c8ac49dcb6ba0304d32af671d56c9</url>
    <id>039d78a7d81c8ac49dcb6ba0304d32af671d56c9</id>
    <committed-date>2008-09-04T04:17:00-07:00</committed-date>
    <authored-date>2008-09-04T04:17:00-07:00</authored-date>
    <message>still need to track whether we're the toplevel transaction</message>
    <tree>7ca0655bc43139260ca14adca1e1fd2bbfa82e5f</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>671bbd962e1a5430bd495329ef0d863dede01169</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/rails/rails/commit/045713ee240fff815edb5962b25d668512649478</url>
    <id>045713ee240fff815edb5962b25d668512649478</id>
    <committed-date>2008-09-04T03:17:56-07:00</committed-date>
    <authored-date>2008-09-04T03:17:56-07:00</authored-date>
    <message>PostgreSQL: introduce transaction_active? rather than tracking activity ourselves</message>
    <tree>f41146a3c1cc15f89946aca0e49fdf7d5bc84c54</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a444c782125e10ead6227f7cc57b2f5c739111f2</id>
      </parent>
    </parents>
    <author>
      <name>Lars Kanis</name>
      <email>kanis@comcard.de</email>
    </author>
    <url>http://github.com/rails/rails/commit/c2068d14d29ec767c681798b3814f0a8e22fb0ff</url>
    <id>c2068d14d29ec767c681798b3814f0a8e22fb0ff</id>
    <committed-date>2008-08-27T22:51:10-07:00</committed-date>
    <authored-date>2008-08-27T22:49:50-07:00</authored-date>
    <message>PostgreSQL: fix quote_string for certain old pg drivers.  [#94 state:resolved]</message>
    <tree>83fc13ffbfc652a171158dc342386798e85b5f77</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d2d739fd0687bf94ee42b69c413a9077b9cdbff7</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/rails/rails/commit/b319e69ecb06692995664dba263813d99bc2145f</url>
    <id>b319e69ecb06692995664dba263813d99bc2145f</id>
    <committed-date>2008-08-26T01:54:14-07:00</committed-date>
    <authored-date>2008-08-26T01:48:41-07:00</authored-date>
    <message>PostgreSQL: pg driver expects nil instead of empty string for missing user/pass</message>
    <tree>a50922c75cd6ea9e86b43fea5fff80ce1325b306</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0</id>
      </parent>
    </parents>
    <author>
      <name>Tarmo T&#228;nav</name>
      <email>tarmo@itech.ee</email>
    </author>
    <url>http://github.com/rails/rails/commit/707ee0e2695e85186d59aa407f09691ebfcc3125</url>
    <id>707ee0e2695e85186d59aa407f09691ebfcc3125</id>
    <committed-date>2008-08-22T14:46:25-07:00</committed-date>
    <authored-date>2008-08-22T13:53:31-07:00</authored-date>
    <message>Made migrations transactional for PostgreSQL [#834 state:resolved]

Patch originally from http://dev.rubyonrails.org/ticket/5470</message>
    <tree>4357234d7cdb191d267e400ea217642124e06cae</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ab33b27947864d94be667db836e0ad7497575d13</id>
      </parent>
    </parents>
    <author>
      <name>Tarmo T&#228;nav</name>
      <email>tarmo@itech.ee</email>
    </author>
    <url>http://github.com/rails/rails/commit/d3b894563a114912113b816f07ed16511363fb65</url>
    <id>d3b894563a114912113b816f07ed16511363fb65</id>
    <committed-date>2008-08-22T00:37:09-07:00</committed-date>
    <authored-date>2008-08-21T23:44:38-07:00</authored-date>
    <message>Properly quote CREATE DATABASE parameters in postgresql [#771 state:resolved]</message>
    <tree>7d0849b9c366e87389525afab95250f9ed0ba16d</tree>
    <committer>
      <name>Tarmo T&#228;nav</name>
      <email>tarmo@itech.ee</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>3a2ff17af66dfb135ead212de458e7f6860c8004</id>
      </parent>
    </parents>
    <author>
      <name>Miles Georgi</name>
      <email>azimux@gmail.com</email>
    </author>
    <url>http://github.com/rails/rails/commit/09343166ac213e5fcbd3eb5b21d44606b56afa62</url>
    <id>09343166ac213e5fcbd3eb5b21d44606b56afa62</id>
    <committed-date>2008-08-20T13:25:49-07:00</committed-date>
    <authored-date>2008-08-17T23:45:25-07:00</authored-date>
    <message>PostgreSQL: fix transaction bug that can occur if you call change_column with invalid parameters

[#861 state:resolved]</message>
    <tree>5bb8d124d41807a2dda272a08a62c98b47b0dd4d</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
</commits>
