dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed Issue 1522:Trigger for primary key on oracle database

Browse Source
This commit is contained in:
mdipierro
2013-06-16 07:07:13 -05:00
parent d4a2411eac
commit 9b9e64e9ef
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.5.1-stable+timestamp.2013.06.16.06.56.07 Version 2.5.1-stable+timestamp.2013.06.16.07.06.28
gluon/dal.py
+6 -4
View File
@@ -3024,6 +3024,7 @@ class OracleAdapter(BaseAdapter):
def create_sequence_and_triggers(self, query, table, **args): def create_sequence_and_triggers(self, query, table, **args):
tablename = table._tablename tablename = table._tablename
id_name = table._id.name
sequence_name = table._sequence_name sequence_name = table._sequence_name
trigger_name = table._trigger_name trigger_name = table._trigger_name
self.execute(query) self.execute(query)
@@ -3035,18 +3036,19 @@ class OracleAdapter(BaseAdapter):
diff_val NUMBER; diff_val NUMBER;
PRAGMA autonomous_transaction; PRAGMA autonomous_transaction;
BEGIN BEGIN
IF :NEW.id IS NOT NULL THEN IF :NEW.%(id)s IS NOT NULL THEN
EXECUTE IMMEDIATE 'SELECT %(sequence_name)s.nextval FROM dual' INTO curr_val; EXECUTE IMMEDIATE 'SELECT %(sequence_name)s.nextval FROM dual' INTO curr_val;
diff_val := :NEW.id - curr_val - 1; diff_val := :NEW.%(id)s - curr_val - 1;
IF diff_val != 0 THEN IF diff_val != 0 THEN
EXECUTE IMMEDIATE 'alter sequence %(sequence_name)s increment by '|| diff_val; EXECUTE IMMEDIATE 'alter sequence %(sequence_name)s increment by '|| diff_val;
EXECUTE IMMEDIATE 'SELECT %(sequence_name)s.nextval FROM dual' INTO curr_val; EXECUTE IMMEDIATE 'SELECT %(sequence_name)s.nextval FROM dual' INTO curr_val;
EXECUTE IMMEDIATE 'alter sequence %(sequence_name)s increment by 1'; EXECUTE IMMEDIATE 'alter sequence %(sequence_name)s increment by 1';
END IF; END IF;
END IF; END IF;
SELECT %(sequence_name)s.nextval INTO :NEW.id FROM DUAL; SELECT %(sequence_name)s.nextval INTO :NEW.%(id)s FROM DUAL;
END; END;
""" % dict(trigger_name=trigger_name, tablename=tablename, sequence_name=sequence_name)) """ % dict(trigger_name=trigger_name, tablename=tablename,
sequence_name=sequence_name,id=id_name))
def lastrowid(self,table): def lastrowid(self,table):
sequence_name = table._sequence_name sequence_name = table._sequence_name