[Tora-cvs] SF.net SVN: tora:[4230] trunk/tora/src/toplsqltext.cpp

[<tom...@us...>]

Revision: 4230
          http://tora.svn.sourceforge.net/tora/?rev=4230&view=rev
Author:   tomasstraupis
Date:     2012-01-24 09:57:07 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
PLSQL editor fix: do not add extra spaces before/after package/procedure/function/type names.

Modified Paths:
--------------
    trunk/tora/src/toplsqltext.cpp

Modified: trunk/tora/src/toplsqltext.cpp
===================================================================
--- trunk/tora/src/toplsqltext.cpp	2012-01-14 20:18:41 UTC (rev 4229)
+++ trunk/tora/src/toplsqltext.cpp	2012-01-24 09:57:07 UTC (rev 4230)
@@ -236,7 +236,7 @@
     sql.append(schema);
     sql.append(QString::fromLatin1("."));
     sql.append(object);
-    sql.append(QString::fromLatin1(" "));
+    //sql.append(QString::fromLatin1(" ")); // TS 2012-01-19 There is an initial space at the start of str.mid(offset)
     sql.append(str.mid(offset));
 
     // Remove empty space and the slash at the end of statement.
@@ -272,8 +272,7 @@
 
     try
     {
-        if (t == toPLSQLText::Warning) // TODO: TS 2009-12-21 is it actually compiling if
-                                       // button "compile (without warnings) was pressed?
+        if (t == toPLSQLText::Warning)
         {
             QString alter("ALTER %1 \"%2\".\"%3\" COMPILE ");
             if (body)
@@ -396,8 +395,40 @@
         toQuery lines(conn, SQLReadSource, Schema, Object, Type);
 
         QString str = "CREATE OR REPLACE ";
-        while (!lines.eof())
-            str += lines.readValue();
+        bool firstLine = true; // first line of code returned, this line contains program unit type, name etc.
+        while (!lines.eof()) {
+            if (firstLine) {
+	        /* Process the first line of code as the code returned may contain some extra spaces after
+		 * unit type and actual name which causes irritations when saving code to code versioning systems
+		 */
+                QString s = lines.readValue();
+		int pos;
+                if (s.startsWith("PACKAGE BODY", Qt::CaseInsensitive)) {
+                    pos = 13;
+                }
+                else if (s.startsWith("PACKAGE", Qt::CaseInsensitive)) {
+                    pos = 8;
+                }
+                else if (s.startsWith("PROCEDURE", Qt::CaseInsensitive)) {
+                    pos = 10;
+                }
+                else if (s.startsWith("FUNCTION", Qt::CaseInsensitive)) {
+                    pos = 9;
+                }
+                else if (s.startsWith("TYPE BODY", Qt::CaseInsensitive)) {
+                    pos = 10;
+                }
+                else if (s.startsWith("TYPE", Qt::CaseInsensitive)) {
+                    pos = 5;
+                }
+                while (s.at(pos) == ' ')
+                    s.remove(pos, 1); // remove all extra spaces between unit type and unit name
+                str += s;
+                firstLine = false;
+            } else {
+                str += lines.readValue();
+            }
+        }
         str += "\n/";
         setText(str);
         setModified(false);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.