Merge lp:~syleam/openobject-server/trunk-dont-use-with-oids into lp:openobject-server

[Christophe CHAUVET]

[Olivier Dony (Odoo) (odo-openerp)]

Looks ok, but why not drop the "WITH[OUT] OIDS" clause directly? It's deprecated and the default is off since PostgreSQL 8.1 [*] and OpenERP requires 8.3.

Also it's best to avoid any kind of whitespace alteration on lines that are not modified by the patch, because it pollutes the version history. If you really really want to change whitespace you should do it in a separate commit at least (but it's better to simply avoid it). We ask all our developers to turn all kind of "at-save" code formatting triggers, because of that ;-)

Thanks for the patch!

[*] http://www.postgresql.org/docs/8.4/static/runtime-config-compatible.html#GUC-DEFAULT-WITH-OIDS

review: Needs Fixing

[lp:~syleam/openobject-server/trunk-dont-use-with-oids]

4645. By Christophe CHAUVET on 2012-12-07

[IMP] Remove completly the OIDS, cause WITHOUT OIDS is activate by default

[Christophe CHAUVET (christophe-chauvet)]

Hi Olivier

Thanks for your reply. As you answer suggest i remove the WITHOUT OIDS

For the whitespace alteration, it generate by vim-openerp extension, sorry for the noise ;)

[1] https://code.launchpad.net/~vim-openerp-team/vim-openerp/devel

[Christophe CHAUVET (christophe-chauvet)]

As suggest i remove the terms WITH[OUT] OIDS

Regards,

review: Needs Resubmitting

[Olivier Dony (Odoo) (odo-openerp)]

Excellent, thanks! And having the MP branch pre-tested and green on runbot makes the job even easier! :-D
Merged!

review: Approve

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-12-05 08:28:40 +0000
+++ openerp/osv/orm.py	2012-12-07 16:23:26 +0000
@@ -3234,7 +3234,7 @@
 
 
     def _create_table(self, cr):
-        cr.execute('CREATE TABLE "%s" (id SERIAL NOT NULL, PRIMARY KEY(id)) WITHOUT OIDS' % (self._table,))
+        cr.execute('CREATE TABLE "%s" (id SERIAL NOT NULL, PRIMARY KEY(id))' % (self._table,))
         cr.execute(("COMMENT ON TABLE \"%s\" IS %%s" % self._table), (self._description,))
         _schema.debug("Table '%s': created", self._table)
 
@@ -3318,7 +3318,7 @@
                 raise except_orm('Programming Error', ('Many2Many destination model does not exist: `%s`') % (f._obj,))
             dest_model = self.pool.get(f._obj)
             ref = dest_model._table
-            cr.execute('CREATE TABLE "%s" ("%s" INTEGER NOT NULL, "%s" INTEGER NOT NULL, UNIQUE("%s","%s")) WITH OIDS' % (m2m_tbl, col1, col2, col1, col2))
+            cr.execute('CREATE TABLE "%s" ("%s" INTEGER NOT NULL, "%s" INTEGER NOT NULL, UNIQUE("%s","%s"))' % (m2m_tbl, col1, col2, col1, col2))
             # create foreign key references with ondelete=cascade, unless the targets are SQL views
             cr.execute("SELECT relkind FROM pg_class WHERE relkind IN ('v') AND relname=%s", (ref,))
             if not cr.fetchall():