Message-ID: <00c801c10152$899d0680$4301a8c0@directi.com>
From: "Arsalan Zaidi" <azaidi@directi.com>
To: <pgsql-interfaces@postgresql.org>
Subject: New code for JDBC driver
Date: Sat, 30 Jun 2001 16:20:10 +0530
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_00BE_01C10180.88A5E660"

This is a multi-part message in MIME format.

------=_NextPart_000_00BE_01C10180.88A5E660
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

No response for my query since yesterday.

I've changed the code in Connection.escapeSQL() to look for semicolons
outside '' and ""'s.

It's not been well tested, but it seems to work. Someone might want to add
it to the source tree, or to their own local versions if they wish.

--Arsalan

------=_NextPart_000_00BE_01C10180.88A5E660
Content-Type: application/octet-stream; name="code.java"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename="code.java"

    public String EscapeSQL(String sql) throws SQLException
    {
      //if (DEBUG) { System.out.println ("parseSQLEscapes called"); }

      // If we find a "{d", assume we have a date escape.
      //
      // Since the date escape syntax is very close to the
      // native Postgres date format, we just remove the escape
      // delimiters.
      //
      // This implementation could use some optimization, but it has
      // worked in practice for two years of solid use.
      int index =3D sql.indexOf("{d");
      while (index !=3D -1) {
        //System.out.println ("escape found at index: " + index);
        StringBuffer buf =3D new StringBuffer(sql);
        buf.setCharAt(index, ' ');
        buf.setCharAt(index + 1, ' ');
        buf.setCharAt(sql.indexOf('}', index), ' ');
        sql =3D new String(buf);
        index =3D sql.indexOf("{d");
      }
      //System.out.println ("modified SQL: " + sql);


      //---- Added by Arsalan
      String query =3D sql;

      //2=3D=3D uninitialised 1=3D=3Dtrue 0=3D=3Dfalse
      int openTick =3D 2;
      int openQuote =3D 2;
      char oneChar;

      //	query =3D query.toLowerCase();

      if(query.indexOf(";") =3D=3D -1) // no semi's at all
	  {
	      return sql;
	  }

      for(int i=3D0; i<query.length(); i++)
	  {
	      oneChar =3D query.charAt(i);

	      if((oneChar =3D=3D ';' && openTick =3D=3D 0 && openQuote !=3D 1) || =
(oneChar =3D=3D ';' && openQuote =3D=3D 0 && openTick !=3D 1))
		  {
		      throw new SQLException("Found an external SEMICOLON!! at i =3D "+i);
		  }

	      if(oneChar =3D=3D '\'') //is a '
		  {

		      System.out.println("in '");
		      int j =3D i;
		      if(++j < query.length())
			  {
			      if(query.charAt(j) =3D=3D '\'') //is an escape
				  {
				      i++; //skip them
				      continue;
				  }
			      else //genuine tick!
				  {
				      if(openTick =3D=3D 0)
					  {
					      openTick =3D 1;
					  }
				      else if(openTick =3D=3D 1)
					  {
					      openTick =3D 0;
					  }
				      else if(openTick =3D=3D 2) //initialise it
					  {
					      openTick =3D 1;
					  }
				  }
			  }
		  }


	      if(oneChar =3D=3D '"') //is a "
		  {
		      System.out.println("in \"");
		      int j =3D i;
		      if(++j < query.length())
			  {
			      if(query.charAt(j) =3D=3D '"') //is an escape
				  {
				      i++; //skip them
				      continue;
				  }
			      else //genuine quote!
				  {
				      if(openQuote =3D=3D 0)
					  {=20
					      openQuote =3D 1;
					  }
				      else if(openQuote =3D=3D 1)
					  {
					      openQuote =3D 0;
					  }
				      else if(openQuote =3D=3D 2) //initialise it
					  {
					      openQuote =3D 1;
					  }
				  }
			  }
		  }


	  }


      //------Addition ends


      return sql;
    }

------=_NextPart_000_00BE_01C10180.88A5E660--